summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/libpng
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2013-11-26 12:44:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-26 23:01:50 +0000
commita1e8def7b335a69fb1ca412ad82cafa15350422e (patch)
tree639c946fb63b58fe389ad76a8a2af9d9fdcaaf36 /meta/recipes-multimedia/libpng
parent04fab782f42b8f5047390042618f9c841b8c3a96 (diff)
downloadopenembedded-core-contrib-a1e8def7b335a69fb1ca412ad82cafa15350422e.tar.gz
openembedded-core-contrib-a1e8def7b335a69fb1ca412ad82cafa15350422e.tar.bz2
openembedded-core-contrib-a1e8def7b335a69fb1ca412ad82cafa15350422e.zip
libpng: upgrade to 1.6.7
License is the same. Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libpng')
-rw-r--r--meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch15
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.6.7.bb (renamed from meta/recipes-multimedia/libpng/libpng_1.6.6.bb)10
2 files changed, 13 insertions, 12 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
index e38e0a8869..bbbca89e8f 100644
--- a/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
+++ b/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
@@ -1,10 +1,11 @@
-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
+From fff7cbc01e061a235852f385866fe75fb17867e3 Mon Sep 17 00:00:00 2001
+From: Valentin Popa <valentin.popa@intel.com>
+Date: Tue, 26 Nov 2013 12:06:55 +0200
Subject: [PATCH] configure: lower automake requirement
We're not using parallel tests in OE-core yet
+Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Upstream-Status: Inapropriate [OE specific build hack]
@@ -13,18 +14,18 @@ Upstream-Status: Inapropriate [OE specific build hack]
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 1745d31..7f015fe 100644
+index 28200c3..fab2515 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])
+-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects])
++AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules subdir-objects])
# 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
+1.8.3.2
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.6.bb b/meta/recipes-multimedia/libpng/libpng_1.6.7.bb
index 376dd530f2..0f5ae5d522 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.6.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.7.bb
@@ -3,9 +3,9 @@ DESCRIPTION = "PNG Library"
HOMEPAGE = "http://www.libpng.org/"
SECTION = "libs"
LICENSE = "Libpng"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ebec5fb1db10234542f80fdd7117e25 \
- file://png.h;endline=15;md5=41143e20c803af0a376888699ce0980e \
- file://png.h;beginline=209;endline=323;md5=d30ef0b1dd12d869cb3c6bdb3678e5f4"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=243135ddedf702158f9170807cbcfb66 \
+ file://png.h;endline=15;md5=cb4981447519fe0bb87fbda5e8cd50be \
+ file://png.h;beginline=209;endline=323;md5=f6b7821e0ddefaa4d71fdfa1f5a91fb7"
DEPENDS = "zlib"
LIBV = "16"
@@ -13,8 +13,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}
file://0001-configure-lower-automake-requirement.patch \
"
-SRC_URI[md5sum] = "3a41dcd58bcac7cc191c2ec80c7fb2ac"
-SRC_URI[sha256sum] = "0407965a0057af7a9e4cefe27c062f517d9ad701cdfd20aa91afb6a84f214e70"
+SRC_URI[md5sum] = "7023a9eacd7b6a3eb95761a2f574d456"
+SRC_URI[sha256sum] = "13c9c853a9a600218fff9961658dc4f485ad2ef9b862315b434dd2fdbbe1f945"
inherit autotools binconfig pkgconfig