All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] libpng: bump to version 1.6.25
@ 2016-09-07  9:02 julien.boibessot at free.fr
  2016-09-07 10:04 ` Peter Korsgaard
  0 siblings, 1 reply; 4+ messages in thread
From: julien.boibessot at free.fr @ 2016-09-07  9:02 UTC (permalink / raw)
  To: buildroot

From: Julien BOIBESSOT <julien.boibessot@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@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@armadeus.com>
+
 Signed-off-by: Gustavo Zacarias <gustavo@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@analog.com>
 [Gustavo: update for 1.6.22]
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
+[Julien: update for 1.6.25]
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+
 Signed-off-by: Gustavo Zacarias <gustavo@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
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 0dfc535..c577cd5 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBPNG_VERSION = 1.6.23
+LIBPNG_VERSION = 1.6.25
 LIBPNG_SERIES = 16
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
 LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION)
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH] libpng: bump to version 1.6.25
  2016-09-07  9:02 [Buildroot] [PATCH] libpng: bump to version 1.6.25 julien.boibessot at free.fr
@ 2016-09-07 10:04 ` Peter Korsgaard
  2016-09-07 12:56   ` Julien Boibessot
  0 siblings, 1 reply; 4+ messages in thread
From: Peter Korsgaard @ 2016-09-07 10:04 UTC (permalink / raw)
  To: buildroot

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

 > From: Julien BOIBESSOT <julien.boibessot@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@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@armadeus.com>
 > +
 >  Signed-off-by: Gustavo Zacarias <gustavo@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@analog.com>
 >  [Gustavo: update for 1.6.22]
 >  Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
 > +[Julien: update for 1.6.25]
 > +Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
 > +
 >  Signed-off-by: Gustavo Zacarias <gustavo@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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH] libpng: bump to version 1.6.25
  2016-09-07 10:04 ` Peter Korsgaard
@ 2016-09-07 12:56   ` Julien Boibessot
  2016-09-07 13:05     ` Gustavo Zacarias
  0 siblings, 1 reply; 4+ messages in thread
From: Julien Boibessot @ 2016-09-07 12:56 UTC (permalink / raw)
  To: buildroot

Hello Peter,

On 07/09/2016 12:04, Peter Korsgaard wrote:
>>>>>> "julien" == julien boibessot <julien.boibessot@free.fr> writes:
>  [snip]
>  > 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.
>
well, I couldn't find upstream hashes. Where did you get them ?

Regards,

Julien

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH] libpng: bump to version 1.6.25
  2016-09-07 12:56   ` Julien Boibessot
@ 2016-09-07 13:05     ` Gustavo Zacarias
  0 siblings, 0 replies; 4+ messages in thread
From: Gustavo Zacarias @ 2016-09-07 13:05 UTC (permalink / raw)
  To: buildroot

On 2016-09-07 09:56, Julien Boibessot wrote:

>> Why did you remove the upstream hashes?
>> 
>> Committed after adding back the upstream sha1 hash, thanks.
>> 
> well, I couldn't find upstream hashes. Where did you get them ?
> 
> Regards,
> 
> Julien

Hi Julien.
Go to https://sourceforge.net/projects/libpng/files/libpng16/1.6.25/
Hit the 'i' button for the file you want hashes for.
Regards.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-09-07 13:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-07  9:02 [Buildroot] [PATCH] libpng: bump to version 1.6.25 julien.boibessot at free.fr
2016-09-07 10:04 ` Peter Korsgaard
2016-09-07 12:56   ` Julien Boibessot
2016-09-07 13:05     ` Gustavo Zacarias

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.