summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:12 +0000
commitf34fe1869306e13f19adc0ccda155236c022e4cf (patch)
tree66c99932c0740a6c196e358b62331ffafec2b688 /meta
parent34a4408d3dece0f5da8acf4b321f7aa2dbee6e12 (diff)
downloadpoky-f34fe1869306e13f19adc0ccda155236c022e4cf.tar.gz
libpng: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. (From OE-Core rev: bebb0419ca98b386db0046c127a6eccc66f4507a) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.5.13.bb6
2 files changed, 19 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch b/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..38092080da
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
1Upstream-status: Accepted [will be in 1.5.14]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libpng-1.5.13/configure.ac libpng-1.5.13/configure.ac
5--- libpng-1.5.13/configure.ac 2012-09-27 14:21:22.000000000 +0300
6+++ libpng-1.5.13/configure.ac 2013-01-02 16:50:27.876103410 +0200
7@@ -31,7 +31,7 @@
8 dnl End of version number stuff
9
10 AC_CONFIG_SRCDIR([pngget.c])
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 # Checks for programs.
15 AC_LANG([C])
diff --git a/meta/recipes-multimedia/libpng/libpng_1.5.13.bb b/meta/recipes-multimedia/libpng/libpng_1.5.13.bb
index 04bb932add..b9f64f6f3f 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.5.13.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.5.13.bb
@@ -6,10 +6,12 @@ LICENSE = "Libpng"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \ 6LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \
7 file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1" 7 file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1"
8DEPENDS = "zlib" 8DEPENDS = "zlib"
9PR = "r1" 9PR = "r2"
10LIBV = "15" 10LIBV = "15"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz" 12SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \
13 file://obsolete_automake_macros.patch \
14 "
13 15
14SRC_URI[md5sum] = "0b607a685da977f1bfc96e1c47055183" 16SRC_URI[md5sum] = "0b607a685da977f1bfc96e1c47055183"
15SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee" 17SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee"