diff options
| author | taca <taca@pkgsrc.org> | 2016-08-13 17:34:41 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2016-08-13 17:34:41 +0000 |
| commit | 8a7f730e88a45ff56707c60e191cb202a280deab (patch) | |
| tree | d55ba021ff7ab0c90335122fc99379a26522e0e1 /lang/php71 | |
| parent | 941dffb5497ac21d4b205dd5926d6babec88510d (diff) | |
| download | pkgsrc-8a7f730e88a45ff56707c60e191cb202a280deab.tar.gz | |
* Switch to use external gd (graphics/gd package).
* Use the same PKG_OPTIONS as graphics/gd.
Bump PKGREVISION of php-gd.
Diffstat (limited to 'lang/php71')
| -rw-r--r-- | lang/php71/distinfo | 4 | ||||
| -rw-r--r-- | lang/php71/patches/patch-ext_gd_config.m4 | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/lang/php71/distinfo b/lang/php71/distinfo index f4da5fa46b3..4907ad1848d 100644 --- a/lang/php71/distinfo +++ b/lang/php71/distinfo @@ -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 @@ SHA512 (php-7.1.0beta2.tar.bz2) = b41796025beb4efab15302bb38477e176e3831ff6be12e 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 --git a/lang/php71/patches/patch-ext_gd_config.m4 b/lang/php71/patches/patch-ext_gd_config.m4 index 901c37a5e67..53fb15eca34 100644 --- a/lang/php71/patches/patch-ext_gd_config.m4 +++ b/lang/php71/patches/patch-ext_gd_config.m4 @@ -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 @@ $NetBSD: patch-ext_gd_config.m4,v 1.1 2016/08/04 14:09:03 jdolecek Exp $ ],[ -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 ]) + ]) |