summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-23 14:40:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 16:48:24 +0100
commitc99fd8dfebf2284bbed3ed3034e518ffef1aaf3f (patch)
treed3978f856f0c77a16530241c4454dd61569ac53d /meta
parent271ea8b628e5a18bff66fcf37efb7e1ef5c26754 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch23
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch)0
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch)0
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch)0
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.1.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb)11
5 files changed, 5 insertions, 29 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 @@
1We now have libpng 1.6. If we build libpng12 as well as libpng 1.6, the 1.2 version gets
2preferred which is not desirable and does not give deterministic builds.
3
4We really do want to use libpng since the item in DEPENDS will provide this so
5manipulate the search list so the one we DEPEND on gets chosen.
6
7RP 2013/4/13
8
9Upstream-Status: Pending [worth discussing at least]
10
11Index: 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)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
index b141690387..b141690387 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
index edbdced43a..edbdced43a 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
index ecca62a712..ecca62a712 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.1.bb
index b85bbaf58c..4bf2eb6921 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.1.bb
@@ -11,17 +11,16 @@ SECTION = "libs"
11DEPENDS = "libpng glib-2.0 jpeg" 11DEPENDS = "libpng glib-2.0 jpeg"
12DEPENDS_append_linuxstdbase = " virtual/libx11" 12DEPENDS_append_linuxstdbase = " virtual/libx11"
13 13
14SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-${PV}.tar.xz \ 14MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
15
16SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
15 file://hardcoded_libtool.patch \ 17 file://hardcoded_libtool.patch \
16 file://configure_fix.patch \ 18 file://configure_fix.patch \
17 file://extending-libinstall-dependencies.patch \ 19 file://extending-libinstall-dependencies.patch \
18 file://pngversion.patch \
19 " 20 "
20 21
21SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0" 22SRC_URI[md5sum] = "5c71cce316d08c559fc5970aa60754ab"
22SRC_URI[sha256sum] = "77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84" 23SRC_URI[sha256sum] = "bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb"
23
24PR = "r1"
25 24
26inherit autotools pkgconfig gettext pixbufcache 25inherit autotools pkgconfig gettext pixbufcache
27 26