diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2013-02-13 13:26:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-15 12:17:35 +0000 |
commit | 4eca6f43d0380c69a9c0a292b31a5c3fa779dd26 (patch) | |
tree | 62be5cac5ab37ac7686cc7ef02841c3808820fa9 | |
parent | 3a154fa0ad18301f660d3be36b75843768b92e9c (diff) | |
download | poky-4eca6f43d0380c69a9c0a292b31a5c3fa779dd26.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.
(From OE-Core rev: d68e9660327db2dd4f2ae7bcea9925146b94eb77)
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>
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 @@ | |||
1 | Upstream-status: Accepted [will be in 1.5.14] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -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 deleted file mode 100644 index b9f64f6f3f..0000000000 --- a/meta/recipes-multimedia/libpng/libpng_1.5.13.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "PNG Library" | ||
2 | DESCRIPTION = "PNG Library" | ||
3 | HOMEPAGE = "http://www.libpng.org/" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "Libpng" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \ | ||
7 | file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1" | ||
8 | DEPENDS = "zlib" | ||
9 | PR = "r2" | ||
10 | LIBV = "15" | ||
11 | |||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ | ||
13 | file://obsolete_automake_macros.patch \ | ||
14 | " | ||
15 | |||
16 | SRC_URI[md5sum] = "0b607a685da977f1bfc96e1c47055183" | ||
17 | SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee" | ||
18 | |||
19 | inherit autotools binconfig pkgconfig | ||
20 | |||
21 | 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 @@ | |||
1 | SUMMARY = "PNG Library" | ||
2 | DESCRIPTION = "PNG Library" | ||
3 | HOMEPAGE = "http://www.libpng.org/" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "Libpng" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=58c8238139ee86082f8d29eb89304241 \ | ||
7 | file://png.h;beginline=207;endline=321;md5=4f17771edaee8bb3c17a95d7faaa3681" | ||
8 | DEPENDS = "zlib" | ||
9 | PR = "r0" | ||
10 | LIBV = "15" | ||
11 | |||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[md5sum] = "94284b01d62ca43c5eb3f6702db08ed8" | ||
16 | SRC_URI[sha256sum] = "1459488e1b58d3be1c798453cf40c522c05bd66b61156cd51f469f17dff87b54" | ||
17 | |||
18 | inherit autotools binconfig pkgconfig | ||
19 | |||
20 | BBCLASSEXTEND = "native nativesdk" | ||