git » kimageformats.git » commit c2a61ce

diff --git a/PKGBUILD b/PKGBUILD
index 9206944..2abc786 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kimageformats
 pkgver=5.109.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Image format plugins for Qt5'
 arch=(x86_64)
 url='https://community.kde.org/Frameworks'
@@ -18,11 +18,17 @@ optdepends=('karchive: plugin for Krita and OpenRaster images'
             'libjxl: JPEG-XL format support'
             'libraw: RAW format support')
 groups=(kf5)
-source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig})
+source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig}
+        libavif-1.patch)
 sha256sums=('15533e1ba0fa187f0da0094b8ea135f38a9cebffd9118a12fcd23003eb591687'
-            'SKIP')
+            'SKIP'
+            '42445c2d8ac6627b0444651405c8d7d35b1131ccd40661f940b1b84a613c26fb')
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < libavif-1.patch # Fix cmake detection of libavif 1
+}
+
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF \
diff --git a/libavif-1.patch b/libavif-1.patch
new file mode 100644
index 0000000..3cec3c0
--- /dev/null
+++ b/libavif-1.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8025ead..a109e04 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,10 @@ set_package_properties(OpenEXR PROPERTIES
+     PURPOSE "Required for the QImage plugin for OpenEXR images"
+ )
+ 
+-find_package(libavif 0.8.2 CONFIG)
++find_package(libavif 0.8.2 CONFIG QUIET)
++if(NOT libavif_FOUND)
++    find_package(libavif 1 CONFIG)
++endif()
+ set_package_properties(libavif PROPERTIES
+     TYPE OPTIONAL
+     PURPOSE "Required for the QImage plugin for AVIF images"
+diff --git a/src/imageformats/avif.cpp b/src/imageformats/avif.cpp
+index bcebd36..9775dcb 100644
+--- a/src/imageformats/avif.cpp
++++ b/src/imageformats/avif.cpp
+@@ -424,7 +424,7 @@ bool QAVIFHandler::decode_one_frame()
+     }
+ 
+     if (m_decoder->image->transformFlags & AVIF_TRANSFORM_IMIR) {
+-#if AVIF_VERSION > 90100
++#if AVIF_VERSION > 90100 && AVIF_VERSION < 1000000
+         switch (m_decoder->image->imir.mode) {
+ #else
+         switch (m_decoder->image->imir.axis) {