Patch issue

[Marius Schamschula]

I’ve been trying to apply a trivial patch to enable libjpeg-turbo (v3) to update py-imagecodecs to 2024.9.22.

I generated the patch using the standard procedure in the MacPorts Guide.

The patch:

--- setup.py.orig	2024-09-21 00:14:09
+++ setup.py	2024-09-22 20:10:24
@@ -594,7 +594,7 @@
     del EXTENSIONS['zlibng']
 
     # uncomment if building with libjpeg-turbo 3
-    # EXTENSIONS['jpeg8']['sources'] = []
+    EXTENSIONS['jpeg8']['sources'] = []
 
     EXTENSIONS['szip']['library_dirs'] = ['%PREFIX%/lib/libaec/lib']
     EXTENSIONS['szip']['include_dirs'] = ['%PREFIX%/lib/libaec/include’]

When I run port -d  patch py312-imagecodecs, I get

Executing:  cd "/opt/local/var/macports/build/_Users_marius_Development_MacPorts_ports_python_py-imagecodecs/py312-imagecodecs/work/imagecodecs-2024.9.22" && /usr/bin/patch -t -N -p0 < '/Users/marius/Development/MacPorts/ports/python/py-imagecodecs/files/patch-setup.py.diff'
DEBUG: system:  cd "/opt/local/var/macports/build/_Users_marius_Development_MacPorts_ports_python_py-imagecodecs/py312-imagecodecs/work/imagecodecs-2024.9.22" && /usr/bin/patch -t -N -p0 < '/Users/marius/Development/MacPorts/ports/python/py-imagecodecs/files/patch-setup.py.diff'
patching file setup.py
1 out of 1 hunks failed--saving rejects to setup.py.rej
Command failed:  cd "/opt/local/var/macports/build/_Users_marius_Development_MacPorts_ports_python_py-imagecodecs/py312-imagecodecs/work/imagecodecs-2024.9.22" && /usr/bin/patch -t -N -p0 < '/Users/marius/Development/MacPorts/ports/python/py-imagecodecs/files/patch-setup.py.diff'

With the following rejects file

@@ -594,7 +594,7 @@
     del EXTENSIONS['zlibng']
 
     # uncomment if building with libjpeg-turbo 3
-    # EXTENSIONS['jpeg8']['sources'] = []
+    EXTENSIONS['jpeg8']['sources'] = []
 
     EXTENSIONS['szip']['library_dirs'] = ['%PREFIX%/lib/libaec/lib']
     EXTENSIONS['szip']['include_dirs'] = ['%PREFIX%/lib/libaec/include']

Patches in other ports seem to apply normally.

Marius
--
Marius Schamschula




-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-users/attachments/20240922/b0359c11/attachment.htm>