X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Flibpng%2FMakefile;h=0030549c591852f62b642fbd77dd207a8769198d;hb=0e731f4c739425d6b9f8038539ab552dce570570;hp=b2cbe4f0021fabe7b7dc7a13926f69fe7f254d30;hpb=25b680300e4045f2715128a41efe215ec8689568;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile
index b2cbe4f002..0030549c59 100644
--- a/libs/libpng/Makefile
+++ b/libs/libpng/Makefile
@@ -9,15 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpng
-PKG_VERSION:=1.2.8
+PKG_VERSION:=1.2.29
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-config.tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/libpng
-PKG_MD5SUM:=e5a39003eed16103cbbd3b6a8bc6b1f9
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-config
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=f588cb4ee39e3a333604096f937ea157
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -44,25 +41,16 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(1)/usr/bin/
+	mkdir -p $(2)/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(2)/bin/
 	mkdir -p $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libpng $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libpng12 $(1)/usr/include/
 	mkdir -p $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(1)/usr/lib/
 	mkdir -p $(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(1)/usr/lib/pkgconfig/
-	$(SED) 's,^[ILR]_opts=".\+",,g' $(1)/usr/bin/libpng*-config
-endef
-
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/bin/libpng{,12}-config \
-		$(STAGING_DIR)/usr/include/png{,conf}.h \
-		$(STAGING_DIR)/usr/include/libpng \
-		$(STAGING_DIR)/usr/lib/libpng{,12}.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/libpng{,12}.pc
+	$(SED) 's,^[ILR]_opts=".\+",,g' $(2)/bin/libpng*-config
 endef
 
 define Package/libpng/install