[pkgsrc/trunk]: pkgsrc * Switch to use external gd (graphics/gd package).

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc * Switch to use external gd (graphics/gd package).
From: taca <taca%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 05:48:55 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a7ca88d80cbc
branches:  trunk
changeset: 351079:a7ca88d80cbc
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Aug 13 17:34:41 2016 +0000

description:
* Switch to use external gd (graphics/gd package).
* Use the same PKG_OPTIONS as graphics/gd.

Bump PKGREVISION of php-gd.

diffstat:

 graphics/php-gd/Makefile                  |  12 ++++++------
 graphics/php-gd/options.mk                |  14 ++++++++++++++
 lang/php55/distinfo                       |   4 ++--
 lang/php55/patches/patch-ext_gd_config.m4 |  15 +++++++++++++--
 lang/php56/distinfo                       |   4 ++--
 lang/php56/patches/patch-ext_gd_config.m4 |  15 +++++++++++++--
 lang/php70/distinfo                       |   4 ++--
 lang/php70/patches/patch-ext_gd_config.m4 |  15 +++++++++++++--
 lang/php71/distinfo                       |   4 ++--
 lang/php71/patches/patch-ext_gd_config.m4 |  15 +++++++++++++--
 10 files changed, 80 insertions(+), 22 deletions(-)

diffs (232 lines):

diff -r 040fc3f4aa18 -r a7ca88d80cbc graphics/php-gd/Makefile
--- a/graphics/php-gd/Makefile  Sat Aug 13 17:33:21 2016 +0000
+++ b/graphics/php-gd/Makefile  Sat Aug 13 17:34:41 2016 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2015/03/20 16:33:28 taca Exp $
+# $NetBSD: Makefile,v 1.38 2016/08/13 17:34:41 taca Exp $
 
 MODNAME=               gd
+PKGREVISION=           1
 CATEGORIES+=           graphics
 COMMENT=               PHP extension for GD graphics library
 
@@ -9,7 +10,7 @@
 # XXX we use bundled GD so that extension is usable also by non-threaded
 # PHP, such as CLI/CGI version or ap-php on Apache 1.x.
 
-CONFIGURE_ARGS+=       --with-${MODNAME}
+CONFIGURE_ARGS+=       --with-${MODNAME}=${BUILDLINK_DIR:Q}
 CONFIGURE_ARGS+=       --with-jpeg-dir=${BUILDLINK_DIR:Q}
 CONFIGURE_ARGS+=       --with-png-dir=${BUILDLINK_DIR:Q}
 CONFIGURE_ARGS+=       --with-zlib-dir=${BUILDLINK_DIR:Q}
@@ -20,9 +21,8 @@
 
 USE_PHP_EXT_PATCHES=   yes
 
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.include "options.mk"
+
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 040fc3f4aa18 -r a7ca88d80cbc graphics/php-gd/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/php-gd/options.mk        Sat Aug 13 17:34:41 2016 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2016/08/13 17:34:41 taca Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gd
+PKG_SUPPORTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libXpm/buildlink3.mk"
+CONFIGURE_ENV+=                X11BASE=${X11BASE}
+CONFIGURE_ARGS+=       --with-xpm-dir=${BUILDLINK_PREFIX.libXpm}
+.else
+CONFIGURE_ARGS+=       --with-xpm-dir=no
+.endif
diff -r 040fc3f4aa18 -r a7ca88d80cbc lang/php55/distinfo
--- a/lang/php55/distinfo       Sat Aug 13 17:33:21 2016 +0000
+++ b/lang/php55/distinfo       Sat Aug 13 17:34:41 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2016/07/24 13:38:54 jdolecek Exp $
+$NetBSD: distinfo,v 1.57 2016/08/13 17:34:41 taca Exp $
 
 SHA1 (php-5.5.38.tar.bz2) = ac79d48510e4bfe8f376d009e3ecb5b734bbc3a1
 RMD160 (php-5.5.38.tar.bz2) = 2f1f0ff08c963975c6a624ecc83432cf48be3b39
@@ -8,7 +8,7 @@
 SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
 SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2
 SHA1 (patch-configure) = e81731b426b31656de72a4e4b3ad341b5ac34f82
-SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
+SHA1 (patch-ext_gd_config.m4) = 2ded986b3a6faea38298e1385d14446e04c88bd2
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
 SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
diff -r 040fc3f4aa18 -r a7ca88d80cbc lang/php55/patches/patch-ext_gd_config.m4
--- a/lang/php55/patches/patch-ext_gd_config.m4 Sat Aug 13 17:33:21 2016 +0000
+++ b/lang/php55/patches/patch-ext_gd_config.m4 Sat Aug 13 17:34:41 2016 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_gd_config.m4,v 1.2 2013/08/17 13:15:21 taca Exp $
+$NetBSD: patch-ext_gd_config.m4,v 1.3 2016/08/13 17:34:41 taca Exp $
 
---- ext/gd/config.m4.orig      2013-08-15 20:42:04.000000000 +0000
+--- ext/gd/config.m4.orig      2016-07-20 08:41:48.000000000 +0000
 +++ ext/gd/config.m4
 @@ -49,18 +49,7 @@ dnl Checks for the configure options
  dnl
@@ -47,3 +47,14 @@
      ],[
        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
      ])
+@@ -249,7 +237,9 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp,  [AC_DEFINE(HAVE_GD_WEBP,             1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+-  PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  if test "$PHP_XPM_DIR" != "no"; then
++     PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  fi
+   PHP_CHECK_LIBRARY(gd, gdImageStringFT,        [AC_DEFINE(HAVE_GD_FREETYPE,         1, [ ])], [], [ $GD_SHARED_LIBADD ])
+ ])
+ 
diff -r 040fc3f4aa18 -r a7ca88d80cbc lang/php56/distinfo
--- a/lang/php56/distinfo       Sat Aug 13 17:33:21 2016 +0000
+++ b/lang/php56/distinfo       Sat Aug 13 17:34:41 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2016/07/24 13:29:56 jdolecek Exp $
+$NetBSD: distinfo,v 1.32 2016/08/13 17:34:41 taca Exp $
 
 SHA1 (php-5.6.24.tar.bz2) = c2b3ad1d968fbc615702ff0860efc3b35ca1fb70
 RMD160 (php-5.6.24.tar.bz2) = 6be7a7ea3a59dbbb618cb1251caf32f5332e5def
@@ -6,7 +6,7 @@
 Size (php-5.6.24.tar.bz2) = 14905924 bytes
 SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
 SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c
-SHA1 (patch-ext_gd_config.m4) = 4b44853250eb4a638af4c663e618307ff25d2cbd
+SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19
 SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
 SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
 SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8
diff -r 040fc3f4aa18 -r a7ca88d80cbc lang/php56/patches/patch-ext_gd_config.m4
--- a/lang/php56/patches/patch-ext_gd_config.m4 Sat Aug 13 17:33:21 2016 +0000
+++ b/lang/php56/patches/patch-ext_gd_config.m4 Sat Aug 13 17:34:41 2016 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_gd_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-ext_gd_config.m4,v 1.2 2016/08/13 17:34:41 taca Exp $
 
---- ext/gd/config.m4.orig      2014-11-12 13:52:21.000000000 +0000
+--- ext/gd/config.m4.orig      2016-07-21 00:23:03.000000000 +0000
 +++ ext/gd/config.m4
 @@ -49,18 +49,7 @@ dnl Checks for the configure options
  dnl
@@ -47,3 +47,14 @@
      ],[
        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
      ])
+@@ -249,7 +237,9 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp,  [AC_DEFINE(HAVE_GD_WEBP,             1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+-  PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  if test "$PHP_XPM_DIR" != "no"; then
++     PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  fi
+   PHP_CHECK_LIBRARY(gd, gdImageStringFT,        [AC_DEFINE(HAVE_GD_FREETYPE,         1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdVersionString,        [AC_DEFINE(HAVE_GD_LIBVERSION,       1, [ ])], [], [ $GD_SHARED_LIBADD ])
+ ])
diff -r 040fc3f4aa18 -r a7ca88d80cbc lang/php70/distinfo
--- a/lang/php70/distinfo       Sat Aug 13 17:33:21 2016 +0000
+++ b/lang/php70/distinfo       Sat Aug 13 17:34:41 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2016/07/24 13:27:23 jdolecek Exp $
+$NetBSD: distinfo,v 1.17 2016/08/13 17:34:41 taca Exp $
 
 SHA1 (php-7.0.9.tar.bz2) = bc94c0c0d548ab4b89840994f9f3b468a3d89c4b
 RMD160 (php-7.0.9.tar.bz2) = d6771507506336da29f88ae59e5d93da4207bfdd
@@ -6,7 +6,7 @@
 Size (php-7.0.9.tar.bz2) = 14870061 bytes
 SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
 SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
-SHA1 (patch-ext_gd_config.m4) = a7ec1bd0d876657d4b5e597b9aa1e97c2d2801e3
+SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_pcre_pcrelib_config.h) = 0cb05c3b3bfafd8119cf43162c0f4db7f5b37ba8
 SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
diff -r 040fc3f4aa18 -r a7ca88d80cbc lang/php70/patches/patch-ext_gd_config.m4
--- a/lang/php70/patches/patch-ext_gd_config.m4 Sat Aug 13 17:33:21 2016 +0000
+++ b/lang/php70/patches/patch-ext_gd_config.m4 Sat Aug 13 17:34:41 2016 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_gd_config.m4,v 1.1 2015/12/06 15:17:31 taca Exp $
+$NetBSD: patch-ext_gd_config.m4,v 1.2 2016/08/13 17:34:41 taca Exp $
 
---- ext/gd/config.m4.orig      2015-12-01 13:36:33.000000000 +0000
+--- ext/gd/config.m4.orig      2016-07-20 13:11:57.000000000 +0000
 +++ ext/gd/config.m4
 @@ -46,18 +46,7 @@ dnl Checks for the configure options
  dnl
@@ -47,3 +47,14 @@
      ],[
        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
      ])
+@@ -230,7 +218,9 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp,  [AC_DEFINE(HAVE_GD_WEBP,             1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+-  PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  if test "$PHP_XPM_DIR" != "no"; then
++    PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  fi
+   PHP_CHECK_LIBRARY(gd, gdImageStringFT,        [AC_DEFINE(HAVE_GD_FREETYPE,         1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdVersionString,        [AC_DEFINE(HAVE_GD_LIBVERSION,       1, [ ])], [], [ $GD_SHARED_LIBADD ])
+ ])
diff -r 040fc3f4aa18 -r a7ca88d80cbc lang/php71/distinfo
--- a/lang/php71/distinfo       Sat Aug 13 17:33:21 2016 +0000
+++ b/lang/php71/distinfo       Sat Aug 13 17:34:41 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2016/08/06 11:32:14 jdolecek Exp $
+$NetBSD: distinfo,v 1.3 2016/08/13 17:34:41 taca Exp $
 
 SHA1 (php-7.1.0beta2.tar.bz2) = afee69f869f5f74debfeae80f2a7b651a98d153e
 RMD160 (php-7.1.0beta2.tar.bz2) = eef00755c2a5d54223dc723a4e4cec8c80bec417
@@ -6,7 +6,7 @@
 Size (php-7.1.0beta2.tar.bz2) = 15398914 bytes
 SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
 SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
-SHA1 (patch-ext_gd_config.m4) = a7ec1bd0d876657d4b5e597b9aa1e97c2d2801e3
+SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_pcre_pcrelib_config.h) = 0cb05c3b3bfafd8119cf43162c0f4db7f5b37ba8
 SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
diff -r 040fc3f4aa18 -r a7ca88d80cbc lang/php71/patches/patch-ext_gd_config.m4
--- a/lang/php71/patches/patch-ext_gd_config.m4 Sat Aug 13 17:33:21 2016 +0000
+++ b/lang/php71/patches/patch-ext_gd_config.m4 Sat Aug 13 17:34:41 2016 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_gd_config.m4,v 1.1 2016/08/04 14:09:03 jdolecek Exp $
+$NetBSD: patch-ext_gd_config.m4,v 1.2 2016/08/13 17:34:41 taca Exp $
 
---- ext/gd/config.m4.orig      2015-12-01 13:36:33.000000000 +0000
+--- ext/gd/config.m4.orig      2016-08-05 21:30:28.000000000 +0000
 +++ ext/gd/config.m4
 @@ -46,18 +46,7 @@ dnl Checks for the configure options
  dnl
@@ -47,3 +47,14 @@
      ],[
        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
      ])
+@@ -230,7 +218,9 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp,  [AC_DEFINE(HAVE_GD_WEBP,             1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+-  PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  if test "$PHP_XPM_DIR" != "no"; then
++    PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  fi
+   PHP_CHECK_LIBRARY(gd, gdImageStringFT,        [AC_DEFINE(HAVE_GD_FREETYPE,         1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdVersionString,        [AC_DEFINE(HAVE_GD_LIBVERSION,       1, [ ])], [], [ $GD_SHARED_LIBADD ])
+ ])
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of graphics/php-gd package to 5.6.24nb1.
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc New package, go-runewidth-0.0.1.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of graphics/php-gd package to 5.6.24nb1.
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc New package, go-runewidth-0.0.1.
Indexes:
Home | Main Index | Thread Index | Old Index