summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2013-04-15 12:07:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-22 14:45:03 +0100
commit26a970188303e4f9c5e9c24db8bf20c2a545be94 (patch)
tree25a0b57ba0c234036cf3cf00a352584dd41a84c5 /meta
parent3a4b7288e86cb7d23ca57454214856b256c22901 (diff)
downloadpoky-26a970188303e4f9c5e9c24db8bf20c2a545be94.tar.gz
libpng: update to 1.6.1
This attempts to fix [YOCTO #4060] - connman-applet spews warnings, but with this one PNG images still don't work in weston :( The ARM NEON option was added because the autodetection code in configure.ac is broken: /usr/lib/weston/weston-desktop-shell: symbol lookup error: /usr/lib/libpng16.so.16: undefined symbol: png_init_filter_functions_neon License checksums update due to date and package version changes: index e95d359..d86a7da 100644 (From OE-Core rev: e31ef0211c2cb18c322517a44b714895e51284e1) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch30
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.6.0.bb20
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.6.1.bb22
3 files changed, 52 insertions, 20 deletions
diff --git a/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch b/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
new file mode 100644
index 0000000000..da5df48594
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
@@ -0,0 +1,30 @@
1From a4fd84bdc69e9929a1040f20ea291ee3115bf5b2 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Mon, 15 Apr 2013 11:16:20 +0200
4Subject: [PATCH] configure: lower automake requirement
5
6We're not using parallel tests in OE-core yet
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9
10Upstream-status: Inapropriate [OE specific build hack]
11---
12 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index 1745d31..7f015fe 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts])
20 # dist-xz requires automake 1.11 or later
21 # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
22 # 1.13 is required for parallel tests
23-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules])
24+AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules])
25 # The following line causes --disable-maintainer-mode to be the default to
26 # configure, this is necessary because libpng distributions cannot rely on the
27 # time stamps of the autotools generated files being correct
28--
291.8.1.4
30
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.0.bb b/meta/recipes-multimedia/libpng/libpng_1.6.0.bb
deleted file mode 100644
index 951e34ae14..0000000000
--- a/meta/recipes-multimedia/libpng/libpng_1.6.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1SUMMARY = "PNG Library"
2DESCRIPTION = "PNG Library"
3HOMEPAGE = "http://www.libpng.org/"
4SECTION = "libs"
5LICENSE = "Libpng"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=03b8ec701cb796c0ec84af22f884edef \
7 file://png.h;beginline=207;endline=321;md5=e829cebefd08488ba5142ea5faea6821"
8DEPENDS = "zlib"
9PR = "r0"
10LIBV = "16"
11
12SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \
13 "
14
15SRC_URI[md5sum] = "3ee623b9a4d33bda7310a5124080b14d"
16SRC_URI[sha256sum] = "5e13c31321083b03956b5ff298bacffab7a7ad35c34c122acef314593944b97b"
17
18inherit autotools binconfig pkgconfig
19
20BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.1.bb b/meta/recipes-multimedia/libpng/libpng_1.6.1.bb
new file mode 100644
index 0000000000..7895a6c4ba
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.1.bb
@@ -0,0 +1,22 @@
1SUMMARY = "PNG Library"
2DESCRIPTION = "PNG Library"
3HOMEPAGE = "http://www.libpng.org/"
4SECTION = "libs"
5LICENSE = "Libpng"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=8273188b2e21c831f5a09fd9285db62f \
7 file://png.h;beginline=207;endline=321;md5=de107fb61766e9d826943f3b6a354fc9"
8DEPENDS = "zlib"
9LIBV = "16"
10
11SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \
12 file://0001-configure-lower-automake-requirement.patch \
13 "
14SRC_URI[md5sum] = "93fc0b0841ce2db0e6756673e22dafc3"
15SRC_URI[sha256sum] = "5ef57f8b9ef591c8504e2a8f78d31779f0c8f2b34b34d01d533360d2483c8946"
16
17inherit autotools binconfig pkgconfig
18
19# Work around missing symbols
20EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"
21
22BBCLASSEXTEND = "native nativesdk"