summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
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-27 11:51:23 +0000
commita216cc165440a8059e8b93ee633c873a0155a452 (patch)
tree4e941373ec9e6da6b91dbffec39a0c1e9e6449d3 /meta/recipes-multimedia
parente3c4124ba192a1d13d9ff49a8b13cb02082a2d00 (diff)
downloadpoky-a216cc165440a8059e8b93ee633c873a0155a452.tar.gz
libpng: upgrade to 1.6.7
License is the same. (From OE-Core rev: a1e8def7b335a69fb1ca412ad82cafa15350422e) Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-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 @@
1From a4fd84bdc69e9929a1040f20ea291ee3115bf5b2 Mon Sep 17 00:00:00 2001 1From fff7cbc01e061a235852f385866fe75fb17867e3 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Valentin Popa <valentin.popa@intel.com>
3Date: Mon, 15 Apr 2013 11:16:20 +0200 3Date: Tue, 26 Nov 2013 12:06:55 +0200
4Subject: [PATCH] configure: lower automake requirement 4Subject: [PATCH] configure: lower automake requirement
5 5
6We're not using parallel tests in OE-core yet 6We're not using parallel tests in OE-core yet
7 7
8Signed-off-by: Valentin Popa <valentin.popa@intel.com>
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9 10
10Upstream-Status: Inapropriate [OE specific build hack] 11Upstream-Status: Inapropriate [OE specific build hack]
@@ -13,18 +14,18 @@ Upstream-Status: Inapropriate [OE specific build hack]
13 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
14 15
15diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
16index 1745d31..7f015fe 100644 17index 28200c3..fab2515 100644
17--- a/configure.ac 18--- a/configure.ac
18+++ b/configure.ac 19+++ b/configure.ac
19@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts]) 20@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts])
20 # dist-xz requires automake 1.11 or later 21 # 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.12.2 fixes a security issue in 1.11.2 and 1.12.1
22 # 1.13 is required for parallel tests 23 # 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.13 foreign dist-xz color-tests silent-rules subdir-objects])
24+AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules]) 25+AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules subdir-objects])
25 # The following line causes --disable-maintainer-mode to be the default to 26 # 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 # configure, this is necessary because libpng distributions cannot rely on the
27 # time stamps of the autotools generated files being correct 28 # time stamps of the autotools generated files being correct
28-- 29--
291.8.1.4 301.8.3.2
30 31
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"
3HOMEPAGE = "http://www.libpng.org/" 3HOMEPAGE = "http://www.libpng.org/"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "Libpng" 5LICENSE = "Libpng"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=2ebec5fb1db10234542f80fdd7117e25 \ 6LIC_FILES_CHKSUM = "file://LICENSE;md5=243135ddedf702158f9170807cbcfb66 \
7 file://png.h;endline=15;md5=41143e20c803af0a376888699ce0980e \ 7 file://png.h;endline=15;md5=cb4981447519fe0bb87fbda5e8cd50be \
8 file://png.h;beginline=209;endline=323;md5=d30ef0b1dd12d869cb3c6bdb3678e5f4" 8 file://png.h;beginline=209;endline=323;md5=f6b7821e0ddefaa4d71fdfa1f5a91fb7"
9DEPENDS = "zlib" 9DEPENDS = "zlib"
10LIBV = "16" 10LIBV = "16"
11 11
@@ -13,8 +13,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}
13 file://0001-configure-lower-automake-requirement.patch \ 13 file://0001-configure-lower-automake-requirement.patch \
14 " 14 "
15 15
16SRC_URI[md5sum] = "3a41dcd58bcac7cc191c2ec80c7fb2ac" 16SRC_URI[md5sum] = "7023a9eacd7b6a3eb95761a2f574d456"
17SRC_URI[sha256sum] = "0407965a0057af7a9e4cefe27c062f517d9ad701cdfd20aa91afb6a84f214e70" 17SRC_URI[sha256sum] = "13c9c853a9a600218fff9961658dc4f485ad2ef9b862315b434dd2fdbbe1f945"
18 18
19inherit autotools binconfig pkgconfig 19inherit autotools binconfig pkgconfig
20 20