kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py-Pillow: revert openjpeg 2.5.1 fixes, not needed with openjpeg-2.5.1nb1

This commit is contained in:
wiz 2024-02-28 00:04:36 +00:00
parent 383cd5fe3a
commit 6b6cdd35a9
3 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/py-Pillow/distinfo
View File

@ -1,8 +1,6 @@
$NetBSD: distinfo,v 1.62 2024/02/27 10:00:09 adam Exp $
$NetBSD: distinfo,v 1.63 2024/02/28 00:04:36 wiz 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

25
graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KDecode.c
View File

@ -1,25 +0,0 @@
$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;

19
graphics/py-Pillow/patches/patch-src_libImaging_Jpeg2KEncode.c
View File

@ -1,19 +0,0 @@
$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) {