183130227/tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable jpeg support, add dependency on libpng, standardize.

Browse Source 
SVN-Revision: 3121
This commit is contained in:
Nicolas Thill 2006-02-03 08:31:25 +00:00
parent a72721c306
commit f59707484b
3 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openwrt/package/libgd/Config.in
View File

@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGD
prompt "libgd............................. The GD Graphics Library" prompt "libgd............................. The GD Graphics Library"
tristate tristate
default m if CONFIG_DEVEL default m if CONFIG_DEVEL
select BR2_PACKAGE_LIBJPEG
select BR2_PACKAGE_LIBPNG
help help
The GD Graphics Library The GD Graphics Library

58
openwrt/package/libgd/Makefile
View File

@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gd PKG_NAME:=gd
PKG_VERSION:=2.0.33 PKG_VERSION:=2.0.33
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MD5SUM:=be0a6d326cd8567e736fbc75df0a5c45 PKG_MD5SUM:=be0a6d326cd8567e736fbc75df0a5c45
PKG_SOURCE_URL:=http://www.boutell.com/gd/http PKG_SOURCE_URL:=http://www.boutell.com/gd/http
@ -26,34 +26,34 @@ $(PKG_BUILD_DIR)/.configured:
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \ LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--program-prefix="" \ --program-prefix="" \
--program-suffix="" \ --program-suffix="" \
--prefix=/usr \ --prefix=/usr \
--exec-prefix=/usr \ --exec-prefix=/usr \
--bindir=/usr/bin \ --bindir=/usr/bin \
--datadir=/usr/share \ --datadir=/usr/share \
--includedir=/usr/include \ --includedir=/usr/include \
--infodir=/usr/share/info \ --infodir=/usr/share/info \
--libdir=/usr/lib \ --libdir=/usr/lib \
--libexecdir=/usr/lib \ --libexecdir=/usr/lib \
--localstatedir=/var \ --localstatedir=/var \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--sbindir=/usr/sbin \ --sbindir=/usr/sbin \
--sysconfdir=/etc \ --sysconfdir=/etc \
$(DISABLE_LARGEFILE) \ $(DISABLE_LARGEFILE) \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--disable-rpath \ --disable-rpath \
--with-gnu-ld \ --with-gnu-ld \
--without-x \ --without-x \
--without-freetype \ --without-freetype \
--without-jpeg \ --with-jpeg=$(STAGING_DIR)/usr \
--with-png=$(STAGING_DIR)/usr \ --with-png=$(STAGING_DIR)/usr \
--without-xpm \ --without-xpm \
) )
touch $@ touch $@

2
openwrt/package/libgd/ipkg/libgd.control
View File

@ -1,5 +1,5 @@
Package: libgd Package: libgd
Priority: optional Priority: optional
Section: libs Section: libs
Depends: libpng Depends: libjpeg, libpng
Description: A library for the dynamic creation of images Description: A library for the dynamic creation of images