Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4281 from val-kulkov/libgd-package

Browse source 
libgd: fix missing dependency, add build options
This commit is contained in:
Hannu Nyman 2017-04-20 10:33:42 +03:00 committed by GitHub
commit 4aacc852f2
1 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
libs/libgd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libgd PKG_NAME:=libgd
PKG_VERSION:=2.2.4 PKG_VERSION:=2.2.4
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd-$(PKG_VERSION)/ PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd-$(PKG_VERSION)/
@ -27,9 +27,10 @@ include $(INCLUDE_DIR)/package.mk
define Package/libgd define Package/libgd
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libjpeg +libpng DEPENDS:=+libjpeg +libpng +LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype
TITLE:=The GD graphics library TITLE:=The GD graphics library
URL:=http://www.libgd.org/ URL:=http://www.libgd.org/
MENU:=1
endef endef
define Package/libgd/description define Package/libgd/description
@ -37,6 +38,23 @@ define Package/libgd/description
programmers. GD creates PNG, JPEG and GIF images, among other formats. programmers. GD creates PNG, JPEG and GIF images, among other formats.
endef endef
define Package/libgd/config
if PACKAGE_libgd
config LIBGD_TIFF
bool "TIFF image support"
default n
help
Enable TIFF image support through libtiff
endif
if PACKAGE_libgd
config LIBGD_FREETYPE
bool "Freetype 2.x library support"
default n
help
Enable Freetype 2.x font engine support through libfreetype
endif
endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
@ -45,12 +63,25 @@ CONFIGURE_ARGS += \
--disable-rpath \ --disable-rpath \
--without-x \ --without-x \
--without-fontconfig \ --without-fontconfig \
--without-freetype \
--with-jpeg=$(STAGING_DIR)/usr \ --with-jpeg=$(STAGING_DIR)/usr \
--with-png=$(STAGING_DIR)/usr \ --with-png=$(STAGING_DIR)/usr \
--with-vpx=no \ --without-xpm
--without-xpm \
--without-iconv ifdef CONFIG_LIBGD_TIFF
CONFIGURE_ARGS+= \
--with-tiff=$(STAGING_DIR)/usr
else
CONFIGURE_ARGS+= \
--without-tiff
endif
ifdef CONFIG_LIBGD_FREETYPE
CONFIGURE_ARGS+= \
--with-freetype=$(STAGING_DIR)/usr
else
CONFIGURE_ARGS+= \
--without-freetype
endif
CONFIGURE_VARS += \ CONFIGURE_VARS += \
ac_cv_header_iconv_h=no ac_cv_header_iconv_h=no