diff options
| author | Heinz Wiesinger <pprkut@liwjatan.at> | 2011-11-08 08:46:50 -0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2011-11-26 09:09:09 -0600 |
| commit | ed6ac81f7e026040e19ea530017fdd204007de23 (patch) | |
| tree | 30ea8cea43e33098ba4b90040b59c0ecfc515a64 | |
| parent | a8362d26b293fbf5ebb5c3c7c1da7c4c0a8e7ae2 (diff) | |
libraries/openjpeg: Added patch from upstream.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
| -rw-r--r-- | libraries/openjpeg/openjpeg.SlackBuild | 7 | ||||
| -rw-r--r-- | libraries/openjpeg/openjpeg.info | 2 | ||||
| -rw-r--r-- | libraries/openjpeg/openjpeg_link_libm.patch | 14 | ||||
| -rw-r--r-- | libraries/openjpeg/slack-desc | 2 |
4 files changed, 21 insertions, 4 deletions
diff --git a/libraries/openjpeg/openjpeg.SlackBuild b/libraries/openjpeg/openjpeg.SlackBuild index 64f60a1437e9..8c2ffc460c69 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 f894892f3df7..ae84902691cb 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 000000000000..7214cc960195 --- /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 5f1dd5ce78bb..7c0b6ef5c658 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. |