From cb097991a113ceceef7501439de47ec9576ee818 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 17 Oct 2023 12:51:20 +0000
Subject: [PATCH] extra/libheif to 1.17.0-1

---
 extra/libheif/.SRCINFO | 12 +++++++-----
 extra/libheif/PKGBUILD | 18 +++++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/extra/libheif/.SRCINFO b/extra/libheif/.SRCINFO
index dd065333f..f61fce62a 100644
--- a/extra/libheif/.SRCINFO
+++ b/extra/libheif/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = libheif
 	pkgdesc = An HEIF and AVIF file format decoder and encoder
-	pkgver = 1.16.2
-	pkgrel = 3
+	pkgver = 1.17.0
+	pkgrel = 1
 	url = https://github.com/strukturag/libheif
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
+	makedepends = dav1d
 	makedepends = gdk-pixbuf2
 	makedepends = libjpeg
 	makedepends = libpng
@@ -14,14 +15,15 @@ pkgbase = libheif
 	depends = aom
 	depends = gcc-libs
 	depends = glibc
-	depends = dav1d
 	depends = libde265
+	depends = libwebp
 	depends = x265
 	optdepends = libjpeg: for heif-convert and heif-enc
 	optdepends = libpng: for heif-convert and heif-enc
+	optdepends = dav1d: dav1d encoder
 	optdepends = rav1e: rav1e encoder
 	optdepends = svt-av1: svt-av1 encoder
-	source = https://github.com/strukturag/libheif/releases/download/v1.16.2/libheif-1.16.2.tar.gz
-	sha256sums = 7f97e4205c0bd9f9b8560536c8bd2e841d1c9a6d610401eb3eb87ed9cdfe78ea
+	source = https://github.com/strukturag/libheif/releases/download/v1.17.0/libheif-1.17.0.tar.gz
+	sha256sums = c86661e9ef9c43ad8de9d2b38b7b508df5322580b24d22fc25a977e7fdb26f3c
 
 pkgname = libheif
diff --git a/extra/libheif/PKGBUILD b/extra/libheif/PKGBUILD
index 22b6d4739..c0ec33243 100644
--- a/extra/libheif/PKGBUILD
+++ b/extra/libheif/PKGBUILD
@@ -2,16 +2,17 @@
 # Contributor: Adam Fontenot <fontenot@ucla.edu>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - remove make/opt depends on svt-av1
+#  - remove make/opt depends on svt-av1, -DWITH_SvtEnc=OFF
 
 pkgname=libheif
-pkgver=1.16.2
-pkgrel=3
+pkgver=1.17.0
+pkgrel=1
 pkgdesc='An HEIF and AVIF file format decoder and encoder'
 arch=(x86_64)
 url='https://github.com/strukturag/libheif'
 license=(GPL3)
 makedepends=(cmake
+             dav1d
              gdk-pixbuf2
              libjpeg
              libpng
@@ -19,19 +20,22 @@ makedepends=(cmake
 depends=(aom
          gcc-libs
          glibc
-         dav1d
          libde265
+         libwebp
          x265)
 optdepends=('libjpeg: for heif-convert and heif-enc'
             'libpng: for heif-convert and heif-enc'
+            'dav1d: dav1d encoder'
             'rav1e: rav1e encoder')
 source=(https://github.com/strukturag/libheif/releases/download/v$pkgver/libheif-$pkgver.tar.gz)
-sha256sums=('7f97e4205c0bd9f9b8560536c8bd2e841d1c9a6d610401eb3eb87ed9cdfe78ea')
+sha256sums=('c86661e9ef9c43ad8de9d2b38b7b508df5322580b24d22fc25a977e7fdb26f3c')
 
 build() {
-  cmake -B build -S $pkgname-$pkgver\
+  cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DAOM_ENCODER=ON
+    -DWITH_DAV1D=ON \
+    -DWITH_RAV1E=ON \
+    -DWITH_SvtEnc=OFF
   cmake --build build
 }