summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-16 17:52:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:14:39 +0100
commit30a3cfebe7b6f92325f14d3445502678ebc38c28 (patch)
tree4b066ae630a8ecea703bb1e4e1c5ac3d5aca804d
parentdb95e613e61d764ed51ddc76c94e8b06586a98bb (diff)
downloadpoky-30a3cfebe7b6f92325f14d3445502678ebc38c28.tar.gz
librsvg: add more PACKAGECONFIG options
Add options for the gdk-pixbuf loaders and the GTK+ 2 theme engine. The theme engine is generally unused so don't enable that by default, but enable the gdk-pixbuf loader and also enable the croco feature which is required for parsing CSS embedded into SVG. (From OE-Core rev: 228d15b40500ecfb182078171e33ffa28373024f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.32.1.bb11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index dcacce4b00..2bc1624df9 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6" 7 file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6"
8 8
9SECTION = "x11/utils" 9SECTION = "x11/utils"
10DEPENDS = "gtk+ cairo libxml2" 10DEPENDS = "cairo glib-2.0 gdk-pixbuf fontconfig freetype libxml2 pango"
11DEPENDS_class-native = "cairo-native pango-native gdk-pixbuf-native" 11DEPENDS_class-native = "cairo-native pango-native gdk-pixbuf-native"
12BBCLASSEXTEND = "native" 12BBCLASSEXTEND = "native"
13 13
@@ -17,11 +17,14 @@ inherit autotools pkgconfig gnome gtk-doc pixbufcache
17 17
18EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" 18EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz"
19 19
20PACKAGECONFIG ??= "croco" 20PACKAGECONFIG ??= "croco gdkpixbuf"
21# When native we can manage without croco, as it's only for GTK+
22PACKAGECONFIG_class-native = ""
23 21
22# Support embedded CSS stylesheets (recommended upstream)
24PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" 23PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
24# gdk-pixbuf loader
25PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader"
26# GTK+ 2 theme engine
27PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+"
25 28
26SRC_URI += "file://doc_Makefile.patch \ 29SRC_URI += "file://doc_Makefile.patch \
27 file://librsvg-CVE-2011-3146.patch \ 30 file://librsvg-CVE-2011-3146.patch \