diff options
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch | 21 | ||||
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb | 4 |
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 @@ | |||
1 | can sniff check buillds and runs an C binary, which breaks configure in | ||
2 | cross-compile environ. | ||
3 | This patch simple disables it. | ||
4 | |||
5 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
6 | |||
7 | Upstream-Status: Inappropriate [embedded specific] | ||
8 | |||
9 | Index: gdk-pixbuf-2.22.1/configure.ac | ||
10 | =================================================================== | ||
11 | --- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-25 16:26:41.000000000 +0800 | ||
12 | +++ gdk-pixbuf-2.22.1/configure.ac 2010-11-25 16:29:22.000000000 +0800 | ||
13 | @@ -99,6 +99,8 @@ | ||
14 | AC_MSG_CHECKING([for native Win32]) | ||
15 | LIB_EXE_MACHINE_FLAG=X86 | ||
16 | EXE_MANIFEST_ARCHITECTURE=X86 | ||
17 | +dnl disable can sniff check in cross compile | ||
18 | +gio_can_sniff=no | ||
19 | case "$host" in | ||
20 | *-*-mingw*) | ||
21 | 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)}" | |||
15 | 15 | ||
16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ |
17 | file://hardcoded_libtool.patch \ | 17 | file://hardcoded_libtool.patch \ |
18 | file://configure_fix.patch \ | ||
19 | file://extending-libinstall-dependencies.patch \ | 18 | file://extending-libinstall-dependencies.patch \ |
20 | " | 19 | " |
21 | 20 | ||
@@ -29,6 +28,9 @@ LIBV = "2.10.0" | |||
29 | PACKAGECONFIG ??= "" | 28 | PACKAGECONFIG ??= "" |
30 | PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 29 | PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
31 | PACKAGECONFIG_class-native = "" | 30 | PACKAGECONFIG_class-native = "" |
31 | |||
32 | # Use GIO to sniff image format instead of trying all loaders | ||
33 | PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info" | ||
32 | PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" | 34 | PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" |
33 | 35 | ||
34 | EXTRA_OECONF = "\ | 36 | EXTRA_OECONF = "\ |