aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-02-13 13:26:18 +0200
committerSaul Wold <sgw@linux.intel.com>2013-02-14 23:43:05 -0800
commitd68e9660327db2dd4f2ae7bcea9925146b94eb77 (patch)
tree76a5fd2fa6c39cf80ba37315e0d1a713e5af118f
parent0a90fb2faebbb7848dbd5a23b37490866b397f5f (diff)
downloadopenembedded-core-d68e9660327db2dd4f2ae7bcea9925146b94eb77.tar.gz
libpng: update to upstream version 1.5.14
obsolete_automake_macros.patch removed as it's not part of upstream. The only changes to license texts are latest libpng version number and release dates. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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.bb21
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.5.14.bb20
3 files changed, 20 insertions, 36 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
deleted file mode 100644
index 38092080da..0000000000
--- a/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-status: Accepted [will be in 1.5.14]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-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
deleted file mode 100644
index b9f64f6f3f..0000000000
--- a/meta/recipes-multimedia/libpng/libpng_1.5.13.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "PNG Library"
-DESCRIPTION = "PNG Library"
-HOMEPAGE = "http://www.libpng.org/"
-SECTION = "libs"
-LICENSE = "Libpng"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \
- file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1"
-DEPENDS = "zlib"
-PR = "r2"
-LIBV = "15"
-
-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"
-
-inherit autotools binconfig pkgconfig
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-multimedia/libpng/libpng_1.5.14.bb b/meta/recipes-multimedia/libpng/libpng_1.5.14.bb
new file mode 100644
index 0000000000..b2b82d3d59
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng_1.5.14.bb
@@ -0,0 +1,20 @@
+SUMMARY = "PNG Library"
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+SECTION = "libs"
+LICENSE = "Libpng"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=58c8238139ee86082f8d29eb89304241 \
+ file://png.h;beginline=207;endline=321;md5=4f17771edaee8bb3c17a95d7faaa3681"
+DEPENDS = "zlib"
+PR = "r0"
+LIBV = "15"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \
+ "
+
+SRC_URI[md5sum] = "94284b01d62ca43c5eb3f6702db08ed8"
+SRC_URI[sha256sum] = "1459488e1b58d3be1c798453cf40c522c05bd66b61156cd51f469f17dff87b54"
+
+inherit autotools binconfig pkgconfig
+
+BBCLASSEXTEND = "native nativesdk"