From 5057c918f3ac7d6aa790ec7263173f68b30b4651 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 20 Jun 2008 13:18:33 +0000
Subject: [PATCH] Update libpng (#3570)

SVN-Revision: 11545
---
 libs/libpng/Makefile                          | 11 ++++------
 libs/libpng/patches/100-config_fix.patch      | 22 +++++++++----------
 .../patches/101-pkgconfig-install.patch       | 21 ------------------
 3 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile
index 40dd9de812..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
 
@@ -48,7 +45,7 @@ define Build/InstallDev
 	$(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
diff --git a/libs/libpng/patches/100-config_fix.patch b/libs/libpng/patches/100-config_fix.patch
index 453d271096..e86b9c10af 100644
--- a/libs/libpng/patches/100-config_fix.patch
+++ b/libs/libpng/patches/100-config_fix.patch
@@ -1,19 +1,19 @@
---- libpng3-1.2.5.0.orig/scripts/libpng-config-body.in
-+++ libpng3-1.2.5.0/scripts/libpng-config-body.in
+--- a/scripts/libpng-config-body.in
++++ b/scripts/libpng-config-body.in
 @@ -83,6 +83,7 @@
-
+ 
      --static)
          R_opts=""
 +        libs=${all_libs}
          ;;
-
+ 
      *)
---- libpng3-1.2.5.0.orig/scripts/libpng.pc.in
-+++ libpng3-1.2.5.0/scripts/libpng.pc.in
-@@ -7,5 +7,5 @@
- Name: libpng12
+--- a/scripts/libpng.pc.in
++++ b/scripts/libpng.pc.in
+@@ -6,5 +6,5 @@
+ Name: libpng
  Description: Loads and saves PNG files
- Version: 1.2.8
--Libs: -L${libdir} -lpng12 -lz -lm
+ Version: 1.2.29
+-Libs: -L${libdir} -lpng12
 +Libs: -lpng12
- Cflags: -I${includedir}/libpng12
+ Cflags: -I${includedir}
diff --git a/libs/libpng/patches/101-pkgconfig-install.patch b/libs/libpng/patches/101-pkgconfig-install.patch
index 7f362fbc3b..e69de29bb2 100644
--- a/libs/libpng/patches/101-pkgconfig-install.patch
+++ b/libs/libpng/patches/101-pkgconfig-install.patch
@@ -1,21 +0,0 @@
---- libpng-1.2.8-config/Makefile.in.orig	2004-12-03 01:14:51.000000000 +0100
-+++ libpng-1.2.8-config/Makefile.in	2005-05-18 14:17:31.000000000 +0200
-@@ -874,13 +874,13 @@
- 	cp libpng.pc libpng12.pc
- 
- install-data-local: libpng.pc libpng12.pc
--	@INSTALL@ -d @PKGCONFIGDIR@
--	@INSTALL_DATA@ libpng.pc @PKGCONFIGDIR@
--	@INSTALL_DATA@ libpng12.pc @PKGCONFIGDIR@
-+	@INSTALL@ -d $(DESTDIR)@PKGCONFIGDIR@
-+	@INSTALL_DATA@ libpng.pc $(DESTDIR)@PKGCONFIGDIR@
-+	@INSTALL_DATA@ libpng12.pc $(DESTDIR)@PKGCONFIGDIR@
- 
- uninstall-local:
--	rm -f @PKGCONFIGDIR@/libpng.pc
--	rm -f @PKGCONFIGDIR@/libpng12.pc
-+	rm -f $(DESTDIR)@PKGCONFIGDIR@/libpng.pc
-+	rm -f $(DESTDIR)@PKGCONFIGDIR@/libpng12.pc
- 
- libpng-config:
- 	( cat ${srcdir}/scripts/libpng-config-head.in; \
-- 
2.30.2