diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-02-03 08:31:25 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-02-03 08:31:25 +0000 |
| commit | a43bcc5e42667b702a1d26d0cf678929017fd196 (patch) | |
| tree | 7198fd1d86036edb84a310018065845375339ab2 | |
| parent | 028409fa8bc55ed8ba506bf1678510430cf25e15 (diff) | |
enable jpeg support, add dependency on libpng, standardize.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3121 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/libgd/Config.in | 2 | ||||
| -rw-r--r-- | package/libgd/Makefile | 58 | ||||
| -rw-r--r-- | package/libgd/ipkg/libgd.control | 2 |
3 files changed, 32 insertions, 30 deletions
diff --git a/package/libgd/Config.in b/package/libgd/Config.in index 4d1efda80e..8c513bda78 100644 --- a/package/libgd/Config.in +++ b/package/libgd/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGD prompt "libgd............................. The GD Graphics Library" tristate default m if CONFIG_DEVEL + select BR2_PACKAGE_LIBJPEG + select BR2_PACKAGE_LIBPNG help The GD Graphics Library diff --git a/package/libgd/Makefile b/package/libgd/Makefile index 0d31287df0..88933e7021 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gd PKG_VERSION:=2.0.33 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=be0a6d326cd8567e736fbc75df0a5c45 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" \ LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --enable-shared \ - --enable-static \ - --disable-rpath \ - --with-gnu-ld \ - --without-x \ - --without-freetype \ - --without-jpeg \ - --with-png=$(STAGING_DIR)/usr \ - --without-xpm \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --enable-shared \ + --enable-static \ + --disable-rpath \ + --with-gnu-ld \ + --without-x \ + --without-freetype \ + --with-jpeg=$(STAGING_DIR)/usr \ + --with-png=$(STAGING_DIR)/usr \ + --without-xpm \ ) touch $@ diff --git a/package/libgd/ipkg/libgd.control b/package/libgd/ipkg/libgd.control index bd19d9e8fe..f6a78e5c3a 100644 --- a/package/libgd/ipkg/libgd.control +++ b/package/libgd/ipkg/libgd.control @@ -1,5 +1,5 @@ Package: libgd Priority: optional Section: libs -Depends: libpng +Depends: libjpeg, libpng Description: A library for the dynamic creation of images |