bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update libpng (#3570)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11545 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-06-20 13:18:33 +00:00
parent 82317235c5
commit a2d28bcaf2
3 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/libpng/Makefile
View File

@ -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

22
libs/libpng/patches/100-config_fix.patch
View File

@ -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}

21
libs/libpng/patches/101-pkgconfig-install.patch
View File

@ -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; \