From 3303e85a3961e0d68b2a548279e94bcd49876e46a625b5df4f6ef5e1a5f608a0 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 22 Jan 2021 07:19:43 +0000 Subject: [PATCH] Accepting request 865546 from home:andythe_great update to 2021.1.11 OBS-URL: https://build.opensuse.org/request/show/865546 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-imagecodecs?expand=0&rev=12 --- always-cythonize.patch | 12 ++++++------ imagecodecs-2020.5.30.tar.gz | 3 --- imagecodecs-2021.1.11.tar.gz | 3 +++ python-imagecodecs.changes | 24 ++++++++++++++++++++++++ python-imagecodecs.spec | 9 ++++++--- zopfli-headers.patch | 23 +++++++++++------------ 6 files changed, 50 insertions(+), 24 deletions(-) delete mode 100644 imagecodecs-2020.5.30.tar.gz create mode 100644 imagecodecs-2021.1.11.tar.gz diff --git a/always-cythonize.patch b/always-cythonize.patch index a7a03dd..f27ca82 100644 --- a/always-cythonize.patch +++ b/always-cythonize.patch @@ -1,12 +1,12 @@ -Index: imagecodecs-2020.5.30/setup.py -=================================================================== ---- imagecodecs-2020.5.30.orig/setup.py -+++ imagecodecs-2020.5.30/setup.py -@@ -71,7 +71,7 @@ if 'sdist' in sys.argv: +Index: imagecodecs-2020.5.30/setup.py +=================================================================== +--- imagecodecs-2020.5.30.orig/setup.py ++++ imagecodecs-2020.5.30/setup.py +@@ -71,7 +71,7 @@ if 'sdist' in sys.argv: OPTIONS = { -- 'cythonize': sys.version_info >= (3, 10), +- 'cythonize': sys.version_info >= (3, 10) or 'PyPy' in sys.version, + 'cythonize': True, 'include_dirs': ['imagecodecs'], 'library_dirs': [], diff --git a/imagecodecs-2020.5.30.tar.gz b/imagecodecs-2020.5.30.tar.gz deleted file mode 100644 index ac896fb..0000000 --- a/imagecodecs-2020.5.30.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8c776922d3a60824d8d3d31ba674a250d1b4d429e81349b5c88c34d4353ddb5 -size 8993252 diff --git a/imagecodecs-2021.1.11.tar.gz b/imagecodecs-2021.1.11.tar.gz new file mode 100644 index 0000000..cb2c784 --- /dev/null +++ b/imagecodecs-2021.1.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a52cf0368055dc9b1f98948deb245e2bbf23b40b74c8a03226a2d9044470754 +size 5256206 diff --git a/python-imagecodecs.changes b/python-imagecodecs.changes index 108890d..3df3d42 100644 --- a/python-imagecodecs.changes +++ b/python-imagecodecs.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Jan 12 21:54:10 UTC 2021 - andy great + +- Update to version 2021.1.11. + * Fix build issues (#7, #8). + * Return bytearray instead of bytes on PyPy. + * Raise TypeError if output provided is bytes (breaking). +- Updates for version 2021.1.8 + * Add float24 codec. + * Update copyrights. +- Updates for version 2020.12.24 + * Update dependencies and build scripts. +- Updates for version 2020.12.22 + * Add AVIF codec via libavif (WIP). + * Add DEFLATE/Zlib and GZIP codecs via libdeflate. + * Add LZ4F codec. + * Add high compression mode option to lz4_encode. + * Convert JPEG XR 16 and 32-bit fixed point pixel types to float32. + * Fix JPEG 2000 lossy encoding. + * Fix GIF disposal handling. + * Remove support for Python 3.6 (NEP 29). +- Rebase always-cythonize.patch +- Rebase zopfli-headers.patch + ------------------------------------------------------------------- Fri Aug 28 09:20:47 UTC 2020 - Tomáš Chvátal diff --git a/python-imagecodecs.spec b/python-imagecodecs.spec index 901e0c2..407c308 100644 --- a/python-imagecodecs.spec +++ b/python-imagecodecs.spec @@ -1,7 +1,7 @@ # # spec file for package python-imagecodecs # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,8 +26,9 @@ %bcond_with test %endif %define skip_python2 1 +%define skip_python36 1 Name: python-imagecodecs%{psuffix} -Version: 2020.5.30 +Version: 2021.1.11 Release: 0 Summary: Image transformation, compression, and decompression codecs License: BSD-3-Clause @@ -64,6 +65,7 @@ BuildRequires: gcc-c++ BuildRequires: giflib-devel BuildRequires: jxrlib-devel BuildRequires: libaec-devel +BuildRequires: libdeflate-devel BuildRequires: libzopfli-devel BuildRequires: pkgconfig BuildRequires: python-rpm-macros @@ -135,7 +137,8 @@ mv __imagecodecs imagecodecs %license LICENSE imagecodecs/licenses/* %doc README.rst %python_alternative %{_bindir}/imagecodecs -%{python_sitearch}/* +%{python_sitearch}/imagecodecs*.egg-info +%{python_sitearch}/imagecodecs %endif %changelog diff --git a/zopfli-headers.patch b/zopfli-headers.patch index 392d4b0..08d3e27 100644 --- a/zopfli-headers.patch +++ b/zopfli-headers.patch @@ -1,13 +1,12 @@ -Index: imagecodecs-2020.5.30/imagecodecs/zopfli.pxd -=================================================================== ---- imagecodecs-2020.5.30.orig/imagecodecs/zopfli.pxd -+++ imagecodecs-2020.5.30/imagecodecs/zopfli.pxd +diff -ruN a/imagecodecs/zopfli.pxd b/imagecodecs/zopfli.pxd +--- a/imagecodecs/zopfli.pxd 2021-01-12 11:06:22.000000000 +0700 ++++ b/imagecodecs/zopfli.pxd 2021-01-13 05:00:24.579533263 +0700 @@ -4,7 +4,7 @@ - # Cython declarations for the `Zopfli 1.0.3` library. - # https://github.com/google/zopfli - --cdef extern from 'zopfli/zopfli.h': -+cdef extern from 'zopfli.h': - - ctypedef struct ZopfliOptions: - int verbose + # Cython declarations for the `Zopfli 1.0.3` library. + # https://github.com/google/zopfli + +-cdef extern from 'zopfli/zopfli.h': ++cdef extern from 'zopfli.h': + + ctypedef struct ZopfliOptions: + int verbose