CVS commit: pkgsrc/graphics/gd

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Sun Sep 19 19:25:14 UTC 2021

Modified Files:
        pkgsrc/graphics/gd: Makefile distinfo
Added Files:
        pkgsrc/graphics/gd/patches: patch-src_gd.h

Log Message:
Fix php-gd build PR pkg/56409


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 pkgsrc/graphics/gd/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/graphics/gd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gd/patches/patch-src_gd.h

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

Modified files:

Index: pkgsrc/graphics/gd/Makefile
diff -u pkgsrc/graphics/gd/Makefile:1.130 pkgsrc/graphics/gd/Makefile:1.131
--- pkgsrc/graphics/gd/Makefile:1.130   Fri Sep 17 14:24:23 2021
+++ pkgsrc/graphics/gd/Makefile Sun Sep 19 19:25:14 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.130 2021/09/17 14:24:23 adam Exp $
+# $NetBSD: Makefile,v 1.131 2021/09/19 19:25:14 prlw1 Exp $
 
 DISTNAME=      libgd-2.3.3
 PKGNAME=       ${DISTNAME:S/libgd/gd/}
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libgd/}
 GITHUB_PROJECT=        libgd

Index: pkgsrc/graphics/gd/distinfo
diff -u pkgsrc/graphics/gd/distinfo:1.51 pkgsrc/graphics/gd/distinfo:1.52
--- pkgsrc/graphics/gd/distinfo:1.51    Fri Sep 17 14:24:23 2021
+++ pkgsrc/graphics/gd/distinfo Sun Sep 19 19:25:14 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.51 2021/09/17 14:24:23 adam Exp $
+$NetBSD: distinfo,v 1.52 2021/09/19 19:25:14 prlw1 Exp $
 
 SHA1 (libgd-2.3.3.tar.xz) = 7ce6ecb5aed26c08246a37b6351c886ab4b51ca2
 RMD160 (libgd-2.3.3.tar.xz) = 97564248f7f14e90921c5571ff69d1aba5e016cc
 SHA512 (libgd-2.3.3.tar.xz) = aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c
 Size (libgd-2.3.3.tar.xz) = 2809056 bytes
+SHA1 (patch-src_gd.h) = 2527eeb670e21d82abdf485846297c81982d1dea
 SHA1 (patch-src_gd__xbm.c) = 948942243b97a8e96838447ea1325a28ac8c828a

Added files:

Index: pkgsrc/graphics/gd/patches/patch-src_gd.h
diff -u /dev/null pkgsrc/graphics/gd/patches/patch-src_gd.h:1.1
--- /dev/null   Sun Sep 19 19:25:14 2021
+++ pkgsrc/graphics/gd/patches/patch-src_gd.h   Sun Sep 19 19:25:14 2021
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_gd.h,v 1.1 2021/09/19 19:25:14 prlw1 Exp $
+
+Revert "Fix #318, these macros are not used as planed, we have
+separate functions for each.
+https://github.com/libgd/libgd/commit/f4bc1f5c26925548662946ed7cfa473c190a104a
+
+--- src/gd.h.orig      2021-09-11 04:52:47.000000000 +0000
++++ src/gd.h
+@@ -1604,6 +1604,11 @@ BGD_DECLARE(void) gdImageFlipHorizontal(
+ BGD_DECLARE(void) gdImageFlipVertical(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipBoth(gdImagePtr im);
+ 
++#define GD_FLIP_HORINZONTAL 1 /* typo, kept for BC */
++#define GD_FLIP_HORIZONTAL 1
++#define GD_FLIP_VERTICAL 2
++#define GD_FLIP_BOTH 3
++
+ /**
+  * Group: Crop
+  *