From 96f5d2cc58d8bc141f8035dee02a61786a8f73f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <miloskomarcevic@aim.com>
Date: Fri, 12 Nov 2021 11:31:39 +0100
Subject: [PATCH] python-imagecodecs: update to 2021.11.11

---
 .../002-pixbuf-install-repfix.patch           | 11 -------
 mingw-w64-libavif/PKGBUILD                    | 32 +++++++++++--------
 .../0001-setup-customize.patch                | 11 +++++++
 mingw-w64-python-imagecodecs/PKGBUILD         | 14 +++++---
 4 files changed, 39 insertions(+), 29 deletions(-)
 delete mode 100644 mingw-w64-libavif/002-pixbuf-install-repfix.patch
 create mode 100644 mingw-w64-python-imagecodecs/0001-setup-customize.patch

diff --git a/mingw-w64-libavif/002-pixbuf-install-repfix.patch b/mingw-w64-libavif/002-pixbuf-install-repfix.patch
deleted file mode 100644
index 717e34d982..0000000000
--- a/mingw-w64-libavif/002-pixbuf-install-repfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavif-0.8.0/contrib/gdk-pixbuf/CMakeLists.txt.orig	2020-07-14 21:50:45.000000000 +0200
-+++ libavif-0.8.0/contrib/gdk-pixbuf/CMakeLists.txt	2020-07-19 19:42:18.291269000 +0200
-@@ -20,7 +20,7 @@
-             target_link_libraries(pixbufloader-avif PUBLIC ${GDK_PIXBUF_LIBRARIES} avif)
-             target_include_directories(pixbufloader-avif PUBLIC ${GDK_PIXBUF_INCLUDE_DIRS})
- 
--            pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
-+            set(GDK_PIXBUF_MODULEDIR "${CMAKE_INSTALL_PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders")
-             string(REPLACE ${GDK_PIXBUF_PREFIX} ${CMAKE_INSTALL_PREFIX} GDK_PIXBUF_MODULEDIR ${GDK_PIXBUF_MODULEDIR})
-             install(TARGETS pixbufloader-avif DESTINATION ${GDK_PIXBUF_MODULEDIR})
-         else()
diff --git a/mingw-w64-libavif/PKGBUILD b/mingw-w64-libavif/PKGBUILD
index 340d52a84c..ece2ece3b9 100644
--- a/mingw-w64-libavif/PKGBUILD
+++ b/mingw-w64-libavif/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libavif
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for encoding and decoding .avif files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -23,27 +23,30 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
              "${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)
-sha512sums=('8e95666c784d1badc7e18d27a7c21cae3b8ef3b8da9a762eb8f7216d77fba29b9ca309c01d13bcf4890e03c6bc335ba4baf3f5877396bd0584be9ea60018daa7'
-            'f0fd57f8b5dff73cbdb0805ce3bbe74116489898fe1332007c08fb83a770c14ef0e18b311afd8908e0097c7bc17a99b4f4ed029912c619a3f3e334c5449e8b3a')
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/AOMediaCodec/libavif/archive/v${pkgver}.tar.gz")
+sha512sums=('8e95666c784d1badc7e18d27a7c21cae3b8ef3b8da9a762eb8f7216d77fba29b9ca309c01d13bcf4890e03c6bc335ba4baf3f5877396bd0584be9ea60018daa7')
 
 prepare() {
-  cd ${_realname}-${pkgver}
-
-  # https://gitlab.kitware.com/cmake/cmake/-/issues/19632
-  patch -p1 -i ${srcdir}/002-pixbuf-install-repfix.patch
+  cd "${srcdir}"/${_realname}-${pkgver}
 }
 
 build() {
-  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
-  mkdir -p build-${CARCH} && cd build-${CARCH}
+  cd "${srcdir}"/${_realname}-${pkgver}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    "${extra_config[@]}" \
     -DAVIF_BUILD_APPS=ON \
     -DAVIF_CODEC_AOM=ON \
     -DAVIF_CODEC_DAV1D=ON \
@@ -59,12 +62,13 @@ build() {
 }
 
 check() {
-  cd ${srcdir}/build-${CARCH}
+  cd ${srcdir}/build-${MSYSTEM}
   ${MINGW_PREFIX}/bin/ctest ./ || true
 }
 
 package() {
-  cd ${srcdir}/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
+
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install
 
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/README.md ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md
diff --git a/mingw-w64-python-imagecodecs/0001-setup-customize.patch b/mingw-w64-python-imagecodecs/0001-setup-customize.patch
new file mode 100644
index 0000000000..055cbc4def
--- /dev/null
+++ b/mingw-w64-python-imagecodecs/0001-setup-customize.patch
@@ -0,0 +1,11 @@
+diff -Naur imagecodecs-2021.11.11_orig/setup.py imagecodecs-2021.11.11/setup.py
+--- imagecodecs-2021.11.11_orig/setup.py	2021-11-12 12:43:03.000000000 +0100
++++ imagecodecs-2021.11.11/setup.py	2021-11-12 11:11:25.939183200 +0100
+@@ -499,6 +499,7 @@
+     del EXTENSIONS['brunsli']
+     del EXTENSIONS['jpeg12']
+     del EXTENSIONS['jpegxl']
++    del EXTENSIONS['mozjpeg']
+     del EXTENSIONS['zfp']
+     del EXTENSIONS['zlibng']
+ 
diff --git a/mingw-w64-python-imagecodecs/PKGBUILD b/mingw-w64-python-imagecodecs/PKGBUILD
index d2e00bde65..6a133f8342 100644
--- a/mingw-w64-python-imagecodecs/PKGBUILD
+++ b/mingw-w64-python-imagecodecs/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=imagecodecs
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=2021.8.26
-pkgrel=2
+pkgver=2021.11.11
+pkgrel=1
 pkgdesc="Image transformation, compression, and decompression codecs (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -33,11 +33,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-blosc"
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cython")
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cgohlke/${_realname}/archive/v${pkgver}.tar.gz")
-sha256sums=('cb8e377f8cf56efd887b9a911457fa84658aae6505663dce0b8b89a3ad29c2da')
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cgohlke/${_realname}/archive/v${pkgver}.tar.gz"
+        "0001-setup-customize.patch")
+sha256sums=('7d82ea8f3577499efd63dbebf6d17896279bf27989a0b9129efe28c89eb0f938'
+            'a673007976a10b70a67753a8cfd91b675d5dbd1c408767603863816b464e3096')
 
 prepare() {
   cd "${srcdir}"
+  pushd "${_realname}-${pkgver}"
+    patch -Np1 -i "${srcdir}"/0001-setup-customize.patch
+  popd
 
   rm -rf python-build-${MINGW_ARCH} || true
   cp -r "${_realname}-${pkgver}" "python-build-${MINGW_ARCH}"
@@ -66,6 +71,7 @@ package() {
   install -Dm644 3rdparty/cfitsio/License.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE-cfitsio"
   install -Dm644 3rdparty/liblj92/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE-liblj92"
   install -Dm644 3rdparty/liblzf/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE-liblzf"
+  install -Dm644 3rdparty/libspng/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE-libspng"
   install -Dm644 3rdparty/postgresql/COPYRIGHT "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE-postgresql"
 
   # remove shebang line