cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang/php73: Use pkg-config to detect freetype

Browse Source 
In PHP 7.4 and above it is already in use.
Also ignore PHP 7.2 because it is scheduled for removal.

PR:		252115
Submitted by:	<daniel.engberg.lists@pyret.net>
Obtained from:	https://aur.archlinux.org/cgit/aur.git/tree/freetype.patch?h=php73
This commit is contained in:
Torsten Zuehlsdorff 2020-12-29 11:01:20 +00:00
parent 8b74956559
commit e277c6e8dc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=559561
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
graphics/php73-gd/files/patch-config.m4
View File

@ -1,6 +1,41 @@
--- config.m4.orig 2018-09-25 09:07:58 UTC
--- config.m4.orig 2020-11-24 11:10:57 UTC
+++ config.m4
@@ -285,6 +285,7 @@ dnl enable the support in bundled GD lib
@@ -184,6 +184,9 @@ AC_DEFUN([PHP_GD_XPM],[
AC_DEFUN([PHP_GD_FREETYPE2],[
if test "$PHP_FREETYPE_DIR" != "no"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ AC_MSG_CHECKING([for freetype])
for i in $PHP_FREETYPE_DIR /usr/local /usr; do
if test -f "$i/bin/freetype-config"; then
FREETYPE2_DIR=$i
@@ -192,13 +195,20 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
fi
done
- if test -z "$FREETYPE2_DIR"; then
+ if test -n "$FREETYPE2_CONFIG"; then
+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+ AC_MSG_RESULT([found in $FREETYPE2_DIR])
+ elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then
+ FREETYPE2_DIR=pkg-config
+ FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags`
+ FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs`
+ AC_MSG_RESULT([found by pkg-config])
+ else
+ AC_MSG_RESULT([not found])
AC_MSG_ERROR([freetype-config not found.])
fi
- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-
PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
@@ -285,6 +295,7 @@ dnl enable the support in bundled GD library
if test -n "$GD_XPM_DIR"; then
AC_DEFINE(HAVE_GD_XPM, 1, [ ])
@ -8,7 +43,7 @@
GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM"
fi
@@ -347,7 +348,7 @@ if test "$PHP_GD" != "no"; then
@@ -347,7 +358,7 @@ if test "$PHP_GD" != "no"; then
if test "$GD_MODULE_TYPE" = "builtin"; then
PHP_ADD_BUILD_DIR($ext_builddir/libgd)
@ -17,7 +52,7 @@
GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
PHP_TEST_BUILD(foobar, [], [
@@ -355,7 +356,7 @@ if test "$PHP_GD" != "no"; then
@@ -355,7 +366,7 @@ if test "$PHP_GD" != "no"; then
], [ $GD_SHARED_LIBADD ], [char foobar () {}])
else
GD_HEADER_DIRS="ext/gd/"

2
lang/php73/Makefile.ext
View File

@ -95,7 +95,7 @@ USES+= ssl
.if ${PHP_MODNAME} == "gd"
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libpng.so:graphics/png
USES+= jpeg
USES+= jpeg pkgconfig
CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \
--with-freetype-dir=${LOCALBASE} \