summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gdk-pixbuf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-01-20 22:45:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-22 07:20:03 +0000
commita29d2708e78e02c30f928b44734db398b9c44939 (patch)
tree9770773df75b2033775ab853fdd640eead783113 /meta/recipes-gnome/gdk-pixbuf
parent1e162c09d253eb3b02510bd1d48c298d6057ec1b (diff)
downloadpoky-a29d2708e78e02c30f928b44734db398b9c44939.tar.gz
gdk-pixbuf: use PACKAGECONFIG to control loaders with external dependencies
(From OE-Core rev: aaa3644a75a7698604102b3b68d40b4dcc02df1d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb19
1 files 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 4c4d20732e..187af46a99 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 \
8 8
9SECTION = "libs" 9SECTION = "libs"
10 10
11DEPENDS = "libpng glib-2.0 jpeg" 11DEPENDS = "glib-2.0"
12DEPENDS_append_linuxstdbase = " virtual/libx11" 12DEPENDS_append_linuxstdbase = " virtual/libx11"
13 13
14MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 14MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
@@ -25,19 +25,22 @@ inherit autotools pkgconfig gettext pixbufcache
25 25
26LIBV = "2.10.0" 26LIBV = "2.10.0"
27 27
28PACKAGECONFIG ??= "" 28GDK_PIXBUF_LOADERS ?= "png jpeg"
29PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 29
30PACKAGECONFIG_class-native = "" 30PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}"
31PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}"
32PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}"
33
34PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng"
35PACKAGECONFIG[jpeg] = "--with-libjpeg,--without-libjpeg,jpeg"
36PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff"
37PACKAGECONFIG[jpeg2000] = "--with-libjasper,--without-libjasper,jasper"
31 38
32# Use GIO to sniff image format instead of trying all loaders 39# Use GIO to sniff image format instead of trying all loaders
33PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info" 40PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info"
34PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" 41PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
35 42
36EXTRA_OECONF = "\ 43EXTRA_OECONF = "\
37 --with-libpng \
38 --with-libjpeg \
39 --without-libtiff \
40 --without-libjasper \
41 --disable-introspection \ 44 --disable-introspection \
42" 45"
43 46