libraries/libjxl: Updated for version 0.10.2.

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

3 files changed, 54 insertions, 34 deletions

diff --git a/libraries/libjxl/changelog b/libraries/libjxl/changelog
index 129277e40f..6aa28de968 100644
--- a/libraries/libjxl/changelog
+++ b/libraries/libjxl/changelog
@@ -29,3 +29,11 @@ to build. Thanks to B.Watson for pointing this out.
 21/02/2024:
 
 Updated to version 0.9.2
+
+15/04/2024:
+
+Updated to version 0.10.2
+Enabled plugin and jpegli support.
+This adds cjpegli and djpegli tools for encoding and
+decoding jpeg files.
+
diff --git a/libraries/libjxl/libjxl.SlackBuild b/libraries/libjxl/libjxl.SlackBuild
index ebdba44fb4..35c38b61a1 100644
--- a/libraries/libjxl/libjxl.SlackBuild
+++ b/libraries/libjxl/libjxl.SlackBuild
@@ -25,10 +25,12 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libjxl
-VERSION=${VERSION:-0.9.2}
+VERSION=${VERSION:-0.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
+JPG=${JPG:-libjpeg-turbo}
+JPGVER=${JPGVER:-3.0.2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -71,6 +73,10 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
+rm -rvf $TMP/$PRGNAM-$VERSION/third_party/libjpeg-turbo/
+tar -xvf $CWD/$JPG-$JPGVER.tar.gz
+cp -av $TMP/$PRGNAM-$VERSION/$JPG-$JPGVER/   $TMP/$PRGNAM-$VERSION/third_party/libjpeg-turbo
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,40 +85,44 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cmake  -B build -S $TMP/$PRGNAM-$VERSION \
-        -DBUILD_TESTING:BOOL='false' \
-	-DENABLE_FUZZERS_DEFAULT:BOOL='false' \
         -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
         -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-        -DBUNDLE_LIBPNG_DEFAULT='NO' \
-        -DCMAKE_BUILD_TYPE:STRING='Release' \
-        -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+        -DCMAKE_INSTALL_PREFIX:PATH=/usr \
         -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib${LIBDIRSUFFIX} \
         -DCMAKE_INSTALL_BINDIR:PATH=/usr/bin \
-	-DCMAKE_INSTALL_MANDIR:PATH=/usr/man \
-        -DBUILD_SHARED_LIBS:BOOL='true' \
-	-DJPEGXL_ENABLE_JNI:BOOL='false' \
-	-DJPEGXL_ENABLE_JPEGLI:BOOL='false' \
-	-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' \
-        -DJPEGXL_ENABLE_EXAMPLES:BOOL='false' \
-        -DJPEGXL_ENABLE_FUZZERS:BOOL='false' \
-        -DJPEGXL_ENABLE_PLUGINS:BOOL='false' \
-        -DJPEGXL_ENABLE_VIEWERS:BOOL='false' \
-	-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' \
-        -DJPEGXL_FORCE_SYSTEM_LCMS2:BOOL='true' \
-        -DJPEGXL_ENABLE_SJPEG:BOOL='false' \
-        -DJPEGXL_STATIC:BOOL='false'
+        -DCMAKE_INSTALL_MANDIR:PATH=/usr/man \
+        -DCMAKE_BUILD_TYPE:STRING=Release \
+        -DJPEGXL_VERSION=$VERSION \
+        -DJPEGXL_STATIC:BOOL=OFF \
+        -DBUILD_TESTING:BOOL=OFF \
+        -DENABLE_FUZZERS_DEFAULT:BOOL=OFF \
+        -DBUNDLE_LIBPNG_DEFAULT:BOOL=OFF \
+        -DJPEGXL_ENABLE_JNI:BOOL=OFF \
+        -DJPEGXL_ENABLE_DEVTOOLS:BOOL=OFF \
+        -DJPEGXL_ENABLE_DOXYGEN:BOOL=OFF \
+        -DJPEGXL_ENABLE_SKCMS:BOOL=OFF \
+        -DJPEGXL_BUNDLE_SKCMS:BOOL=OFF \
+        -DJPEGXL_ENABLE_BENCHMARK:BOOL=OFF \
+        -DJPEGXL_ENABLE_EXAMPLES:BOOL=OFF \
+        -DJPEGXL_ENABLE_FUZZERS:BOOL=OFF \
+        -DJPEGXL_ENABLE_VIEWERS:BOOL=OFF \
+        -DJPEGXL_ENABLE_SIZELESS_VECTORS:BOOL=OFF \
+        -DJPEGXL_WARNINGS_AS_ERRORS:BOOL=OFF \
+        -DJPEGXL_ENABLE_SJPEG:BOOL=OFF \
+        -DCMAKE_DISABLE_FIND_PACKAGE_JPEG:BOOL=OFF \
+        -DJPEGXL_ENABLE_JPEGLI_LIBJPEG:BOOL=OFF \
+        -DBUILD_SHARED_LIBS:BOOL=ON \
+        -DJPEGXL_ENABLE_MANPAGES:BOOL=ON \
+        -DJPEGXL_ENABLE_PLUGINS:BOOL=ON \
+        -DJPEGXL_ENABLE_TOOLS:BOOL=ON \
+        -DJPEGXL_ENABLE_JPEGLI:BOOL=ON \
+        -DJPEGXL_ENABLE_TCMALLOC:BOOL=ON \
+        -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF:BOOL=ON \
+        -DJPEGXL_ENABLE_OPENEXR:BOOL=ON \
+        -DJPEGXL_FORCE_SYSTEM_BROTLI:BOOL=ON \
+        -DJPEGXL_FORCE_SYSTEM_GTEST:BOOL=ON \
+        -DJPEGXL_FORCE_SYSTEM_HWY:BOOL=ON \
+        -DJPEGXL_FORCE_SYSTEM_LCMS2:BOOL=ON
 
 make -C build DESTDIR="$PKG" install
 
diff --git a/libraries/libjxl/libjxl.info b/libraries/libjxl/libjxl.info
index 70764e835e..06cb3ed317 100644
--- a/libraries/libjxl/libjxl.info
+++ b/libraries/libjxl/libjxl.info
@@ -1,8 +1,10 @@
 PRGNAM="libjxl"
-VERSION="0.9.2"
+VERSION="0.10.2"
 HOMEPAGE="https://jpeg.org/jpegxl/"
-DOWNLOAD="https://github.com/libjxl/libjxl/archive/v0.9.2/libjxl-0.9.2.tar.gz"
-MD5SUM="11ecf6dbf3a9afdf907becb016bf8e0c"
+DOWNLOAD="https://github.com/libjxl/libjxl/archive/v0.10.2/libjxl-0.10.2.tar.gz \
+          https://github.com/libjpeg-turbo/libjpeg-turbo/archive/3.0.2/libjpeg-turbo-3.0.2.tar.gz"
+MD5SUM="e383b622cb2caef4dfcc8047f5a0fe72 \
+        94756db95bc2477f7f7dad1c2590b51f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gflags gperftools graphviz highway"