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

[packages] libpng: update to 1.2.44, change InstallDev to install libpng*-config script in $(1) and a symlink in $(2), reformat

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@22160 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2010-07-13 03:11:20 +00:00
parent f3ce002e8e
commit e6d2e300bc
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/libpng/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libpng PKG_NAME:=libpng
PKG_VERSION:=1.2.41 PKG_VERSION:=1.2.44
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/libpng PKG_SOURCE_URL:=@SF/libpng
PKG_MD5SUM:=2faa7f8d81e6a35beb991cb75edbf056 PKG_MD5SUM:=e3ac7879d62ad166a6f0c7441390d12b
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -21,8 +21,6 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
TARGET_CFLAGS += $(FPIC)
define Package/libpng define Package/libpng
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
@ -31,25 +29,29 @@ define Package/libpng
URL:=http://www.libpng.org/pub/png/libpng.html URL:=http://www.libpng.org/pub/png/libpng.html
endef endef
define Build/Configure TARGET_CFLAGS += $(FPIC)
$(call Build/Configure/Default, \
CONFIGURE_ARGS += \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--with-zlib="$(STAGING_DIR)/usr" \
)
endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(2)/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(2)/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(1)/usr/bin/
$(SED) \
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
$(1)/usr/bin/libpng{,12}-config
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/libpng12 $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng12 $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,la,so*} $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,^[ILR]_opts=".\+",,g' $(2)/bin/libpng*-config $(INSTALL_DIR) $(2)/bin
for f in libpng{,12}-config; do \
$(LN) ../../usr/bin/$$$$f $(2)/bin/ ; \
done
endef endef
define Package/libpng/install define Package/libpng/install

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

@ -1,6 +1,6 @@
--- a/scripts/libpng-config-body.in --- a/scripts/libpng-config-body.in
+++ b/scripts/libpng-config-body.in +++ b/scripts/libpng-config-body.in
@@ -83,6 +83,7 @@ @@ -83,6 +83,7 @@ while test $# -gt 0; do
--static) --static)
R_opts="" R_opts=""
@ -8,12 +8,3 @@
;; ;;
*) *)
--- 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.41
-Libs: -L${libdir} -lpng12
+Libs: -lpng12
Cflags: -I${includedir}