diff options
author | Heinz Wiesinger <pprkut@slackbuilds.org> | 2012-08-19 13:08:47 +0200 |
---|---|---|
committer | Heinz Wiesinger <pprkut@slackbuilds.org> | 2012-08-20 11:15:18 +0200 |
commit | fa6b6880cd0b27773d7fecc62a1c8ab14050c90d (patch) | |
tree | 4ec53a5b5aa7341621d69df28d2dab7dae3d4a7d /libraries | |
parent | e41a8ced82d30bb5958c24d46665a57c99db71d7 (diff) |
libraries/openjpeg: Updated for version 1.5.0
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/openjpeg/openjpeg.SlackBuild | 27 | ||||
-rw-r--r-- | libraries/openjpeg/openjpeg.info | 6 | ||||
-rw-r--r-- | libraries/openjpeg/openjpeg_fix_header_symlinks.patch | 21 | ||||
-rw-r--r-- | libraries/openjpeg/openjpeg_link_libm.patch | 14 |
4 files changed, 12 insertions, 56 deletions
diff --git a/libraries/openjpeg/openjpeg.SlackBuild b/libraries/openjpeg/openjpeg.SlackBuild index 8c2ffc460c69d..4f911a08d87d7 100644 --- a/libraries/openjpeg/openjpeg.SlackBuild +++ b/libraries/openjpeg/openjpeg.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for openjpeg -# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2012 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openjpeg -VERSION=1.4 -BUILD=${BUILD:-3} +VERSION=1.5.0 +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -40,8 +40,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -SRC_VERSION=$(echo $VERSION | tr . _) - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -61,18 +59,12 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf ${PRGNAM}_v${SRC_VERSION}_sources_r697 -tar xvf $CWD/${PRGNAM}_v${SRC_VERSION}_sources_r697.tgz -cd ${PRGNAM}_v${SRC_VERSION}_sources_r697 +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . 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 \ @@ -82,13 +74,12 @@ cd build -DOPENJPEG_INSTALL_LIB_DIR="lib$LIBDIRSUFFIX" \ -DOPENJPEG_INSTALL_MAN_DIR="man/" \ -DOPENJPEG_INSTALL_DOC_DIR="doc/$PRGNAM-$VERSION/" \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - -DBUILD_JP3D:BOOL=ON \ -DBUILD_JPWL:BOOL=ON \ -DBUILD_MJ2:BOOL=ON \ - -DBUILD_INDEXER_JPIP:BOOL=ON \ + -DBUILD_JPIP:BOOL=OFF \ .. - make VERBOSE=1 + + make make install DESTDIR=$PKG cd - diff --git a/libraries/openjpeg/openjpeg.info b/libraries/openjpeg/openjpeg.info index 0ccbadf8a2b21..ae5ba16b49f82 100644 --- a/libraries/openjpeg/openjpeg.info +++ b/libraries/openjpeg/openjpeg.info @@ -1,8 +1,8 @@ PRGNAM="openjpeg" -VERSION="1.4" +VERSION="1.5.0" HOMEPAGE="http://www.openjpeg.org" -DOWNLOAD="http://openjpeg.googlecode.com/files/openjpeg_v1_4_sources_r697.tgz" -MD5SUM="7870bb84e810dec63fcf3b712ebb93db" +DOWNLOAD="http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz" +MD5SUM="e5d66193ddfa59a87da1eb08ea86293b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/openjpeg/openjpeg_fix_header_symlinks.patch b/libraries/openjpeg/openjpeg_fix_header_symlinks.patch deleted file mode 100644 index 5b9930e9e465b..0000000000000 --- a/libraries/openjpeg/openjpeg_fix_header_symlinks.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -U 3 -H -d -r -N -- openjpeg_v1_4_sources_r697/jp3d/libjp3dvm/CMakeLists.txt openjpeg_v1_4_sources_r697.new/jp3d/libjp3dvm/CMakeLists.txt ---- openjpeg_v1_4_sources_r697/jp3d/libjp3dvm/CMakeLists.txt 2011-01-02 19:14:46.000000000 +0100 -+++ openjpeg_v1_4_sources_r697.new/jp3d/libjp3dvm/CMakeLists.txt 2011-04-10 13:23:06.102999992 +0200 -@@ -36,4 +36,4 @@ - DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3 - ) - INSTALL(CODE -- "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3/openjpeg3d.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d.h)") -+ "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink openjpeg3d-1.3/openjpeg3d.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d.h)") -diff -U 3 -H -d -r -N -- openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt openjpeg_v1_4_sources_r697.new/libopenjpeg/CMakeLists.txt ---- openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt 2011-01-02 19:14:45.000000000 +0100 -+++ openjpeg_v1_4_sources_r697.new/libopenjpeg/CMakeLists.txt 2011-04-10 13:22:24.714999992 +0200 -@@ -43,7 +43,7 @@ - DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} COMPONENT Headers - ) - INSTALL(CODE -- "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}/openjpeg.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h)") -+ "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${subdir}/openjpeg.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h)") - - # install man page of the library - INSTALL( diff --git a/libraries/openjpeg/openjpeg_link_libm.patch b/libraries/openjpeg/openjpeg_link_libm.patch deleted file mode 100644 index 7214cc960195d..0000000000000 --- a/libraries/openjpeg/openjpeg_link_libm.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 |