[PATCH 1/3] gdk-pixbuf: upgrade to 2.30.3

[PATCH 1/3] gdk-pixbuf: upgrade to 2.30.3

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../gdk-pixbuf/{gdk-pixbuf_2.30.1.bb => gdk-pixbuf_2.30.3.bb}      |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.30.1.bb => gdk-pixbuf_2.30.3.bb} (94%)

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
similarity index 94%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.1.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
index 408178d..dd1f27f 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
@@ -19,8 +19,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://extending-libinstall-dependencies.patch \
            "
 
-SRC_URI[md5sum] = "e5ae32be7927c9bc94d8593a881eeb3f"
-SRC_URI[sha256sum] = "a3263b1e15668c009313bf04ab67420bec9f2b167c402a71a486307cadee8d30"
+SRC_URI[md5sum] = "81161cc895eb43afd9ae7354b87e2261"
+SRC_URI[sha256sum] = "c229c53f59573eab9410b53690a4b9db770312c80a4d84ecd6295aa894574494"
 
 inherit autotools pkgconfig gettext pixbufcache
 
-- 
1.7.10.4

[PATCH 2/3] gdk-pixbuf: don't forcibly disable GIO sniffing, use PACKAGECONFIG.

[Ross Burton]

There's a configure option for GIO sniffing so don't use a patch to disable it.
Instead use a PACKAGECONFIG for this and default to off, as using GIO for
sniffing means a hard dependency on shared-mime-info.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../gdk-pixbuf/gdk-pixbuf/configure_fix.patch      |   21 --------------------
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb |    4 +++-
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
deleted file mode 100644
index b141690..0000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-can sniff check buillds and runs an C binary, which breaks configure in
-cross-compile environ.
-This patch simple disables it.
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: gdk-pixbuf-2.22.1/configure.ac
-===================================================================
---- gdk-pixbuf-2.22.1.orig/configure.ac	2010-11-25 16:26:41.000000000 +0800
-+++ gdk-pixbuf-2.22.1/configure.ac	2010-11-25 16:29:22.000000000 +0800
-@@ -99,6 +99,8 @@
- AC_MSG_CHECKING([for native Win32])
- LIB_EXE_MACHINE_FLAG=X86
- EXE_MANIFEST_ARCHITECTURE=X86
-+dnl disable can sniff check in cross compile
-+gio_can_sniff=no
- case "$host" in
-   *-*-mingw*)
-     os_win32=yes
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
index dd1f27f..4c4d207 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
@@ -15,7 +15,6 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://hardcoded_libtool.patch \
-           file://configure_fix.patch \
            file://extending-libinstall-dependencies.patch \
            "
 
@@ -29,6 +28,9 @@ LIBV = "2.10.0"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG_class-native = ""
+
+# Use GIO to sniff image format instead of trying all loaders
+PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info"
 PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
 
 EXTRA_OECONF = "\
-- 
1.7.10.4

[PATCH 3/3] gdk-pixbuf: use PACKAGECONFIG to control loaders with external dependencies

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
index 4c4d207..187af46 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
 
 SECTION = "libs"
 
-DEPENDS = "libpng glib-2.0 jpeg"
+DEPENDS = "glib-2.0"
 DEPENDS_append_linuxstdbase = " virtual/libx11"
 
 MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
@@ -25,19 +25,22 @@ inherit autotools pkgconfig gettext pixbufcache
 
 LIBV = "2.10.0"
 
-PACKAGECONFIG ??= ""
-PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
-PACKAGECONFIG_class-native = ""
+GDK_PIXBUF_LOADERS ?= "png jpeg"
+
+PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}"
+PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}"
+PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}"
+
+PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng"
+PACKAGECONFIG[jpeg] = "--with-libjpeg,--without-libjpeg,jpeg"
+PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff"
+PACKAGECONFIG[jpeg2000] = "--with-libjasper,--without-libjasper,jasper"
 
 # Use GIO to sniff image format instead of trying all loaders
 PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info"
 PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
 
 EXTRA_OECONF = "\
-  --with-libpng \
-  --with-libjpeg \
-  --without-libtiff \
-  --without-libjasper \
   --disable-introspection \
 "
 
-- 
1.7.10.4