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

login
register
mail settings
Submitter Ross Burton
Date Jan. 20, 2014, 10:45 p.m.
Message ID <1390257902-31739-2-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/65305/
State New
Headers show

Comments

Ross Burton - Jan. 20, 2014, 10:45 p.m.
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

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 = "\