diff options
author | Valentin Popa <valentin.popa@intel.com> | 2013-11-26 12:44:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-27 11:51:23 +0000 |
commit | a216cc165440a8059e8b93ee633c873a0155a452 (patch) | |
tree | 4e941373ec9e6da6b91dbffec39a0c1e9e6449d3 /meta/recipes-multimedia/libpng/libpng | |
parent | e3c4124ba192a1d13d9ff49a8b13cb02082a2d00 (diff) | |
download | poky-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/libpng/libpng')
-rw-r--r-- | meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch | 15 |
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 @@ | |||
1 | From a4fd84bdc69e9929a1040f20ea291ee3115bf5b2 Mon Sep 17 00:00:00 2001 | 1 | From fff7cbc01e061a235852f385866fe75fb17867e3 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Valentin Popa <valentin.popa@intel.com> |
3 | Date: Mon, 15 Apr 2013 11:16:20 +0200 | 3 | Date: Tue, 26 Nov 2013 12:06:55 +0200 |
4 | Subject: [PATCH] configure: lower automake requirement | 4 | Subject: [PATCH] configure: lower automake requirement |
5 | 5 | ||
6 | We're not using parallel tests in OE-core yet | 6 | We're not using parallel tests in OE-core yet |
7 | 7 | ||
8 | Signed-off-by: Valentin Popa <valentin.popa@intel.com> | ||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 9 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
9 | 10 | ||
10 | Upstream-Status: Inapropriate [OE specific build hack] | 11 | Upstream-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 | ||
15 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
16 | index 1745d31..7f015fe 100644 | 17 | index 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 | -- |
29 | 1.8.1.4 | 30 | 1.8.3.2 |
30 | 31 | ||