summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@slackbuilds.org>2011-04-10 14:40:49 +0200
committerRobby Workman <rworkman@slackbuilds.org>2011-04-11 00:11:14 -0500
commit727463bb2dc47685b41f398ef218e691d5cc06ab (patch)
treece2ab398faf5b449cf9177143fa5f19b24311a4e
parentdd25467337d1b27036b988197e0bc208fdff1c81 (diff)
downloadslackbuilds-727463bb2dc47685b41f398ef218e691d5cc06ab.tar.gz
libraries/openjpeg: Fix headers and enable extra features.
Thanks to 'Gino' for the pointers. Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
-rw-r--r--libraries/openjpeg/openjpeg.SlackBuild9
-rw-r--r--libraries/openjpeg/openjpeg_fix_header_symlinks.patch21
2 files changed, 29 insertions, 1 deletions
diff --git a/libraries/openjpeg/openjpeg.SlackBuild b/libraries/openjpeg/openjpeg.SlackBuild
index f910a16d31..64f60a1437 100644
--- a/libraries/openjpeg/openjpeg.SlackBuild
+++ b/libraries/openjpeg/openjpeg.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=openjpeg
VERSION=1.4
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -67,6 +67,9 @@ cd ${PRGNAM}_v${SRC_VERSION}_sources_r697
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
+
mkdir -p build
cd build
cmake \
@@ -77,6 +80,10 @@ cd build
-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 \
..
make
make install DESTDIR=$PKG
diff --git a/libraries/openjpeg/openjpeg_fix_header_symlinks.patch b/libraries/openjpeg/openjpeg_fix_header_symlinks.patch
new file mode 100644
index 0000000000..5b9930e9e4
--- /dev/null
+++ b/libraries/openjpeg/openjpeg_fix_header_symlinks.patch
@@ -0,0 +1,21 @@
+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(