Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1709028009120800"
MIME-Version: 1.0
Date: Tue, 27 Feb 2024 10:00:09 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/graphics/py-Pillow
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20240227100009.6A0BCFA27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1709028009120800
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Tue Feb 27 10:00:09 UTC 2024

Modified Files:
	pkgsrc/graphics/py-Pillow: Makefile distinfo
Added Files:
	pkgsrc/graphics/py-Pillow/patches: patch-src_libImaging_Jpeg2KDecode.c
	    patch-src_libImaging_Jpeg2KEncode.c

Log Message:
py-Pillow: fix for OpenJPEG 2.5.1 (OPJ_VERSION_MAJOR is defined); bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/graphics/py-Pillow/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/graphics/py-Pillow/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KDecode.c \
    pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KEncode.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1709028009120800
Content-Disposition: inline
Content-Length: 3754
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/graphics/py-Pillow/Makefile
diff -u pkgsrc/graphics/py-Pillow/Makefile:1.78 pkgsrc/graphics/py-Pillow/Makefile:1.79
--- pkgsrc/graphics/py-Pillow/Makefile:1.78	Fri Jan  5 23:47:53 2024
+++ pkgsrc/graphics/py-Pillow/Makefile	Tue Feb 27 10:00:09 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2024/01/05 23:47:53 adam Exp $
+# $NetBSD: Makefile,v 1.79 2024/02/27 10:00:09 adam Exp $
 
 DISTNAME=	pillow-10.2.0
+PKGREVISION=	1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^p/P/}
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pillow/}

Index: pkgsrc/graphics/py-Pillow/distinfo
diff -u pkgsrc/graphics/py-Pillow/distinfo:1.61 pkgsrc/graphics/py-Pillow/distinfo:1.62
--- pkgsrc/graphics/py-Pillow/distinfo:1.61	Fri Jan  5 23:47:53 2024
+++ pkgsrc/graphics/py-Pillow/distinfo	Tue Feb 27 10:00:09 2024
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.61 2024/01/05 23:47:53 adam Exp $
+$NetBSD: distinfo,v 1.62 2024/02/27 10:00:09 adam Exp $
 
 BLAKE2s (pillow-10.2.0.tar.gz) = 14a9e9655b2623c4d0928df7446eea99a0b5617414802e4f7531d520bc79318c
 SHA512 (pillow-10.2.0.tar.gz) = 9fac2cdc9539f947629cee428d55cf60a8d44c91cee8d8205907a79a9d0334062a46e3eb316069069d2f1298a8c0bbcc8f55b24122695d19e72728e093df63e5
 Size (pillow-10.2.0.tar.gz) = 46212712 bytes
 SHA1 (patch-setup.py) = 80ee74a110e21e7c4071ab9ba0a7c1f3ede64355
+SHA1 (patch-src_libImaging_Jpeg2KDecode.c) = c761bc8e9ae0740802fa9b4c645f19c1e71fd33c
+SHA1 (patch-src_libImaging_Jpeg2KEncode.c) = 154a9d4e68f5ae0c12c8e0792d52fd77900c3d5c

Added files:

Index: pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KDecode.c
diff -u /dev/null pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KDecode.c:1.1
--- /dev/null	Tue Feb 27 10:00:09 2024
+++ pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KDecode.c	Tue Feb 27 10:00:09 2024
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_libImaging_Jpeg2KDecode.c,v 1.1 2024/02/27 10:00:09 adam Exp $
+
+Fix for OpenJPEG 2.5.1.
+
+--- src/libImaging/Jpeg2KDecode.c.orig	2024-02-27 09:47:51.462363389 +0000
++++ src/libImaging/Jpeg2KDecode.c
+@@ -668,10 +668,6 @@ j2k_decode_entry(Imaging im, ImagingCode
+     opj_stream_set_read_function(stream, j2k_read);
+     opj_stream_set_skip_function(stream, j2k_skip);
+ 
+-    /* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
+-#ifndef OPJ_VERSION_MAJOR
+-    opj_stream_set_user_data(stream, state);
+-#else
+     opj_stream_set_user_data(stream, state, NULL);
+ 
+     /* Hack: if we don't know the length, the largest file we can
+@@ -683,7 +679,6 @@ j2k_decode_entry(Imaging im, ImagingCode
+     } else {
+         opj_stream_set_user_data_length(stream, context->length);
+     }
+-#endif
+ 
+     /* Setup decompression context */
+     context->error_msg = NULL;
Index: pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KEncode.c
diff -u /dev/null pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KEncode.c:1.1
--- /dev/null	Tue Feb 27 10:00:09 2024
+++ pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KEncode.c	Tue Feb 27 10:00:09 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_libImaging_Jpeg2KEncode.c,v 1.1 2024/02/27 10:00:09 adam Exp $
+
+Fix for OpenJPEG 2.5.1.
+
+--- src/libImaging/Jpeg2KEncode.c.orig	2024-02-27 09:53:26.334381456 +0000
++++ src/libImaging/Jpeg2KEncode.c
+@@ -295,12 +295,7 @@ j2k_encode_entry(Imaging im, ImagingCode
+     opj_stream_set_skip_function(stream, j2k_skip);
+     opj_stream_set_seek_function(stream, j2k_seek);
+ 
+-    /* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
+-#ifndef OPJ_VERSION_MAJOR
+-    opj_stream_set_user_data(stream, state);
+-#else
+     opj_stream_set_user_data(stream, state, NULL);
+-#endif
+ 
+     /* Setup an opj_image */
+     if (strcmp(im->mode, "L") == 0) {


--_----------=_1709028009120800--