CVS commit: pkgsrc/graphics/png

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu May  8 09:46:21 UTC 2025

Modified Files:
        pkgsrc/graphics/png: Makefile distinfo
Added Files:
        pkgsrc/graphics/png: options.mk

Log Message:
png: add option to build with mozilla's apng patch

It is not enabled by default because:

1) changes the ABI and the implications for all of pkgsrc are unknown
2) is not an offical standard as of mid 2025, although it is expected
   to become a standard as it is included in the latest candidate
   recommendation snapshot:
   https://www.w3.org/TR/2025/CR-png-3-20250313/#apng-frame-based-animation

As such this should not be enabled by default yet.
That said, some Linux distros do ship with this on by default and you
are welcome to try it out.


To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 pkgsrc/graphics/png/Makefile
cvs rdiff -u -r1.155 -r1.156 pkgsrc/graphics/png/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/png/options.mk

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

Modified files:

Index: pkgsrc/graphics/png/Makefile
diff -u pkgsrc/graphics/png/Makefile:1.211 pkgsrc/graphics/png/Makefile:1.212
--- pkgsrc/graphics/png/Makefile:1.211  Sun May  4 13:05:36 2025
+++ pkgsrc/graphics/png/Makefile        Thu May  8 09:46:21 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.211 2025/05/04 13:05:36 adam Exp $
+# $NetBSD: Makefile,v 1.212 2025/05/08 09:46:21 tnn Exp $
 
 DISTNAME=      libpng-1.6.48
 PKGNAME=       ${DISTNAME:S/lib//}
@@ -27,6 +27,8 @@ CPPFLAGS+=    -DPNG_USER_CHUNK_CACHE_MAX=12
 CPPFLAGS.UnixWare+=    -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
 # keep this in sync with the same code in buildlink3.mk
 .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
 CPPFLAGS+=     -DPNG_NO_ASSEMBLER_CODE

Index: pkgsrc/graphics/png/distinfo
diff -u pkgsrc/graphics/png/distinfo:1.155 pkgsrc/graphics/png/distinfo:1.156
--- pkgsrc/graphics/png/distinfo:1.155  Sun May  4 13:05:36 2025
+++ pkgsrc/graphics/png/distinfo        Thu May  8 09:46:21 2025
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.155 2025/05/04 13:05:36 adam Exp $
+$NetBSD: distinfo,v 1.156 2025/05/08 09:46:21 tnn Exp $
 
+BLAKE2s (apng-20252020.patch) = 456a8fcead8bb3fd29936de9a6288bef6769026ff2c955371db0c2098548d68b
+SHA512 (apng-20252020.patch) = 120ac618b60d5e1ff2406d241e4ddc2c1893978653adcf462ce394ce3b6b2e5847545e04b0fcb20aab563a1546017ce622d1d2dd14f89d1d594130d626f1e6eb
+Size (apng-20252020.patch) = 49281 bytes
 BLAKE2s (libpng-1.6.48.tar.xz) = 60f72713d7b4169842b358d535b4d2f6487cef9be2ab194b529531ab2b8bd437
 SHA512 (libpng-1.6.48.tar.xz) = aae6cdd7d55d78aea820165493e31ea7c0de8b2272b709d334dfe7bac96e24099330f0e9049062fde34b6ea926af50987c390dab1b91bdfe3586b2ee4aed8b33
 Size (libpng-1.6.48.tar.xz) = 1054968 bytes

Added files:

Index: pkgsrc/graphics/png/options.mk
diff -u /dev/null pkgsrc/graphics/png/options.mk:1.1
--- /dev/null   Thu May  8 09:46:21 2025
+++ pkgsrc/graphics/png/options.mk      Thu May  8 09:46:21 2025
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2025/05/08 09:46:21 tnn Exp $
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.png
+PKG_SUPPORTED_OPTIONS= apng
+PKG_SUGGESTED_OPTIONS= # do not suggest apng without consulting tech-pkg@
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mapng) || make(distinfo) || make(mdi)
+APNGPATCHVERSION=              20252020
+APNGPATCH=                     apng-${APNGPATCHVERSION}.patch
+PATCHFILES+=                   ${APNGPATCH}
+SITES.${APNGPATCH}=            -https://hg-edge.mozilla.org/mozilla-central/raw-file/1a06aa3c2aab3bdd600869ffa8831c56093c699f/media/libpng/apng.patch
+PATCH_DIST_STRIP.${APNGPATCH}= -p1
+.endif