3 files changed, 22 insertions, 24 deletions
diff --git a/libraries/libheif/README b/libraries/libheif/README
index bbf3bdb56c61..5108e2c27082 100644
--- a/libraries/libheif/README
+++ b/libraries/libheif/README
@@ -8,4 +8,8 @@ library comes with some example programs including heif-convert that
 converts HEIF/AVIF images to JPEG or PNG.
 
 libheif makes use of libde265 for HEIF image decoding and x265 for
-encoding. For AVIF, aom is used as codec.
+encoding. For AVIF, aom, dav1d, svt-av1, or rav1e are used as codecs.
+
+dav1d, svt-av1, and rav1e are autodetected optional dependencies, with
+the latter not available on SBo. Also libsharpyuv (not in SBo) will be
+autodetected if installed.
diff --git a/libraries/libheif/libheif.SlackBuild b/libraries/libheif/libheif.SlackBuild
index dedd76f46185..f30e98b234f6 100644
--- a/libraries/libheif/libheif.SlackBuild
+++ b/libraries/libheif/libheif.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libheif
-VERSION=${VERSION:-1.15.2}
+VERSION=${VERSION:-1.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -76,28 +76,24 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --disable-go \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-# Don't ship .la files:
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    --preset=release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
 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 $PKG/usr/share/man $PKG/usr
 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
 
@@ -105,8 +101,6 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-rm -f $PKG/usr/lib*/*.la
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/libraries/libheif/libheif.info b/libraries/libheif/libheif.info
index eb0d93fe79b5..74841addea43 100644
--- a/libraries/libheif/libheif.info
+++ b/libraries/libheif/libheif.info
@@ -1,8 +1,8 @@
 PRGNAM="libheif"
-VERSION="1.15.2"
+VERSION="1.16.1"
 HOMEPAGE="https://github.com/strukturag/libheif"
-DOWNLOAD="https://github.com/strukturag/libheif/releases/download/v1.15.2/libheif-1.15.2.tar.gz"
-MD5SUM="d51b100549f9f31f923f5f047e937fe0"
+DOWNLOAD="https://github.com/strukturag/libheif/releases/download/v1.16.1/libheif-1.16.1.tar.gz"
+MD5SUM="f4f20ff58a872936bfb4e7069be8151c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libde265 x265 aom"