diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/libgd | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/libgd')
| -rw-r--r-- | package/libgd/Config.in | 11 | ||||
| -rw-r--r-- | package/libgd/Makefile | 8 |
2 files changed, 3 insertions, 16 deletions
diff --git a/package/libgd/Config.in b/package/libgd/Config.in deleted file mode 100644 index af20a95a2..000000000 --- a/package/libgd/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_PACKAGE_LIBGD - prompt "libgd............................. The GD Graphics Library" - tristate - default n - select ADK_PACKAGE_LIBJPEG - select ADK_PACKAGE_LIBPNG - help - The GD Graphics Library - - http://www.libgd.org/ - diff --git a/package/libgd/Makefile b/package/libgd/Makefile index e84ad6066..f36930a5d 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -5,7 +5,8 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gd PKG_VERSION:= 2.0.35 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 +PKG_BUILDDEP+= libpng jpeg PKG_MD5SUM:= 982963448dc36f20cb79b6e9ba6fdede PKG_DESCR:= A library for the dynamic creation of images PKG_SECTION:= libs @@ -17,18 +18,15 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= autotool gnu CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_DIR}/usr/bin/libpng12-config" CONFIGURE_ARGS+= --without-x \ --without-freetype \ --with-jpeg=${STAGING_DIR}/usr \ --with-png=${STAGING_DIR}/usr \ --without-xpm -BUILD_STYLE= auto -INSTALL_STYLE= auto post-install: ${INSTALL_DIR} ${IDIR_LIBGD}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgd.so.* ${IDIR_LIBGD}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libgd.so* ${IDIR_LIBGD}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk |