Am Mi, 6. Jul, 2016 um 2:28 schrieb Jonatan Schlag jonatan.schlag@ipfire.org:
Hi
Am So, 26. Jun, 2016 um 11:35 schrieb Marcel Lorenz marcel.lorenz@ipfire.org:
http://www.libpng.org/pub/png/libpng.html
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
config/rootfiles/common/libpng | 13 ++----------- lfs/libpng | 11 ++++------- 2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/config/rootfiles/common/libpng b/config/rootfiles/common/libpng index c29eaa7..27e4180 100644 --- a/config/rootfiles/common/libpng +++ b/config/rootfiles/common/libpng @@ -1,22 +1,13 @@ -#usr/bin/libpng-config #usr/bin/libpng12-config #usr/include/libpng12 #usr/include/libpng12/png.h #usr/include/libpng12/pngconf.h -#usr/include/png.h -#usr/include/pngconf.h #usr/lib/libpng.a -#usr/lib/libpng.la -usr/lib/libpng.so usr/lib/libpng.so.3 -usr/lib/libpng.so.3.46.0 +usr/lib/libpng.so.3.56.0 #usr/lib/libpng12.a #usr/lib/libpng12.la usr/lib/libpng12.so usr/lib/libpng12.so.0 -usr/lib/libpng12.so.0.46.0 -#usr/lib/pkgconfig/libpng.pc +usr/lib/libpng12.so.0.56.0 #usr/lib/pkgconfig/libpng12.pc -#usr/share/man/man3/libpng.3 -#usr/share/man/man3/libpngpf.3 -#usr/share/man/man5/png.5 diff --git a/lfs/libpng b/lfs/libpng index 7075118..1d61aec 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -1,7 +1,7 @@
############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -21,13 +21,12 @@
############################################################################### # Definitions
###############################################################################
include Config
-VER = 1.2.46 +VER = 1.2.56
THISAPP = libpng-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +39,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 03ddfc17ad321db93f984581e9415d22 +$(DL_FILE)_MD5 = 868562bd1c58b76ed8703f135a2e439a
install : $(TARGET)
@@ -56,10 +55,8 @@ md5 : $(subst %,%_MD5,$(objects))
$(patsubst %,$(DIR_CHK)/%,$(objects)) : @$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) : @$(LOAD)
$(subst %,%_MD5,$(objects)) : @$(MD5)
-- 1.9.1
The patch applies without errors, looks good and builds fine.
Regards Jonatan
Hi,
... but produces root file errors:
cat /data/ipfire-2.x/log/libpng-1.2.56
+usr/bin/libpng-config #usr/bin/libpng12-config #usr/include/libpng12 #usr/include/libpng12/png.h #usr/include/libpng12/pngconf.h +usr/include/png.h +usr/include/pngconf.h #usr/lib/libpng.a +usr/lib/libpng.la +usr/lib/libpng.so usr/lib/libpng.so.3 usr/lib/libpng.so.3.56.0 #usr/lib/libpng12.a #usr/lib/libpng12.la usr/lib/libpng12.so usr/lib/libpng12.so.0 usr/lib/libpng12.so.0.56.0 +usr/lib/pkgconfig/libpng.pc #usr/lib/pkgconfig/libpng12.pc +usr/share/man/man3/libpng.3 +usr/share/man/man3/libpngpf.3 +usr/share/man/man5/png.5
So could you send a second version with a correct rootfile?
Regards Jonatan