libavif: 0.11.1 -> 1.0.0

libavif/.footprint

@@ -15,9 +15,9 @@ drwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/
 drwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/
 drwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/
 -rwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-avif.so
-lrwxrwxrwx	root/root	usr/lib/libavif.so -> libavif.so.15
+lrwxrwxrwx	root/root	usr/lib/libavif.so -> libavif.so.16
-lrwxrwxrwx	root/root	usr/lib/libavif.so.15 -> libavif.so.15.0.1
+lrwxrwxrwx	root/root	usr/lib/libavif.so.16 -> libavif.so.16.0.0
--rwxr-xr-x	root/root	usr/lib/libavif.so.15.0.1
+-rwxr-xr-x	root/root	usr/lib/libavif.so.16.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libavif.pc
 drwxr-xr-x	root/root	usr/share/

libavif/.signature

@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF357Z+PFyFWOMyfKL/ms2Lg1L5kaEvzG8cug/IH6BQGkPUORNpkEG7KcWqxOQA+XTmet8/NaAgj5aAmUV0xbJzwY=
+RWSagIOpLGJF3xRex7P/pxtKeRAdDjp0lkCQFX9X/5Q6NKxumL0A2jeyTNR+IK2zfJpUAwRk/0UHzqUcqzuOpSeVABeYSl9+qw0=
-SHA256 (Pkgfile) = d6ec1646df8babb2a37d14c8ea9082fc96f1333513c5320120021aec4ead8441
+SHA256 (Pkgfile) = 91b75638e7ab8a851ff8c04ab08baf24b8570a0c573f83ffe16283e3b2cd7a7b
-SHA256 (.footprint) = 998ea563e6ad11c6fdf6e31d56efbd58190d073427774deaf8d4b7173d011a80
+SHA256 (.footprint) = d7f9788c8866b26c7f10270ac51e3af5cb8f4c93902917fb9d97947010f19e4c
-SHA256 (libavif-0.11.1.tar.gz) = 0eb49965562a0e5e5de58389650d434cff32af84c34185b6c9b7b2fccae06d4e
+SHA256 (libavif-1.0.0.tar.gz) = 410f85cf0d13f403b41197c0774da469f5d73b89aa06d40fc726165377f215a0
+SHA256 (1525.patch) = 2d6b3a209b5ed892372e7c3036639b1a743ecc121905ca1d33cf11402a9bb330

libavif/1525.patch

@@ -0,0 +1,59 @@
+From 648f8d0dd03f8ae91824bf3c2f10baa3ea55bb08 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sat, 29 Aug 2020 20:09:36 +0000
+Subject: [PATCH 1/2] gdk-pixbuf: Explicitly pass link directories
+
+FreeBSD by default only looks for headers/libraries in base system, so
+depending on packages requires passing -isystem + -L or relying on pkg-config.
+
+FAILED: contrib/gdk-pixbuf/libpixbufloader-avif.so
+: && /usr/bin/cc -fPIC    -shared  -o contrib/gdk-pixbuf/libpixbufloader-avif.so contrib/gdk-pixbuf/CMakeFiles/pixbufloader-avif.dir/loader.c.o  -Wl,-rpath,/tmp/libavif_build:  -lgdk_pixbuf-2.0  -lgobject-2.0  -lglib-2.0  -lintl  libavif.so.16.0.0 && :
+ld: error: unable to find library -lgdk_pixbuf-2.0
+ld: error: unable to find library -lgobject-2.0
+ld: error: unable to find library -lglib-2.0
+ld: error: unable to find library -lintl
+cc: error: linker command failed with exit code 1 (use -v to see invocation)
+---
+ contrib/gdk-pixbuf/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/contrib/gdk-pixbuf/CMakeLists.txt b/contrib/gdk-pixbuf/CMakeLists.txt
+index 27f8e5d88..67461c272 100644
+--- a/contrib/gdk-pixbuf/CMakeLists.txt
++++ b/contrib/gdk-pixbuf/CMakeLists.txt
+@@ -11,6 +11,7 @@ if(AVIF_BUILD_GDK_PIXBUF)
+             add_library(pixbufloader-avif MODULE ${GDK_PIXBUF_SRCS})
+ 
+             target_link_libraries(pixbufloader-avif PUBLIC ${GDK_PIXBUF_LIBRARIES} avif)
++            target_link_directories(pixbufloader-avif PUBLIC ${GDK_PIXBUF_LIBRARY_DIRS})
+             target_include_directories(pixbufloader-avif PUBLIC ${GDK_PIXBUF_INCLUDE_DIRS})
+ 
+             pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
+
+From d854bb762db6dab603c902024bf637f8ede29e73 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 29 Aug 2023 00:39:12 +0200
+Subject: [PATCH 2/2] gdk-pixbuf: Chase 676aded3501f
+
+contrib/gdk-pixbuf/loader.c:212:29: error: no member named 'mode' in 'struct avifImageMirror'
+        switch (image->imir.mode) {
+                ~~~~~~~~~~~ ^
+
+This reverts commit 0f729c156d7d3fa0aea050908f345d983ba54cbb.
+---
+ contrib/gdk-pixbuf/loader.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/gdk-pixbuf/loader.c b/contrib/gdk-pixbuf/loader.c
+index 47e25a13b..868b054fb 100644
+--- a/contrib/gdk-pixbuf/loader.c
++++ b/contrib/gdk-pixbuf/loader.c
+@@ -209,7 +209,7 @@ static gboolean avif_context_try_load(struct avif_context * context, GError ** e
+     if (image->transformFlags & AVIF_TRANSFORM_IMIR) {
+         GdkPixbuf *output_mirrored = NULL;
+ 
+-        switch (image->imir.mode) {
++        switch (image->imir.axis) {
+         case 0:
+             output_mirrored = gdk_pixbuf_flip(output, FALSE);
+             break;

libavif/Pkgfile

@@ -1,14 +1,17 @@
 # Description: Library for encoding and decoding .avif files
 # URL: https://github.com/AOMediaCodec/libavif
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: aom dav1d gdk-pixbuf libjpeg-turbo libpng libyuv nasm rav1e svt-av1
+# Depends on: aom dav1d gdk-pixbuf libyuv rav1e svt-av1
 
 name=libavif
-version=0.11.1
+version=1.0.0
 release=1
-source=(https://github.com/AOMediaCodec/libavif/archive/v$version/$name-$version.tar.gz)
+source=(https://github.com/AOMediaCodec/libavif/archive/v$version/$name-$version.tar.gz
+  1525.patch)
 
 build() {
+  patch -Np1 -d $name-$version -i $SRC/1525.patch
+
   cmake -S $name-$version -B build -G Ninja \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_INSTALL_LIBDIR=lib \