summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2014-09-08 12:58:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 11:33:23 +0100
commitda5710d97366af29f04d61005b7c9a57549ef170 (patch)
tree41cf4a38be22f0c8e8a0f7460142013c7035dfcf /meta/recipes-multimedia
parent3e4cd04d44106adcfe3ebe57a53402f1e7d72c68 (diff)
downloadpoky-da5710d97366af29f04d61005b7c9a57549ef170.tar.gz
libpng: drop unnecessary automake requirement lowering patch
Automake recipe provides automake 1.14.1 anyway (From OE-Core rev: 3e8ce8508356112e07e37734d228494a840cf04c) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Ross Burton <ross.burton@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.patch31
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.6.10.bb1
2 files changed, 0 insertions, 32 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
deleted file mode 100644
index bbbca89e8f..0000000000
--- a/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From fff7cbc01e061a235852f385866fe75fb17867e3 Mon Sep 17 00:00:00 2001
2From: Valentin Popa <valentin.popa@intel.com>
3Date: Tue, 26 Nov 2013 12:06:55 +0200
4Subject: [PATCH] configure: lower automake requirement
5
6We're not using parallel tests in OE-core yet
7
8Signed-off-by: Valentin Popa <valentin.popa@intel.com>
9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10
11Upstream-Status: Inapropriate [OE specific build hack]
12---
13 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index 28200c3..fab2515 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts])
21 # dist-xz requires automake 1.11 or later
22 # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
23 # 1.13 is required for parallel tests
24-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects])
25+AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules subdir-objects])
26 # The following line causes --disable-maintainer-mode to be the default to
27 # configure, this is necessary because libpng distributions cannot rely on the
28 # time stamps of the autotools generated files being correct
29--
301.8.3.2
31
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb b/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
index babf87e392..79d91222a7 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
@@ -9,7 +9,6 @@ DEPENDS = "zlib"
9LIBV = "16" 9LIBV = "16"
10 10
11SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ 11SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \
12 file://0001-configure-lower-automake-requirement.patch \
13 " 12 "
14 13
15SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768" 14SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768"