Merge pull request #7165 from kmilos/libavif-0.8.2

libavif: Update to 0.8.2

mingw-w64-libavif/004-gdk-pixbuf-loader.c-Include-stdlib.h-for-strtol.patch

@@ -1,24 +0,0 @@
-From 117246d5faa5bc3c4c217bf548c2727e07e9ff9b Mon Sep 17 00:00:00 2001
-From: Biswapriyo Nath <nathbappai@gmail.com>
-Date: Sat, 29 Aug 2020 19:17:45 +0530
-Subject: [PATCH] gdk-pixbuf/loader.c: Include stdlib.h for strtol
-
----
- contrib/gdk-pixbuf/loader.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/contrib/gdk-pixbuf/loader.c b/contrib/gdk-pixbuf/loader.c
-index af0e775..6531ec0 100644
---- a/contrib/gdk-pixbuf/loader.c
-+++ b/contrib/gdk-pixbuf/loader.c
-@@ -3,6 +3,7 @@
- */
- 
- #include <avif/avif.h>
-+#include <stdlib.h>
- 
- #define GDK_PIXBUF_ENABLE_BACKEND
- #include <gdk-pixbuf/gdk-pixbuf-io.h>
--- 
-2.27.0
-

mingw-w64-libavif/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=libavif
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=1
 pkgdesc="Library for encoding and decoding .avif files (mingw-w64)"
 arch=('any')
@@ -21,25 +21,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-nasm"
              "${MINGW_PACKAGE_PREFIX}-pkg-config")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/AOMediaCodec/libavif/archive/v${pkgver}.tar.gz"
-        002-pixbuf-install-repfix.patch
-        004-gdk-pixbuf-loader.c-Include-stdlib.h-for-strtol.patch)
-sha512sums=('03692fbba49fde08d76cebb847d0404a81113824e9e65edc6a0977f323d060c394d111e2a7647788fa3115f3ae80b0fc92d4fe5be53852e6734b96a8f1c1a078'
-            '60f8bad03460695a094a6ffabbe33f839239fef2bae99d9be7f3a3f9cfde14b694d0c68dce6cc987e9c865a0d97638e951d55abcbab4cc554719803e5d0bb2d2'
-            '2ead0fe4f51dd66d40cc8a64e874073e6cca8ef1c9f35a7994fb14cce52e7253c8d176e3ca221eebcf4e1acc277d29d0bf8fa155f794d0a369738a7d85e69462')
+        002-pixbuf-install-repfix.patch)
+sha512sums=('51034084b5a508763653e16512298c3ad57c07022327cf42c9e12728ac30e102c69dc43d6569cb39ee4a63cb81a98947b72201373d3a909b3f1b2f6f59aaa433'
+            '60f8bad03460695a094a6ffabbe33f839239fef2bae99d9be7f3a3f9cfde14b694d0c68dce6cc987e9c865a0d97638e951d55abcbab4cc554719803e5d0bb2d2')
 
 prepare() {
   cd ${_realname}-${pkgver}
 
   # https://gitlab.kitware.com/cmake/cmake/-/issues/19632
   patch -p1 -i ${srcdir}/002-pixbuf-install-repfix.patch
-
-  # https://github.com/AOMediaCodec/libavif/pull/295
-  patch -p1 -i ${srcdir}/004-gdk-pixbuf-loader.c-Include-stdlib.h-for-strtol.patch
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
+  mkdir -p build-${CARCH} && cd build-${CARCH}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -58,12 +53,12 @@ build() {
 }
 
 check() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${CARCH}
   ${MINGW_PREFIX}/bin/ctest ./ || true
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${CARCH}
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install
 
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/README.md ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md