diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/libpng/Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/libpng/Makefile')
| -rw-r--r-- | package/libpng/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 6b0a332e6..11111108d 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libpng -PKG_VERSION:= 1.2.35 +PKG_VERSION:= 1.2.36 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8ca6246930a57d5be7adc7c4e7fb5e00 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/} +PKG_MD5SUM:= 4779cd011409ea9b591e11638781f0bf +PKG_DESCR:= A library for reading/writing PNG images +PKG_SECTION:= libs +PKG_DEPENDS:= zlib +PKG_URL:= http://www.libpng.org/pub/png/libpng.html +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto |