aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch')
-rw-r--r--meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch15
1 files changed, 8 insertions, 7 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