[Buildroot] [PATCH] libpng: bump to version 1.6.25

Peter Korsgaard peter at korsgaard.com
Wed Sep 7 10:04:17 UTC 2016


>>>>> "julien" == julien boibessot <julien.boibessot at free.fr> writes:

 > From: Julien BOIBESSOT <julien.boibessot at armadeus.com>
 > 1.6.23 tarballs have moved so, while we are at modifying libpng.mk, bump to 1.6.25.

 > Signed-off-by: Julien BOIBESSOT <julien.boibessot at armadeus.com>
 > ---
 >  package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch        | 5 ++++-
 >  ...2-Don-t-append-prefix-to-symbol-names-in-version-script.patch | 9 ++++++---
 >  package/libpng/libpng.hash                                       | 5 ++---
 >  package/libpng/libpng.mk                                         | 2 +-
 >  4 files changed, 13 insertions(+), 8 deletions(-)

 > diff --git a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch
 > index 30c3623..d232e4d 100644
 > --- a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch
 > +++ b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch
 > @@ -7,6 +7,9 @@ Disable the new pngfix and png-fix-itxt tools: they take up space, fail
 >  to build on some oddball toolchain configurations and aren't
 >  expected/needed in a non-interactive embedded system.
 
 > +[Julien: update for 1.6.25]
 > +Signed-off-by: Julien Boibessot <julien.boibessot at armadeus.com>
 > +
 >  Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
 >  ---
 >   Makefile.am | 2 +-
 > @@ -32,7 +35,7 @@ index a66f6aa..4e67782 100644
 >  +++ b/Makefile.in
 >  @@ -104,7 +104,7 @@ check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \
 >   	pngstest$(EXEEXT) pngvalid$(EXEEXT) pngimage$(EXEEXT) \
 > - 	$(am__EXEEXT_1)
 > + 	pngcp$(EXEEXT) $(am__EXEEXT_1)
 >   @HAVE_CLOCK_GETTIME_TRUE at am__append_1 = timepng
 >  -bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT)
 >  +bin_PROGRAMS =
 > diff --git a/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch b/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
 > index 0754e21..2a9bfd1 100644
 > --- a/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
 > +++ b/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
 > @@ -12,6 +12,9 @@ Original patch by: Sonic Zhang <sonic.zhang at analog.com>
 >  [Gustavo: update for 1.6.22]
 >  Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
 
 > +[Julien: update for 1.6.25]
 > +Signed-off-by: Julien Boibessot <julien.boibessot at armadeus.com>
 > +
 >  Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
 >  ---
 >   Makefile.am | 2 +-
 > @@ -22,7 +25,7 @@ diff --git a/Makefile.am b/Makefile.am
 >  index 3430dca..db6a7a2 100644
 >  --- a/Makefile.am
 >  +++ b/Makefile.am
 > -@@ -236,7 +236,7 @@ contrib/tools/pngfix.o: pnglibconf.h
 > +@@ -245,7 +245,7 @@ contrib/tools/pngfix.o: pnglibconf.h
 >   # interfering with the symbol file format.
 >   SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG at PNGLIB_MAJOR@@PNGLIB_MINOR at _0'\
 >   		-DPNGLIB_VERSION='@PNGLIB_VERSION@'\
 > @@ -35,13 +38,13 @@ diff --git a/Makefile.in b/Makefile.in
 >  index 4e67782..5f468d9 100644
 >  --- a/Makefile.in
 >  +++ b/Makefile.in
 > -@@ -754,7 +754,7 @@ SUFFIXES = .chk .out
 > +@@ -766,7 +766,7 @@ SUFFIXES = .chk .out
 >   # interfering with the symbol file format.
 >   SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG at PNGLIB_MAJOR@@PNGLIB_MINOR at _0' \
 >   	-DPNGLIB_VERSION='@PNGLIB_VERSION@' \
 >  -	-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DPNG_NO_USE_READ_MACROS \
 >  +	-DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS \
 > - 	-DPNG_BUILDING_SYMBOL_TABLE $(am__append_6)
 > + 	-DPNG_BUILDING_SYMBOL_TABLE $(am__append_7)
  
 >   # EXT_LIST is a list of the possibly library directory extensions, this exists
 >  -- 
 > diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash
 > index 04e8e40..b179aea 100644
 > --- a/package/libpng/libpng.hash
 > +++ b/package/libpng/libpng.hash
 > @@ -1,3 +1,2 @@
 > -# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.23/
 > -md5	9b320a05ed4db1f3f0865c8a951fd9aa	libpng-1.6.23.tar.xz
 > -sha1	4857fb8dbd5ca7ddacc40c183e340b9ffa34a097	libpng-1.6.23.tar.xz
 > +# Locally computed:
 > +sha256 09fe8d8341e8bfcfb3263100d9ac7ea2155b28dd8535f179111c1672ac8d8811  libpng-1.6.25.tar.xz

Why did you remove the upstream hashes?

Committed after adding back the upstream sha1 hash, thanks.

-- 
Bye, Peter Korsgaard



More information about the buildroot mailing list