aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-01-20 22:45:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-21 10:48:25 +0000
commit624e79deb58c08bcc32053e792df140f527d20b1 (patch)
treed0ffabe64b7f968f41cfd23fed8f9befdd199f45
parent992c054c0656efce50d3902b3f0b101ab9ea602a (diff)
downloadopenembedded-core-contrib-624e79deb58c08bcc32053e792df140f527d20b1.tar.gz
openembedded-core-contrib-624e79deb58c08bcc32053e792df140f527d20b1.tar.bz2
openembedded-core-contrib-624e79deb58c08bcc32053e792df140f527d20b1.zip
gdk-pixbuf: don't forcibly disable GIO sniffing, use PACKAGECONFIG.
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch21
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb4
2 files changed, 3 insertions, 22 deletions
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 b141690387..0000000000
--- 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 dd1f27f6b5..4c4d20732e 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 = "\