From ed6ac81f7e026040e19ea530017fdd204007de23 Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@liwjatan.at>
Date: Tue, 8 Nov 2011 08:46:50 -0200
Subject: libraries/openjpeg: Added patch from upstream.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 libraries/openjpeg/openjpeg.SlackBuild      |  7 +++++--
 libraries/openjpeg/openjpeg.info            |  2 +-
 libraries/openjpeg/openjpeg_link_libm.patch | 14 ++++++++++++++
 libraries/openjpeg/slack-desc               |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 libraries/openjpeg/openjpeg_link_libm.patch

(limited to 'libraries')

diff --git a/libraries/openjpeg/openjpeg.SlackBuild b/libraries/openjpeg/openjpeg.SlackBuild
index 64f60a1437..8c2ffc460c 100644
--- a/libraries/openjpeg/openjpeg.SlackBuild
+++ b/libraries/openjpeg/openjpeg.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=openjpeg
 VERSION=1.4
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,6 +70,9 @@ chmod -R u+w,go+r-w,a-s .
 # Fix header symlink paths (like upstream svn revision 725)
 patch -p1 -i $CWD/openjpeg_fix_header_symlinks.patch
 
+# Fix unresolved symbols to libm (like upstream svn revision 729)
+patch -p0 -d libopenjpeg -i $CWD/openjpeg_link_libm.patch
+
 mkdir -p build
 cd build
   cmake \
@@ -85,7 +88,7 @@ cd build
     -DBUILD_MJ2:BOOL=ON \
     -DBUILD_INDEXER_JPIP:BOOL=ON \
     ..
-  make
+  make VERBOSE=1
   make install DESTDIR=$PKG
 cd -
 
diff --git a/libraries/openjpeg/openjpeg.info b/libraries/openjpeg/openjpeg.info
index f894892f3d..ae84902691 100644
--- a/libraries/openjpeg/openjpeg.info
+++ b/libraries/openjpeg/openjpeg.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="Michiel,rworkman"
+APPROVED="Niels Horn"
diff --git a/libraries/openjpeg/openjpeg_link_libm.patch b/libraries/openjpeg/openjpeg_link_libm.patch
new file mode 100644
index 0000000000..7214cc9601
--- /dev/null
+++ b/libraries/openjpeg/openjpeg_link_libm.patch
@@ -0,0 +1,14 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 728)
++++ CMakeLists.txt	(revision 729)
+@@ -30,6 +30,9 @@
+   ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(WIN32)
+ ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
++IF(UNIX)
++  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
++ENDIF(UNIX)
+ SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+ 
+ # Install library
diff --git a/libraries/openjpeg/slack-desc b/libraries/openjpeg/slack-desc
index 5f1dd5ce78..7c0b6ef5c6 100644
--- a/libraries/openjpeg/slack-desc
+++ b/libraries/openjpeg/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-        |-----handy-ruler------------------------------------------------|
+        |-----handy-ruler------------------------------------------------------|
 openjpeg: openjpeg (JPEG2000 Codec)
 openjpeg:
 openjpeg: The OpenJPEG library is an open-source JPEG 2000 codec.
-- 
cgit v1.2.3