Date: Tue, 31 Jul 2018 12:55:43 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475998 - in head/graphics: php70-gd/files php71-gd/files php72-gd/files Message-ID: <201807311255.w6VCthbl080500@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Tue Jul 31 12:55:43 2018 New Revision: 475998 URL: https://svnweb.freebsd.org/changeset/ports/475998 Log: graphics/php7*-gd: fix broken build when XPM option is disabled The switch from bundled gd to graphics/gd broke the port if a user disabled the XPM option. PR: 230234 217222 Submitted by: Guido Falsi <madpilot@FreeBSD.org> Reported by: Guido Falsi <madpilot@FreeBSD.org>, Dani <i.dani@outlook.com> Added: head/graphics/php70-gd/files/patch-gd.c (contents, props changed) head/graphics/php71-gd/files/patch-gd.c (contents, props changed) head/graphics/php72-gd/files/patch-gd.c (contents, props changed) Modified: head/graphics/php70-gd/files/patch-config.m4 head/graphics/php71-gd/files/patch-config.m4 head/graphics/php72-gd/files/patch-config.m4 Modified: head/graphics/php70-gd/files/patch-config.m4 ============================================================================== --- head/graphics/php70-gd/files/patch-config.m4 Tue Jul 31 12:47:10 2018 (r475997) +++ head/graphics/php70-gd/files/patch-config.m4 Tue Jul 31 12:55:43 2018 (r475998) @@ -1,7 +1,15 @@ ---- config.m4.orig 2018-07-11 13:18:02 UTC +--- config.m4.orig 2018-07-17 11:06:34 UTC +++ config.m4 -@@ -358,7 +358,7 @@ if test "$PHP_GD" != "no"; then +@@ -295,6 +295,7 @@ dnl enable the support in bundled GD library + if test -n "$GD_XPM_DIR"; then + AC_DEFINE(HAVE_GD_XPM, 1, [ ]) ++ AC_DEFINE(HAVE_XPM, 1, [ ]) + GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" + fi + +@@ -358,7 +359,7 @@ if test "$PHP_GD" != "no"; then + if test "$GD_MODULE_TYPE" = "builtin"; then PHP_ADD_BUILD_DIR($ext_builddir/libgd) - GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" @@ -9,7 +17,7 @@ GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" PHP_TEST_BUILD(foobar, [], [ -@@ -366,7 +366,7 @@ if test "$PHP_GD" != "no"; then +@@ -366,7 +367,7 @@ if test "$PHP_GD" != "no"; then ], [ $GD_SHARED_LIBADD ], [char foobar () {}]) else GD_HEADER_DIRS="ext/gd/" Added: head/graphics/php70-gd/files/patch-gd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/php70-gd/files/patch-gd.c Tue Jul 31 12:55:43 2018 (r475998) @@ -0,0 +1,83 @@ +--- gd.c.orig 2018-07-17 11:06:34 UTC ++++ gd.c +@@ -53,7 +53,7 @@ + # include <Wingdi.h> + #endif + +-#ifdef HAVE_GD_XPM ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + # include <X11/xpm.h> + #endif + +@@ -79,7 +79,7 @@ static int le_gd, le_gd_font; + # endif + #endif + +-#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) + # include "X11/xpm.h" + #endif + +@@ -327,7 +327,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0) + ZEND_ARG_INFO(0, filename) + ZEND_END_ARG_INFO() + +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0) + ZEND_ARG_INFO(0, filename) + ZEND_END_ARG_INFO() +@@ -901,7 +901,7 @@ const zend_function_entry gd_functions[] = { + #endif + PHP_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp) + PHP_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm) +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + PHP_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm) + #endif + PHP_FE(imagecreatefromgd, arginfo_imagecreatefromgd) +@@ -1252,7 +1252,7 @@ PHP_MINFO_FUNCTION(gd) + php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString()); + #endif + php_info_print_table_row(2, "WBMP Support", "enabled"); +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + php_info_print_table_row(2, "XPM Support", "enabled"); + { + char tmp[12]; +@@ -1307,7 +1307,7 @@ PHP_FUNCTION(gd_info) + add_assoc_bool(return_value, "PNG Support", 0); + #endif + add_assoc_bool(return_value, "WBMP Support", 1); +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + add_assoc_bool(return_value, "XPM Support", 1); + #else + add_assoc_bool(return_value, "XPM Support", 0); +@@ -2147,7 +2147,7 @@ PHP_FUNCTION(imagetypes) + ret |= 4; + #endif + ret |= 8; +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + ret |= 16; + #endif + #ifdef HAVE_GD_WEBP +@@ -2397,7 +2397,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_P + case PHP_GDIMG_TYPE_GD2PART: + im = (*func_p)(fp, srcx, srcy, width, height); + break; +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + case PHP_GDIMG_TYPE_XPM: + im = gdImageCreateFromXpm(file); + break; +@@ -2479,7 +2479,7 @@ PHP_FUNCTION(imagecreatefromxbm) + } + /* }}} */ + +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + /* {{{ proto resource imagecreatefromxpm(string filename) + Create a new image from XPM file or URL */ + PHP_FUNCTION(imagecreatefromxpm) Modified: head/graphics/php71-gd/files/patch-config.m4 ============================================================================== --- head/graphics/php71-gd/files/patch-config.m4 Tue Jul 31 12:47:10 2018 (r475997) +++ head/graphics/php71-gd/files/patch-config.m4 Tue Jul 31 12:55:43 2018 (r475998) @@ -1,7 +1,15 @@ ---- config.m4.orig 2018-07-11 13:18:02 UTC +--- config.m4.orig 2018-07-19 06:17:29 UTC +++ config.m4 -@@ -358,7 +358,7 @@ if test "$PHP_GD" != "no"; then +@@ -295,6 +295,7 @@ dnl enable the support in bundled GD library + if test -n "$GD_XPM_DIR"; then + AC_DEFINE(HAVE_GD_XPM, 1, [ ]) ++ AC_DEFINE(HAVE_XPM, 1, [ ]) + GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" + fi + +@@ -358,7 +359,7 @@ if test "$PHP_GD" != "no"; then + if test "$GD_MODULE_TYPE" = "builtin"; then PHP_ADD_BUILD_DIR($ext_builddir/libgd) - GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" @@ -9,7 +17,7 @@ GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" PHP_TEST_BUILD(foobar, [], [ -@@ -366,7 +366,7 @@ if test "$PHP_GD" != "no"; then +@@ -366,7 +367,7 @@ if test "$PHP_GD" != "no"; then ], [ $GD_SHARED_LIBADD ], [char foobar () {}]) else GD_HEADER_DIRS="ext/gd/" Added: head/graphics/php71-gd/files/patch-gd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/php71-gd/files/patch-gd.c Tue Jul 31 12:55:43 2018 (r475998) @@ -0,0 +1,83 @@ +--- gd.c.orig 2018-07-19 06:17:30 UTC ++++ gd.c +@@ -53,7 +53,7 @@ + # include <Wingdi.h> + #endif + +-#ifdef HAVE_GD_XPM ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + # include <X11/xpm.h> + #endif + +@@ -79,7 +79,7 @@ static int le_gd, le_gd_font; + # endif + #endif + +-#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) + # include "X11/xpm.h" + #endif + +@@ -327,7 +327,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0) + ZEND_ARG_INFO(0, filename) + ZEND_END_ARG_INFO() + +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0) + ZEND_ARG_INFO(0, filename) + ZEND_END_ARG_INFO() +@@ -901,7 +901,7 @@ const zend_function_entry gd_functions[] = { + #endif + PHP_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp) + PHP_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm) +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + PHP_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm) + #endif + PHP_FE(imagecreatefromgd, arginfo_imagecreatefromgd) +@@ -1252,7 +1252,7 @@ PHP_MINFO_FUNCTION(gd) + php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString()); + #endif + php_info_print_table_row(2, "WBMP Support", "enabled"); +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + php_info_print_table_row(2, "XPM Support", "enabled"); + { + char tmp[12]; +@@ -1307,7 +1307,7 @@ PHP_FUNCTION(gd_info) + add_assoc_bool(return_value, "PNG Support", 0); + #endif + add_assoc_bool(return_value, "WBMP Support", 1); +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + add_assoc_bool(return_value, "XPM Support", 1); + #else + add_assoc_bool(return_value, "XPM Support", 0); +@@ -2147,7 +2147,7 @@ PHP_FUNCTION(imagetypes) + ret |= 4; + #endif + ret |= 8; +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + ret |= 16; + #endif + #ifdef HAVE_GD_WEBP +@@ -2397,7 +2397,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_P + case PHP_GDIMG_TYPE_GD2PART: + im = (*func_p)(fp, srcx, srcy, width, height); + break; +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + case PHP_GDIMG_TYPE_XPM: + im = gdImageCreateFromXpm(file); + break; +@@ -2479,7 +2479,7 @@ PHP_FUNCTION(imagecreatefromxbm) + } + /* }}} */ + +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + /* {{{ proto resource imagecreatefromxpm(string filename) + Create a new image from XPM file or URL */ + PHP_FUNCTION(imagecreatefromxpm) Modified: head/graphics/php72-gd/files/patch-config.m4 ============================================================================== --- head/graphics/php72-gd/files/patch-config.m4 Tue Jul 31 12:47:10 2018 (r475997) +++ head/graphics/php72-gd/files/patch-config.m4 Tue Jul 31 12:55:43 2018 (r475998) @@ -1,7 +1,15 @@ ---- config.m4.orig 2018-07-11 13:18:02 UTC +--- config.m4.orig 2018-07-17 05:35:52 UTC +++ config.m4 -@@ -358,7 +358,7 @@ if test "$PHP_GD" != "no"; then +@@ -287,6 +287,7 @@ dnl enable the support in bundled GD library + if test -n "$GD_XPM_DIR"; then + AC_DEFINE(HAVE_GD_XPM, 1, [ ]) ++ AC_DEFINE(HAVE_XPM, 1, [ ]) + GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" + fi + +@@ -349,7 +350,7 @@ if test "$PHP_GD" != "no"; then + if test "$GD_MODULE_TYPE" = "builtin"; then PHP_ADD_BUILD_DIR($ext_builddir/libgd) - GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" @@ -9,7 +17,7 @@ GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" PHP_TEST_BUILD(foobar, [], [ -@@ -366,7 +366,7 @@ if test "$PHP_GD" != "no"; then +@@ -357,7 +358,7 @@ if test "$PHP_GD" != "no"; then ], [ $GD_SHARED_LIBADD ], [char foobar () {}]) else GD_HEADER_DIRS="ext/gd/" Added: head/graphics/php72-gd/files/patch-gd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/php72-gd/files/patch-gd.c Tue Jul 31 12:55:43 2018 (r475998) @@ -0,0 +1,83 @@ +--- gd.c.orig 2018-07-17 05:35:52 UTC ++++ gd.c +@@ -53,7 +53,7 @@ + # include <Wingdi.h> + #endif + +-#ifdef HAVE_GD_XPM ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + # include <X11/xpm.h> + #endif + +@@ -77,7 +77,7 @@ static int le_gd, le_gd_font; + # endif + #endif + +-#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) + # include "X11/xpm.h" + #endif + +@@ -325,7 +325,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0) + ZEND_ARG_INFO(0, filename) + ZEND_END_ARG_INFO() + +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0) + ZEND_ARG_INFO(0, filename) + ZEND_END_ARG_INFO() +@@ -934,7 +934,7 @@ const zend_function_entry gd_functions[] = { + #endif + PHP_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp) + PHP_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm) +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + PHP_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm) + #endif + PHP_FE(imagecreatefromgd, arginfo_imagecreatefromgd) +@@ -1299,7 +1299,7 @@ PHP_MINFO_FUNCTION(gd) + php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString()); + #endif + php_info_print_table_row(2, "WBMP Support", "enabled"); +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + php_info_print_table_row(2, "XPM Support", "enabled"); + { + char tmp[12]; +@@ -1354,7 +1354,7 @@ PHP_FUNCTION(gd_info) + add_assoc_bool(return_value, "PNG Support", 0); + #endif + add_assoc_bool(return_value, "WBMP Support", 1); +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + add_assoc_bool(return_value, "XPM Support", 1); + #else + add_assoc_bool(return_value, "XPM Support", 0); +@@ -2184,7 +2184,7 @@ PHP_FUNCTION(imagetypes) + ret |= 4; + #endif + ret |= 8; +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + ret |= 16; + #endif + #ifdef HAVE_GD_WEBP +@@ -2443,7 +2443,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_P + case PHP_GDIMG_TYPE_GD2PART: + im = (*func_p)(fp, srcx, srcy, width, height); + break; +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + case PHP_GDIMG_TYPE_XPM: + im = gdImageCreateFromXpm(file); + break; +@@ -2525,7 +2525,7 @@ PHP_FUNCTION(imagecreatefromxbm) + } + /* }}} */ + +-#if defined(HAVE_GD_XPM) ++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) + /* {{{ proto resource imagecreatefromxpm(string filename) + Create a new image from XPM file or URL */ + PHP_FUNCTION(imagecreatefromxpm)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807311255.w6VCthbl080500>