diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-12-07 16:08:01 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-12-09 09:44:12 +0100 |
| commit | 8ab9f5441989be1fa278a2aa29059c25109d70ff (patch) | |
| tree | 33f1a39809c8c4e522aadeb069362f61598ba7a7 /rules | |
| parent | 31ef1fc2735b040e422a7b827b6cb1421cd185b6 (diff) | |
| download | ptxdist-8ab9f5441989be1fa278a2aa29059c25109d70ff.tar.gz ptxdist-8ab9f5441989be1fa278a2aa29059c25109d70ff.tar.xz | |
gdk-pixbuf: add options for png & jpeg support
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/gdk-pixbuf.in | 20 | ||||
| -rw-r--r-- | rules/gdk-pixbuf.make | 8 |
2 files changed, 22 insertions, 6 deletions
diff --git a/rules/gdk-pixbuf.in b/rules/gdk-pixbuf.in index ea5ffd5a3..c7dff5d86 100644 --- a/rules/gdk-pixbuf.in +++ b/rules/gdk-pixbuf.in @@ -1,8 +1,24 @@ ## SECTION=multimedia_gtk -config GDK_PIXBUF +menuconfig GDK_PIXBUF tristate - prompt "gdk-pixbuf" + prompt "gdk-pixbuf " select GLIB + 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_LOADER_PNG + bool + prompt "png loader" + default y + +config GDK_PIXBUF_LOADER_JPEG + bool + prompt "jpeg loader" + +endif + diff --git a/rules/gdk-pixbuf.make b/rules/gdk-pixbuf.make index 28c51ee7a..ea2f2a932 100644 --- a/rules/gdk-pixbuf.make +++ b/rules/gdk-pixbuf.make @@ -51,8 +51,8 @@ GDK_PIXBUF_CONF_OPT := $(CROSS_AUTOCONF_USR) \ --enable-Bsymbolic \ --without-libiconv-prefix \ --without-libintl-prefix \ - --without-libpng \ - --without-libjpeg \ + --$(call ptx/wwo, PTXCONF_GDK_PIXBUF_LOADER_PNG)-libpng \ + --$(call ptx/wwo, PTXCONF_GDK_PIXBUF_LOADER_JPEG)-libjpeg \ --without-libtiff \ --without-libjasper \ --without-gdiplus @@ -70,8 +70,8 @@ $(STATEDIR)/gdk-pixbuf.targetinstall: @$(call install_fixup, gdk-pixbuf,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, gdk-pixbuf,DESCRIPTION,missing) - @$(call install_copy, gdk-pixbuf, 0, 0, 0755, -, /usr/bin/gdk-pixbuf-query-loaders) - @$(call install_copy, gdk-pixbuf, 0, 0, 0755, -, /usr/bin/gdk-pixbuf-csource) +# currently no module loading enable +# @$(call install_copy, gdk-pixbuf, 0, 0, 0755, -, /usr/bin/gdk-pixbuf-query-loaders) @$(call install_lib, gdk-pixbuf, 0, 0, 0644, libgdk_pixbuf_xlib-2.0) @$(call install_lib, gdk-pixbuf, 0, 0, 0644, libgdk_pixbuf-2.0) |