libraries/libjxl: Updated for version 0.8.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 26 insertions, 17 deletions

diff --git a/libraries/libjxl/changelog b/libraries/libjxl/changelog
index 28c3732e4e91b..850d7a5f1d08e 100644
--- a/libraries/libjxl/changelog
+++ b/libraries/libjxl/changelog
@@ -18,3 +18,10 @@ Optional dependencies are qt6,Sphinx ans sphinx-rtd-theme.
 
 Resubmitted to SBo
 Mentioned why the Optional dependencies is needed for.
+
+29/11/2023:
+
+Upgraded to version 0.8.2
+Removed support for JNI java wrapper and also removed
+zulu-openjdk8 as dependency since the SlackBuild fails
+to build. Thanks to B.Watson for pointing this out.
diff --git a/libraries/libjxl/libjxl.SlackBuild b/libraries/libjxl/libjxl.SlackBuild
index 9b6c860659a17..a40a83a3f2ea6 100644
--- a/libraries/libjxl/libjxl.SlackBuild
+++ b/libraries/libjxl/libjxl.SlackBuild
@@ -24,11 +24,10 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libjxl
-VERSION=${VERSION:-20230511_8ec9ed1}
+VERSION=${VERSION:-0.8.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
-GITNAM=${GITNAM:-8ec9ed1d9824168c01627f663a1dbf07508cc115}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -50,6 +49,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC"
   LIBDIRSUFFIX=""
@@ -71,9 +71,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-rm -rf $PRGNAM-$GITNAM
-tar xvf $CWD/$PRGNAM-$GITNAM.tar.gz
-cd $PRGNAM-$GITNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 
 chown -R root:root .
 find -L . \
@@ -82,11 +81,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-export LDFLAGS="-lpthread"
-
-cmake  -B build -S $TMP/$PRGNAM-$GITNAM \
+cmake  -B build -S $TMP/$PRGNAM-$VERSION \
         -DBUILD_TESTING:BOOL='false' \
-        -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
+	    -DENABLE_FUZZERS_DEFAULT:BOOL='false' \
+        -DCMAKE_EXE_LINKER_FLAGS:STRING="$SLDFLAGS" \
         -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
         -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
         -DBUNDLE_LIBPNG_DEFAULT='NO' \
@@ -94,9 +92,14 @@ cmake  -B build -S $TMP/$PRGNAM-$GITNAM \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib${LIBDIRSUFFIX} \
         -DCMAKE_INSTALL_BINDIR:PATH=/usr/bin \
-        -DJPEGXL_INSTALL_JARDIR='/usr/share/java' \
+	    -DCMAKE_INSTALL_MANDIR:PATH=/usr/man \
         -DBUILD_SHARED_LIBS:BOOL='true' \
+	    -DJPEGXL_ENABLE_JNI:BOOL='false' \
+	    -DJPEGXL_ENABLE_JPEGLI:BOOL='true' \
+	    -DJPEGXL_ENABLE_OPENEXR:BOOL='true' \
         -DJPEGXL_ENABLE_DEVTOOLS:BOOL='false' \
+	    -DJPEGXL_ENABLE_DOXYGEN:BOOL='false' \
+        -DJPEGXL_ENABLE_MANPAGES:BOOL='true' \
         -DJPEGXL_ENABLE_SKCMS:BOOL='false' \
         -DJPEGXL_BUNDLE_SKCMS:BOOL='false' \
         -DJPEGXL_ENABLE_BENCHMARK:BOOL='false' \
@@ -104,8 +107,10 @@ cmake  -B build -S $TMP/$PRGNAM-$GITNAM \
         -DJPEGXL_ENABLE_FUZZERS:BOOL='false' \
         -DJPEGXL_ENABLE_PLUGINS:BOOL='false' \
         -DJPEGXL_ENABLE_VIEWERS:BOOL='true' \
+	    -DJPEGXL_ENABLE_TOOLS:BOOL='true' \
         -DJPEGXL_ENABLE_SIZELESS_VECTORS:BOOL='false' \
         -DJPEGXL_ENABLE_TCMALLOC:BOOL='true' \
+        -DJPEGXL_WARNINGS_AS_ERRORS:BOOL='false' \
         -DJPEGXL_FORCE_SYSTEM_BROTLI:BOOL='true' \
         -DJPEGXL_FORCE_SYSTEM_GTEST:BOOL='true' \
         -DJPEGXL_FORCE_SYSTEM_HWY:BOOL='true' \
@@ -114,15 +119,12 @@ cmake  -B build -S $TMP/$PRGNAM-$GITNAM \
         -DJPEGXL_STATIC:BOOL='false'
 
 make -C build DESTDIR="$PKG" install
-install -D -m755 build/tools/libjxl_jni.so -t "${PKG}/usr/lib${LIBDIRSUFFIX}"
 
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mv -v $PKG/usr/share/man $PKG/usr/man
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
diff --git a/libraries/libjxl/libjxl.info b/libraries/libjxl/libjxl.info
index 83f621166d671..488847ce7f4b1 100644
--- a/libraries/libjxl/libjxl.info
+++ b/libraries/libjxl/libjxl.info
@@ -1,10 +1,10 @@
 PRGNAM="libjxl"
-VERSION="20230511_8ec9ed1"
+VERSION="0.8.2"
 HOMEPAGE="https://jpeg.org/jpegxl/"
-DOWNLOAD="https://github.com/libjxl/libjxl/archive/8ec9ed1/libjxl-8ec9ed1d9824168c01627f663a1dbf07508cc115.tar.gz"
-MD5SUM="b8d76a30fdd03f7d7d09467bc31f8817"
+DOWNLOAD="https://github.com/libjxl/libjxl/archive/v0.8.2/libjxl-0.8.2.tar.gz"
+MD5SUM="826a2508b7978f50638794473173a3ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gtest gflags gperftools zulu-openjdk8 graphviz highway"
+REQUIRES="gtest gflags gperftools graphviz highway"
 MAINTAINER="Vijay Marcel"
 EMAIL="vijaymarcel@outlook.com"