[3/3] libpng: update to 1.2.56
Message ID | 1466933705-16397-4-git-send-email-marcel.lorenz@ipfire.org |
---|---|
State | Dropped |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (hedwig.ipfire.org [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id EF7F061C24 for <patchwork@ipfire.org>; Sun, 26 Jun 2016 11:35:15 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 39294453C; Sun, 26 Jun 2016 11:35:07 +0200 (CEST) Received: from localhost.localdomain (ip5f5b7cdb.dynamic.kabel-deutschland.de [95.91.124.219]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 06F2E4526 for <development@lists.ipfire.org>; Sun, 26 Jun 2016 11:35:01 +0200 (CEST) From: Marcel Lorenz <marcel.lorenz@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 3/3] libpng: update to 1.2.56 Date: Sun, 26 Jun 2016 11:35:05 +0200 Message-Id: <1466933705-16397-4-git-send-email-marcel.lorenz@ipfire.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466933705-16397-1-git-send-email-marcel.lorenz@ipfire.org> References: <1466933705-16397-1-git-send-email-marcel.lorenz@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Message
Marcel Lorenz
June 26, 2016, 7:35 p.m. UTC
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(-)
Comments
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
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