Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

python-imagecodecs: Update to 2020.12.24

Browse Source
This commit is contained in:
Miloš Komarčević
2020-12-25 20:26:43 +01:00
parent 0f3079f6a1
commit 16f05aefb7
3 changed files with 28 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mingw-w64-python-imagecodecs/0001-mingw-fix-liblzf-3.6.patch
View File

@@ -1,25 +0,0 @@
diff -Naur imagecodecs-2020.5.30_orig/liblzf-3.6/lzf_c.c imagecodecs-2020.5.30/liblzf-3.6/lzf_c.c
--- imagecodecs-2020.5.30_orig/liblzf-3.6/lzf_c.c 2010/06/01 09:11:33 1.44
+++ imagecodecs-2020.5.30/liblzf-3.6/lzf_c.c 2017/05/24 18:37:18 1.51
@@ -114,13 +110,18 @@
/* off requires a type wide enough to hold a general pointer difference.
* ISO C doesn't have that (size_t might not be enough and ptrdiff_t only
- * works for differences within a single object). We also assume that no
+ * works for differences within a single object). We also assume that
* no bit pattern traps. Since the only platform that is both non-POSIX
* and fails to support both assumptions is windows 64 bit, we make a
* special workaround for it.
*/
-#if defined (WIN32) && defined (_M_X64)
- unsigned _int64 off; /* workaround for missing POSIX compliance */
+#if defined (_WIN32) && defined (_M_X64)
+ /* workaround for missing POSIX compliance */
+ #if __GNUC__
+ unsigned long long off;
+ #else
+ unsigned __int64 off;
+ #endif
#else
unsigned long off;
#endif

34
mingw-w64-python-imagecodecs/0003-mingw-fix-setup.patch
View File

@@ -1,20 +1,28 @@
diff -Naur imagecodecs-2020.5.30_orig/setup.py imagecodecs-2020.5.30/setup.py
--- imagecodecs-2020.5.30_orig/setup.py 2020-05-31 15:06:11.000000000 +0200
+++ imagecodecs-2020.5.30/setup.py 2020-10-09 15:57:46.464535100 +0200
@@ -156,11 +156,11 @@
if 'arch' in platform.platform():
del EXTENSIONS['zopfli'] # zopfli/zopfli.h does not exist
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 @@
"""Customize build for common platforms: recent Debian, arch..."""
import platform
- del EXTENSIONS['avif'] # libavif library not commonly available
+ # del EXTENSIONS['avif'] # libavif library not commonly available
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 @@
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'] = ['/usr/include/openjpeg-2.3']
- EXTENSIONS['jpegxr']['include_dirs'] = ['/usr/include/jxrlib']
+ # if sys.platform == 'win32':
+ # EXTENSIONS['bz2']['libraries'] = ['libbz2']
+ # else
+ EXTENSIONS['jpeg2k']['include_dirs'] = [sys.prefix + '/include/openjpeg-2.3']
+ EXTENSIONS['jpegxr']['include_dirs'] = [sys.prefix + '/include/jxrlib']
- EXTENSIONS['jpeg2k']['include_dirs'].append(
- '/usr/include/openjpeg-2.3'
- )
- EXTENSIONS['jpegxr']['include_dirs'].append('/usr/include/jxrlib')
+ EXTENSIONS['jpeg2k']['include_dirs'].append(sys.prefix + '/include/openjpeg-2.3')
+ EXTENSIONS['jpegxr']['include_dirs'].append(sys.prefix + '/include/jxrlib')
def customize_build_cg(EXTENSIONS, OPTIONS):

15
mingw-w64-python-imagecodecs/PKGBUILD
View File

@@ -3,7 +3,7 @@
_realname=imagecodecs
pkgbase=mingw-w64-python-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
pkgver=2020.5.30
pkgver=2020.12.24
pkgrel=1
pkgdesc='Image transformation, compression, and decompression codecs (mingw-w64)'
arch=('any')
@@ -14,6 +14,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-blosc"
"${MINGW_PACKAGE_PREFIX}-jxrlib"
"${MINGW_PACKAGE_PREFIX}-lcms2"
"${MINGW_PACKAGE_PREFIX}-libaec"
"${MINGW_PACKAGE_PREFIX}-libavif"
"${MINGW_PACKAGE_PREFIX}-libdeflate"
"${MINGW_PACKAGE_PREFIX}-libjpeg"
"${MINGW_PACKAGE_PREFIX}-libmng"
"${MINGW_PACKAGE_PREFIX}-libpng"
@@ -26,18 +28,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-blosc"
makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
"${MINGW_PACKAGE_PREFIX}-cython")
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cgohlke/imagecodecs/archive/v${pkgver}.tar.gz"
"0001-mingw-fix-liblzf-3.6.patch"
"0002-mingw-fix-zopfli-header.patch"
"0003-mingw-fix-setup.patch")
sha256sums=('4d750b4eb6b2bb33ae14897d6d5affe8ae22f5a6e8a04823f19bb1a05619a4b4'
'ae7ef708851c0fb4aba0500b915bab07f1e9d13347018fe3f8363dab4d215358'
sha256sums=('73c36ccf7f7f68472d9273c72e4c63e616e27afea0f6f9ff871a8ad9a3c70bcc'
'de24ec8970281639f8daf396477c9fbd34a12723c82568cd411247b074729425'
'eb812d5804733ff4885cadb0f7de154632ee12356f58baed41f3ff44842c24c0')
'9aa110a221116b88412c9dfb1cc431021a4431fdf41287c46537466e651ceceb')
prepare() {
cd "${srcdir}"
pushd "${_realname}-${pkgver}"
patch -p1 -i ${srcdir}/0001-mingw-fix-liblzf-3.6.patch
patch -p1 -i ${srcdir}/0002-mingw-fix-zopfli-header.patch
patch -p1 -i ${srcdir}/0003-mingw-fix-setup.patch
popd
@@ -62,8 +61,8 @@ package() {
--root="${pkgdir}" --optimize=1 --skip-build
install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
install -Dm644 bitshuffle-0.3.5/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE-bitshuffle"
install -Dm644 liblzf-3.6/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE-liblzf"
install -Dm644 3rdparty/bitshuffle/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE-bitshuffle"
install -Dm644 3rdparty/liblzf/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE-liblzf"
local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
# fix python command in files