mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

Merge pull request #5150 from val-kulkov/php7-package 

php7-mod-gd: add Freetype 2 support
This commit is contained in:
Michael Heimpold 2017-11-19 21:55:09 +01:00 committed by GitHub
parent 5e42ef5178 e5d785ca3b
commit f569495832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lang/php7/Makefile
View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=php PKG_NAME:=php
PKG_VERSION:=7.1.11 PKG_VERSION:=7.1.11
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
@ -42,7 +42,7 @@ PHP7_MODULES = \
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
$(patsubst %,CONFIG_PACKAGE_php7-mod-%,$(PHP7_MODULES)) \ $(patsubst %,CONFIG_PACKAGE_php7-mod-%,$(PHP7_MODULES)) \
CONFIG_PHP7_FILTER CONFIG_PHP7_LIBXML CONFIG_PHP7_SYSTEMTZDATA CONFIG_PHP7_FILTER CONFIG_PHP7_LIBXML CONFIG_PHP7_SYSTEMTZDATA CONFIG_PHP7_LIBFREETYPE
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
@ -142,6 +142,13 @@ define Package/php7-fpm/description
This package contains the FastCGI Process Manager of the PHP7 interpreter. This package contains the FastCGI Process Manager of the PHP7 interpreter.
endef endef
define Package/php7-mod-gd/config
config PHP7_LIBFREETYPE
bool "Enable Freetype 2 support in php7-mod-gd"
depends on PACKAGE_php7-mod-gd
default y
endef
# not everything groks --disable-nls # not everything groks --disable-nls
DISABLE_NLS:= DISABLE_NLS:=
@ -214,7 +221,6 @@ endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-gd),) ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-gd),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-gd=shared \ --with-gd=shared \
--without-freetype-dir \
--with-jpeg-dir="$(STAGING_DIR)/usr" \ --with-jpeg-dir="$(STAGING_DIR)/usr" \
--with-png-dir="$(STAGING_DIR)/usr" \ --with-png-dir="$(STAGING_DIR)/usr" \
--without-xpm-dir \ --without-xpm-dir \
@ -223,6 +229,11 @@ ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-gd),)
else else
CONFIGURE_ARGS+= --without-gd CONFIGURE_ARGS+= --without-gd
endif endif
ifneq ($(CONFIG_PHP7_LIBFREETYPE),)
CONFIGURE_ARGS+= --with-freetype-dir="$(STAGING_DIR)"
else
CONFIGURE_ARGS+= --without-freetype-dir
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-gmp),) ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-gmp),)
CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr"
@ -574,7 +585,7 @@ $(eval $(call BuildModule,dom,DOM,+@PHP7_LIBXML +PACKAGE_php7-mod-dom:libxml2))
$(eval $(call BuildModule,exif,EXIF)) $(eval $(call BuildModule,exif,EXIF))
$(eval $(call BuildModule,fileinfo,Fileinfo)) $(eval $(call BuildModule,fileinfo,Fileinfo))
$(eval $(call BuildModule,ftp,FTP,+PACKAGE_php7-mod-ftp:libopenssl)) $(eval $(call BuildModule,ftp,FTP,+PACKAGE_php7-mod-ftp:libopenssl))
$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php7-mod-gd:libjpeg +PACKAGE_php7-mod-gd:libpng)) $(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php7-mod-gd:libjpeg +PACKAGE_php7-mod-gd:libpng +PHP7_LIBFREETYPE:libfreetype))
$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php7-mod-gettext:libintl-full)) $(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php7-mod-gettext:libintl-full))
$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php7-mod-gmp:libgmp)) $(eval $(call BuildModule,gmp,GMP,+PACKAGE_php7-mod-gmp:libgmp))
$(eval $(call BuildModule,hash,Hash)) $(eval $(call BuildModule,hash,Hash))