From c00b49e315be124dc00a4e511a67a9ba9e2fc4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <miloskomarcevic@aim.com>
Date: Tue, 12 Jan 2021 11:14:14 +0100
Subject: [PATCH] python-imagecodecs: update setup patch

---
 .../0003-mingw-fix-setup.patch                 | 18 ++++++++++--------
 mingw-w64-python-imagecodecs/PKGBUILD          |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mingw-w64-python-imagecodecs/0003-mingw-fix-setup.patch b/mingw-w64-python-imagecodecs/0003-mingw-fix-setup.patch
index 9d7074088e..be8bbd86eb 100644
--- a/mingw-w64-python-imagecodecs/0003-mingw-fix-setup.patch
+++ b/mingw-w64-python-imagecodecs/0003-mingw-fix-setup.patch
@@ -1,7 +1,7 @@
-diff -Naur imagecodecs-2020.12.22_orig/setup.py imagecodecs-2020.12.22/setup.py
---- imagecodecs-2020.12.22_orig/setup.py	2020-12-23 17:21:01.000000000 +0100
-+++ imagecodecs-2020.12.22/setup.py	2020-12-23 16:20:21.213615700 +0100
-@@ -176,7 +176,7 @@
+diff -Naur imagecodecs-2021.1.11_orig/setup.py imagecodecs-2021.1.11/setup.py
+--- imagecodecs-2021.1.11_orig/setup.py	2021-01-12 05:06:22.000000000 +0100
++++ imagecodecs-2021.1.11/setup.py	2021-01-12 11:06:37.866632200 +0100
+@@ -179,7 +179,7 @@
      """Customize build for common platforms: recent Debian, arch..."""
      import platform
  
@@ -10,18 +10,20 @@ diff -Naur imagecodecs-2020.12.22_orig/setup.py imagecodecs-2020.12.22/setup.py
      del EXTENSIONS['jpeg12']  # jpeg12 requires custom build
      del EXTENSIONS['lerc']  # LERC library not commonly available
      del EXTENSIONS['lz4f']  # requires static linking
-@@ -188,13 +188,8 @@
+@@ -191,13 +191,10 @@
          del EXTENSIONS['jpegxl']  # Brunsli library not commonly available
          del EXTENSIONS['zfp']  # ZFP library not commonly available
  
 -    if sys.platform == 'win32':
 -        EXTENSIONS['bz2']['libraries'] = ['libbz2']
 -    else:
--        EXTENSIONS['jpeg2k']['include_dirs'].append(
--            '/usr/include/openjpeg-2.3'
+-        EXTENSIONS['jpeg2k']['include_dirs'].extend(
+-            ('/usr/include/openjpeg-2.3', '/usr/include/openjpeg-2.4')
 -        )
 -        EXTENSIONS['jpegxr']['include_dirs'].append('/usr/include/jxrlib')
-+    EXTENSIONS['jpeg2k']['include_dirs'].append(sys.prefix + '/include/openjpeg-2.3')
++    EXTENSIONS['jpeg2k']['include_dirs'].extend(
++        (sys.prefix + '/include/openjpeg-2.3', sys.prefix + '/include/openjpeg-2.4')
++    )
 +    EXTENSIONS['jpegxr']['include_dirs'].append(sys.prefix + '/include/jxrlib')
  
  
diff --git a/mingw-w64-python-imagecodecs/PKGBUILD b/mingw-w64-python-imagecodecs/PKGBUILD
index ddc9782ac1..6f2b7ca2a3 100644
--- a/mingw-w64-python-imagecodecs/PKGBUILD
+++ b/mingw-w64-python-imagecodecs/PKGBUILD
@@ -32,7 +32,7 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cgohlke/imagecodecs
         "0003-mingw-fix-setup.patch")
 sha256sums=('5a52cf0368055dc9b1f98948deb245e2bbf23b40b74c8a03226a2d9044470754'
             'de24ec8970281639f8daf396477c9fbd34a12723c82568cd411247b074729425'
-            '9aa110a221116b88412c9dfb1cc431021a4431fdf41287c46537466e651ceceb')
+            'e84f5747fc44a519f4440f4fff817ae570fa76b678c26661820576cab763db34')
 
 prepare() {
   cd "${srcdir}"