1 files changed, 11 insertions, 16 deletions
diff --git a/libraries/openjpeg/openjpeg.SlackBuild b/libraries/openjpeg/openjpeg.SlackBuild
index 2e6b19309e5b..f910a16d31de 100644
--- a/libraries/openjpeg/openjpeg.SlackBuild
+++ b/libraries/openjpeg/openjpeg.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for openjpeg
 
-# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +23,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openjpeg
-VERSION=1.3
+VERSION=1.4
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -63,37 +61,34 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf OpenJPEG_v$SRC_VERSION
-tar xvf $CWD/${PRGNAM}_v${SRC_VERSION}.tar.gz
-cd OpenJPEG_v$SRC_VERSION
+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
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-#fix correctly installing libraries in lib$LIBDIRSUFFIX
-sed -i "s/lib)/lib\${LIB_SUFFIX})/" libopenjpeg/CMakeLists.txt
-
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_EXAMPLES:BOOL=ON \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DOPENJPEG_INSTALL_LIB_DIR="lib$LIBDIRSUFFIX" \
+    -DOPENJPEG_INSTALL_MAN_DIR="man/" \
+    -DOPENJPEG_INSTALL_DOC_DIR="doc/$PRGNAM-$VERSION/" \
     -DLIB_SUFFIX="$LIBDIRSUFFIX" \
     ..
   make
   make install DESTDIR=$PKG
 cd -
 
-mkdir -p $PKG/usr/include
-mv $PKG/openjpeg $PKG/usr/include/
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog license.txt README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install