diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-02-10 09:59:35 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-02-10 09:59:40 +0100 |
| commit | 3bb65bf23ef9107b605adabe097b6cb4970a5b09 (patch) | |
| tree | 3a57ec7f443ed35d79c280af12fd7ef49adc29c8 | |
| parent | 737f596ed99e0406fdc3e7f13e450faf5d76382e (diff) | |
| download | ptxdist-3bb65bf23ef9107b605adabe097b6cb4970a5b09.tar.gz ptxdist-3bb65bf23ef9107b605adabe097b6cb4970a5b09.tar.xz | |
gdk-pixbuf: make xorg support explicitly optional
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/gdk-pixbuf.in | 9 | ||||
| -rw-r--r-- | rules/gdk-pixbuf.make | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/rules/gdk-pixbuf.in b/rules/gdk-pixbuf.in index c7dff5d86..085f94402 100644 --- a/rules/gdk-pixbuf.in +++ b/rules/gdk-pixbuf.in @@ -4,13 +4,18 @@ menuconfig GDK_PIXBUF tristate prompt "gdk-pixbuf " select GLIB - select LIBPNG if GDK_PIXBUF_LOADER_PNG - select LIBJPEG if GDK_PIXBUF_LOADER_JPEG + select XORG_LIB_X11 if GDK_PIXBUF_X11 + select LIBPNG if GDK_PIXBUF_LOADER_PNG + select LIBJPEG if GDK_PIXBUF_LOADER_JPEG help GTK helper library for pixel handling. if GDK_PIXBUF +config GDK_PIXBUF_X11 + bool + prompt "X11 support" + config GDK_PIXBUF_LOADER_PNG bool prompt "png loader" diff --git a/rules/gdk-pixbuf.make b/rules/gdk-pixbuf.make index ea2f2a932..4a8936aab 100644 --- a/rules/gdk-pixbuf.make +++ b/rules/gdk-pixbuf.make @@ -73,7 +73,9 @@ $(STATEDIR)/gdk-pixbuf.targetinstall: # currently no module loading enable # @$(call install_copy, gdk-pixbuf, 0, 0, 0755, -, /usr/bin/gdk-pixbuf-query-loaders) +ifdef PTXCONF_GDK_PIXBUF_X11 @$(call install_lib, gdk-pixbuf, 0, 0, 0644, libgdk_pixbuf_xlib-2.0) +endif @$(call install_lib, gdk-pixbuf, 0, 0, 0644, libgdk_pixbuf-2.0) @$(call install_finish, gdk-pixbuf) |