From bebb0419ca98b386db0046c127a6eccc66f4507a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 8 Jan 2013 09:16:38 +0200 Subject: 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. Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold --- .../libpng/libpng-1.5.13/obsolete_automake_macros.patch | 15 +++++++++++++++ meta/recipes-multimedia/libpng/libpng_1.5.13.bb | 6 ++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch (limited to 'meta/recipes-multimedia/libpng') 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 @@ +Upstream-status: Accepted [will be in 1.5.14] + +Signed-off-by: Marko Lindqvist +diff -Nurd libpng-1.5.13/configure.ac libpng-1.5.13/configure.ac +--- libpng-1.5.13/configure.ac 2012-09-27 14:21:22.000000000 +0300 ++++ libpng-1.5.13/configure.ac 2013-01-02 16:50:27.876103410 +0200 +@@ -31,7 +31,7 @@ + dnl End of version number stuff + + AC_CONFIG_SRCDIR([pngget.c]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + # Checks for programs. + 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" LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \ file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1" DEPENDS = "zlib" -PR = "r1" +PR = "r2" LIBV = "15" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ + file://obsolete_automake_macros.patch \ + " SRC_URI[md5sum] = "0b607a685da977f1bfc96e1c47055183" SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee" -- cgit 1.2.3-korg