Quellenupdate:

[ipfire-2.x.git] / lfs / libpng

diff --git a/lfs/libpng b/lfs/libpng
index 321f261a351cba9d59f52d13c20b8f4523b0b53b..fb08037f4f2b95302e5305b2c8d0045bda7e4d2d 100644 (file)
--- a/lfs/libpng
+++ b/lfs/libpng
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: libpng,v 1.3.2.4 2005/02/27 15:23:03 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 1.2.8
+VER        = 1.2.12
 
 THISAPP    = libpng-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/libpng
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cac1512878fb98f2456df6dc50bc9bc7
+$(DL_FILE)_MD5 = e82f39e46aac34a1ca559c79322979be
 
 install : $(TARGET)
 
@@ -78,12 +72,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libpng-1.2.8-link_to_proper_libs-1.patch
-       cd $(DIR_APP) && sed \
-           -e 's%^prefix.*$$%prefix=/usr%' \
-           -e 's%^ZLIBLIB.*$$%ZLIBLIB=/usr/lib%' \
-           -e 's%^ZLIBINC.*$$%ZLIBINC=/usr/include%' \
-           -e 's%-O3%$(CFLAGS)%' scripts/makefile.linux > makefile
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpng-1.2.12-no-asm.patch
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-static --without-libpng-compat
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)