Changeset 22160 for packages


Ignore:
Timestamp:
2010-07-13T05:11:20+02:00 (6 years ago)
Author:
nico
Message:

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

Location:
packages/libs/libpng
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/libpng/Makefile

    r19705 r22160  
    99 
    1010PKG_NAME:=libpng 
    11 PKG_VERSION:=1.2.41 
     11PKG_VERSION:=1.2.44 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=@SF/libpng 
    16 PKG_MD5SUM:=2faa7f8d81e6a35beb991cb75edbf056 
     16PKG_MD5SUM:=e3ac7879d62ad166a6f0c7441390d12b 
    1717 
    1818PKG_FIXUP:=libtool 
     
    2121include $(INCLUDE_DIR)/host-build.mk 
    2222include $(INCLUDE_DIR)/package.mk 
    23  
    24 TARGET_CFLAGS += $(FPIC) 
    2523 
    2624define Package/libpng 
     
    3230endef 
    3331 
    34 define Build/Configure 
    35         $(call Build/Configure/Default, \ 
    36                 --enable-shared \ 
    37                 --enable-static \ 
    38                 --with-zlib="$(STAGING_DIR)/usr" \ 
    39         ) 
    40 endef 
     32TARGET_CFLAGS += $(FPIC) 
     33 
     34CONFIGURE_ARGS += \ 
     35        --enable-shared \ 
     36        --enable-static \ 
    4137 
    4238define Build/InstallDev 
    43         $(INSTALL_DIR) $(2)/bin 
    44         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(2)/bin/ 
     39        $(INSTALL_DIR) $(1)/usr/bin 
     40        $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(1)/usr/bin/ 
     41        $(SED) \ 
     42                's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ 
     43                $(1)/usr/bin/libpng{,12}-config 
    4544        $(INSTALL_DIR) $(1)/usr/include 
    4645        $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(1)/usr/include/ 
    4746        $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng12 $(1)/usr/include/ 
    4847        $(INSTALL_DIR) $(1)/usr/lib 
    49         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(1)/usr/lib/ 
     48        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,la,so*} $(1)/usr/lib/ 
    5049        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig 
    5150        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(1)/usr/lib/pkgconfig/ 
    52         $(SED) 's,^[ILR]_opts=".\+",,g' $(2)/bin/libpng*-config 
     51        $(INSTALL_DIR) $(2)/bin 
     52        for f in libpng{,12}-config; do \ 
     53                $(LN) ../../usr/bin/$$$$f $(2)/bin/ ; \ 
     54        done 
    5355endef 
    5456 
  • packages/libs/libpng/patches/100-config_fix.patch

    r18685 r22160  
    11--- a/scripts/libpng-config-body.in 
    22+++ b/scripts/libpng-config-body.in 
    3 @@ -83,6 +83,7 @@ 
     3@@ -83,6 +83,7 @@ while test $# -gt 0; do 
    44  
    55     --static) 
     
    99  
    1010     *) 
    11 --- a/scripts/libpng.pc.in 
    12 +++ b/scripts/libpng.pc.in 
    13 @@ -6,5 +6,5 @@ 
    14  Name: libpng 
    15  Description: Loads and saves PNG files 
    16  Version: 1.2.41 
    17 -Libs: -L${libdir} -lpng12 
    18 +Libs: -lpng12 
    19  Cflags: -I${includedir} 
Note: See TracChangeset for help on using the changeset viewer.