[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-108-g71ba645
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2016-09-07 12:21:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, buildroot-update has been updated
via 71ba6451d5afe3d2be4ef37beb4fb832f5581759 (commit)
via 3d22de16bab3bf9822a22e92837c1e0f8b8da47a (commit)
via c8050e56014a84170fe0e14c1b1567951f7d933f (commit)
from 9ff22015b49cfb1f542f19abdef94cbd7e54a8dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 71ba6451d5afe3d2be4ef37beb4fb832f5581759
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Sep 7 14:15:57 2016 +0200
[BUILDROOT] 2016.08: libpng: bump to version 1.6.25
commit 3d22de16bab3bf9822a22e92837c1e0f8b8da47a
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Sep 7 14:13:02 2016 +0200
[BUILDROOT] 2016.08: fixes patch 022
commit c8050e56014a84170fe0e14c1b1567951f7d933f
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Sep 7 11:05:03 2016 +0200
[BUILDROOT] 2016.08: rename patch 022
-----------------------------------------------------------------------
Summary of changes:
...03-armadeus-libpng-bump-to-version-1.6.25.patch | 103 ++++++++++++++++++++
...022-armadeus-downgrade-can-utils-version.patch} | 7 +-
.../022-mainline-bump-can-utils-version.patch | 25 -----
patches/buildroot/2016.08/cleanup_buildroot.sh | 1 +
4 files changed, 108 insertions(+), 28 deletions(-)
create mode 100644 patches/buildroot/2016.08/003-armadeus-libpng-bump-to-version-1.6.25.patch
copy patches/buildroot/{2016.05/022-mainline-bump-can-utils-version.patch => 2016.08/022-armadeus-downgrade-can-utils-version.patch} (77%)
delete mode 100644 patches/buildroot/2016.08/022-mainline-bump-can-utils-version.patch
diff --git a/patches/buildroot/2016.08/003-armadeus-libpng-bump-to-version-1.6.25.patch b/patches/buildroot/2016.08/003-armadeus-libpng-bump-to-version-1.6.25.patch
new file mode 100644
index 0000000..b73c656
--- /dev/null
+++ b/patches/buildroot/2016.08/003-armadeus-libpng-bump-to-version-1.6.25.patch
@@ -0,0 +1,103 @@
+From 63e0f57dbc334dd7f107aaef50c4f1f8fda61ba2 Mon Sep 17 00:00:00 2001
+From: Julien BOIBESSOT <jul...@ar...>
+Date: Wed, 7 Sep 2016 10:53:00 +0200
+Subject: [PATCH] libpng: bump to version 1.6.25
+
+1.6.23 tarballs have moved so, while we are at modifying libpng.mk, bump to 1.6.25.
+
+Signed-off-by: Julien BOIBESSOT <jul...@ar...>
+---
+ 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 <jul...@ar...>
++
+ Signed-off-by: Gustavo Zacarias <gu...@za...>
+ ---
+ 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@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 <son...@an...>
+ [Gustavo: update for 1.6.22]
+ Signed-off-by: Gustavo Zacarias <gu...@za...>
+
++[Julien: update for 1.6.25]
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
+ Signed-off-by: Gustavo Zacarias <gu...@za...>
+ ---
+ 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@PNGLIB_MAJOR@@PNGLIB_MINOR@_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@PNGLIB_MAJOR@@PNGLIB_MINOR@_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
+
diff --git a/patches/buildroot/2016.05/022-mainline-bump-can-utils-version.patch b/patches/buildroot/2016.08/022-armadeus-downgrade-can-utils-version.patch
similarity index 77%
copy from patches/buildroot/2016.05/022-mainline-bump-can-utils-version.patch
copy to patches/buildroot/2016.08/022-armadeus-downgrade-can-utils-version.patch
index 8e15332..82540b4 100644
--- a/patches/buildroot/2016.05/022-mainline-bump-can-utils-version.patch
+++ b/patches/buildroot/2016.08/022-armadeus-downgrade-can-utils-version.patch
@@ -1,6 +1,7 @@
-VERSION is taken frome BR 2013.11 as newer can-utils fails to build on old kernels. TO FIX !
+VERSION is taken frome BR 2013.11 as newer can-utils fails to build on old
+kernels. TO FIX !
-Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/can-utils/can-utils.mk
===================================================================
@@ -10,7 +11,7 @@ Index: buildroot/package/can-utils/can-utils.mk
#
################################################################################
--CAN_UTILS_VERSION = f0abaaacb0a3f620f73dd6fd716d7daa3c36a8e3
+-CAN_UTILS_VERSION = b70a76670dbe8925c2a7c75f90d36a28a8878d7a
+CAN_UTILS_VERSION = 16c970d40e6c19dde705bad4751bab1a3a4f3a0d
CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION))
CAN_UTILS_AUTORECONF = YES
diff --git a/patches/buildroot/2016.08/022-mainline-bump-can-utils-version.patch b/patches/buildroot/2016.08/022-mainline-bump-can-utils-version.patch
deleted file mode 100644
index 5a3654b..0000000
--- a/patches/buildroot/2016.08/022-mainline-bump-can-utils-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-VERSION is taken frome BR 2013.11 as newer can-utils fails to build on old kernels. TO FIX !
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/can-utils/can-utils.mk
-===================================================================
---- buildroot.orig/package/can-utils/can-utils.mk
-+++ buildroot/package/can-utils/can-utils.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
-
--CAN_UTILS_VERSION = b70a76670dbe8925c2a7c75f90d36a28a8878d7a
-+CAN_UTILS_VERSION = 16c970d40e6c19dde705bad4751bab1a3a4f3a0d
- CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION))
- CAN_UTILS_AUTORECONF = YES
-
-Index: buildroot/package/can-utils/can-utils.hash
-===================================================================
---- buildroot.orig/package/can-utils/can-utils.hash
-+++ buildroot/package/can-utils/can-utils.hash
-@@ -1,2 +1,2 @@
- # Locally computed
--sha256 8db112e69fceef16617895fa9d4222221fdf44c19eef64912480336c59904765 can-utils-b70a76670dbe8925c2a7c75f90d36a28a8878d7a.tar.gz
-+sha256 28f07d97feab8464bb63e17f5f4d5c777aaea6e47d2d509e8c7611cc115bbd2c can-utils-16c970d40e6c19dde705bad4751bab1a3a4f3a0d.tar.gz
diff --git a/patches/buildroot/2016.08/cleanup_buildroot.sh b/patches/buildroot/2016.08/cleanup_buildroot.sh
index 1bbd408..f52c217 100755
--- a/patches/buildroot/2016.08/cleanup_buildroot.sh
+++ b/patches/buildroot/2016.08/cleanup_buildroot.sh
@@ -119,3 +119,4 @@ rm -rf buildroot/package/xenomai/Config.in
rm -rf buildroot/package/xenomai/xenomai.mk
rm -rf buildroot/system/Config.in
rm -rf buildroot/toolchain/toolchain-external/toolchain-external.mk
+rm -rf buildroot/package/libpng/
hooks/post-receive
--
armadeus
|