diff options
author | Ross Burton <ross.burton@intel.com> | 2013-05-23 14:40:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-07 16:48:24 +0100 |
commit | c99fd8dfebf2284bbed3ed3034e518ffef1aaf3f (patch) | |
tree | d3978f856f0c77a16530241c4454dd61569ac53d /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch | |
parent | 271ea8b628e5a18bff66fcf37efb7e1ef5c26754 (diff) | |
download | poky-c99fd8dfebf2284bbed3ed3034e518ffef1aaf3f.tar.gz |
gdk-pixbuf: upgrade to 2.28.1
Something along the lines of pngversion.patch was merged upstream, so drop that
patch.
Also use the new trim_version() function for a future-proof SRC_URI.
(From OE-Core rev: 30b32addd189e7acce73965c9176227d5f392ab9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch deleted file mode 100644 index 2e7d5afe8f..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | We now have libpng 1.6. If we build libpng12 as well as libpng 1.6, the 1.2 version gets | ||
2 | preferred which is not desirable and does not give deterministic builds. | ||
3 | |||
4 | We really do want to use libpng since the item in DEPENDS will provide this so | ||
5 | manipulate the search list so the one we DEPEND on gets chosen. | ||
6 | |||
7 | RP 2013/4/13 | ||
8 | |||
9 | Upstream-Status: Pending [worth discussing at least] | ||
10 | |||
11 | Index: gdk-pixbuf-2.26.5/configure.ac | ||
12 | =================================================================== | ||
13 | --- gdk-pixbuf-2.26.5.orig/configure.ac 2013-03-26 15:45:16.594820303 +0000 | ||
14 | +++ gdk-pixbuf-2.26.5/configure.ac 2013-04-13 10:15:19.241433789 +0000 | ||
15 | @@ -588,7 +588,7 @@ | ||
16 | |||
17 | dnl Test for libpng | ||
18 | if test x$with_libpng != xno && test -z "$LIBPNG"; then | ||
19 | - for l in libpng15 libpng14 libpng12 libpng13 libpng10 libpng ; do | ||
20 | + for l in libpng libpng15 libpng14 libpng12 libpng13 libpng10 ; do | ||
21 | AC_MSG_CHECKING(for $l) | ||
22 | if $PKG_CONFIG --exists $l ; then | ||
23 | AC_MSG_RESULT(yes) | ||