[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-296-g6bf0a67
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-296-g6bf0a67
|
From: Sébastien S. <ss...@us...> - 2017-07-05 13:00:03
|
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, master has been updated
via 6bf0a670ccdca3322345fb2b0f37c699c4d33405 (commit)
from 48ca776e8a8792d47c47be08474737c33cbcb3e3 (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 6bf0a670ccdca3322345fb2b0f37c699c4d33405
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jul 5 14:35:31 2017 +0200
[BUILDROOT] 2017.02: fix libpng build
Patch Backported from upstream
-----------------------------------------------------------------------
Summary of changes:
...228-package-libpng-bump-version-to-1.6.29.patch | 81 ++++++++++++++++++++++
patches/buildroot/2017.02/cleanup_buildroot.sh | 3 +
2 files changed, 84 insertions(+)
create mode 100644 patches/buildroot/2017.02/228-package-libpng-bump-version-to-1.6.29.patch
diff --git a/patches/buildroot/2017.02/228-package-libpng-bump-version-to-1.6.29.patch b/patches/buildroot/2017.02/228-package-libpng-bump-version-to-1.6.29.patch
new file mode 100644
index 0000000..628ff50
--- /dev/null
+++ b/patches/buildroot/2017.02/228-package-libpng-bump-version-to-1.6.29.patch
@@ -0,0 +1,81 @@
+From f40bb40075c01ff01edcc482bf3a71970f164e4e Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <ber...@t-...>
+Date: Fri, 21 Apr 2017 15:00:27 +0200
+Subject: [PATCH] package/libpng: bump version to 1.6.29
+
+Refactored patch 0002, added support for Intel SSE2.
+
+Changelog:
+https://sourceforge.net/p/libpng/code/ci/b363e01e6b5e865e536db62ca4480f3a2d4690bd/#diff-2
+
+Signed-off-by: Bernd Kuhls <ber...@t-...>
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+---
+ ...02-Don-t-append-prefix-to-symbol-names-in-version-script.patch | 5 ++++-
+ package/libpng/libpng.hash | 6 +++---
+ package/libpng/libpng.mk | 8 +++++++-
+ 3 files changed, 14 insertions(+), 5 deletions(-)
+
+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 2a9bfd1..de77222 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
+@@ -15,6 +15,9 @@ Signed-off-by: Gustavo Zacarias <gu...@za...>
+ [Julien: update for 1.6.25]
+ Signed-off-by: Julien Boibessot <jul...@ar...>
+
++[Bernd: update for 1.6.29]
++Signed-off-by: Bernd Kuhls <ber...@t-...>
++
+ Signed-off-by: Gustavo Zacarias <gu...@za...>
+ ---
+ Makefile.am | 2 +-
+@@ -44,7 +47,7 @@ index 4e67782..5f468d9 100644
+ -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_7)
++ -DPNG_BUILDING_SYMBOL_TABLE $(am__append_9)
+
+ # 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 e5bd6ba..279420a 100644
+--- a/package/libpng/libpng.hash
++++ b/package/libpng/libpng.hash
+@@ -1,4 +1,4 @@
+-# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.28/
+-sha1 ff4dceadb15e2c929ad26283118d56f66f4a6cff libpng-1.6.28.tar.xz
++# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.29/
++sha1 7dbe6a5088b938545fc0857c507d4e0cf5d9023e libpng-1.6.29.tar.xz
+ # Locally computed:
+-sha256 d8d3ec9de6b5db740fefac702c37ffcf96ae46cb17c18c1544635a3852f78f7a libpng-1.6.28.tar.xz
++sha256 4245b684e8fe829ebb76186327bb37ce5a639938b219882b53d64bd3cfc5f239 libpng-1.6.29.tar.xz
+diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
+index 7ae1dd5..c82c4ef 100644
+--- a/package/libpng/libpng.mk
++++ b/package/libpng/libpng.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-LIBPNG_VERSION = 1.6.28
++LIBPNG_VERSION = 1.6.29
+ LIBPNG_SERIES = 16
+ LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
+ LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION)
+@@ -21,5 +21,11 @@ else
+ LIBPNG_CONF_OPTS += --disable-arm-neon
+ endif
+
++ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
++LIBPNG_CONF_OPTS += --enable-intel-sse
++else
++LIBPNG_CONF_OPTS += --disable-intel-sse
++endif
++
+ $(eval $(autotools-package))
+ $(eval $(host-autotools-package))
+--
+2.7.3
+
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index f75668c..82cd012 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -59,6 +59,9 @@ rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/kodi/Config.in
rm -rf buildroot/package/kodi/kodi.mk
rm -rf buildroot/package/libnl/libnl.hash
+rm -rf buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
+rm -rf buildroot/package/libpng/libpng.hash
+rm -rf buildroot/package/libpng/libpng.mk
rm -rf buildroot/package/linux-headers/2.6.29.6/0001-net-Support-inclusion-of-linux-socket.h-before-sys-s.patch
rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
hooks/post-receive
--
armadeus
|