diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2013-04-15 12:07:31 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-22 14:43:42 +0100 |
| commit | e31ef0211c2cb18c322517a44b714895e51284e1 (patch) | |
| tree | 8339c690e9637a6ddc645e5ff5920891c2c9723e /meta/recipes-multimedia/libpng | |
| parent | d18cec89e7afd05473232e587893334c4f921b41 (diff) | |
| download | openembedded-core-contrib-e31ef0211c2cb18c322517a44b714895e51284e1.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
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia/libpng')
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 00000000000..da5df485944 --- /dev/null +++ b/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch @@ -0,0 +1,30 @@ +From a4fd84bdc69e9929a1040f20ea291ee3115bf5b2 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Mon, 15 Apr 2013 11:16:20 +0200 +Subject: [PATCH] configure: lower automake requirement + +We're not using parallel tests in OE-core yet + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> + +Upstream-status: Inapropriate [OE specific build hack] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1745d31..7f015fe 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts]) + # dist-xz requires automake 1.11 or later + # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1 + # 1.13 is required for parallel tests +-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules]) ++AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules]) + # The following line causes --disable-maintainer-mode to be the default to + # configure, this is necessary because libpng distributions cannot rely on the + # time stamps of the autotools generated files being correct +-- +1.8.1.4 + 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 951e34ae14e..00000000000 --- a/meta/recipes-multimedia/libpng/libpng_1.6.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "PNG Library" -DESCRIPTION = "PNG Library" -HOMEPAGE = "http://www.libpng.org/" -SECTION = "libs" -LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=03b8ec701cb796c0ec84af22f884edef \ - file://png.h;beginline=207;endline=321;md5=e829cebefd08488ba5142ea5faea6821" -DEPENDS = "zlib" -PR = "r0" -LIBV = "16" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ - " - -SRC_URI[md5sum] = "3ee623b9a4d33bda7310a5124080b14d" -SRC_URI[sha256sum] = "5e13c31321083b03956b5ff298bacffab7a7ad35c34c122acef314593944b97b" - -inherit autotools binconfig pkgconfig - -BBCLASSEXTEND = "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 00000000000..7895a6c4ba5 --- /dev/null +++ b/meta/recipes-multimedia/libpng/libpng_1.6.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "PNG Library" +DESCRIPTION = "PNG Library" +HOMEPAGE = "http://www.libpng.org/" +SECTION = "libs" +LICENSE = "Libpng" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8273188b2e21c831f5a09fd9285db62f \ + file://png.h;beginline=207;endline=321;md5=de107fb61766e9d826943f3b6a354fc9" +DEPENDS = "zlib" +LIBV = "16" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ + file://0001-configure-lower-automake-requirement.patch \ + " +SRC_URI[md5sum] = "93fc0b0841ce2db0e6756673e22dafc3" +SRC_URI[sha256sum] = "5ef57f8b9ef591c8504e2a8f78d31779f0c8f2b34b34d01d533360d2483c8946" + +inherit autotools binconfig pkgconfig + +# Work around missing symbols +EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" + +BBCLASSEXTEND = "native nativesdk" |