aboutsummaryrefslogtreecommitdiff
path: root/package/libgtk2
diff options
context:
space:
mode:
authorGravatar Daniel Laird <danieljlaird@hotmail.com>2008-08-26 12:19:29 +0000
committerGravatar Daniel Laird <danieljlaird@hotmail.com>2008-08-26 12:19:29 +0000
commitb46a591b910ccf8f29d5c1672d25527c40cbe6db (patch)
treef93f8cbc0adb608cdf7766989e4a5fe88acdcc31 /package/libgtk2
parentc964f7c880c0a2c7e0ae5f525bd5306d55c6c742 (diff)
downloadbuildroot-b46a591b910ccf8f29d5c1672d25527c40cbe6db.tar.gz
buildroot-b46a591b910ccf8f29d5c1672d25527c40cbe6db.tar.bz2
The changes below add better support for DirectFB and libgtk2.
Should be no different for X builds. Config.in | 3 +-- libgtk2.mk | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) Signed-off-by: daniel.j.laird@nxp.com package/libgtk2/Config.in Allow DirectFB to turn on LIBGTK2 support without X being enabled. Disable autoselection of cups. May not be wanted (Can cause crosscompilation issues). package/libgtk2/libgtk2.mk Remove unnessary redefine of PKG_CONFIG_* Pass $(DISABLE_LARGEFILE) to configure (supports large file or not) Move 'cups' to X extra dependencies instead of general.
Diffstat (limited to 'package/libgtk2')
-rw-r--r--package/libgtk2/Config.in3
-rw-r--r--package/libgtk2/libgtk2.mk7
2 files changed, 4 insertions, 6 deletions
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 37aa11d2de..7ebbd0d733 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -2,14 +2,13 @@ config BR2_PACKAGE_LIBGTK2
bool "libgtk2"
select BR2_PACKAGE_ATK
select BR2_PACKAGE_CAIRO
- select BR2_PACKAGE_CUPS
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_PANGO
select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_TIFF
- depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
+ depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
help
The GTK+ version 2 graphical user interface library
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 111a9df10d..1a02f24d6b 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -92,8 +92,7 @@ LIBGTK2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--disable-glibtest \
--enable-explicit-deps=no \
--disable-debug \
- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
- PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+ $(DISABLE_LARGEFILE) \
$(LIBGTK2_CONF_OPT_X) \
$(LIBGTK2_CONF_OPT_DFB)
@@ -109,11 +108,11 @@ ifneq ($(BR2_PACKAGE_XSERVER_none),y)
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--with-gdktarget=x11
- LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER)
+ LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER) cups
else
LIBGTK2_CONF_OPT += --without-x
endif
-LIBGTK2_DEPENDENCIES = uclibc pkgconfig png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cups cairo pango atk
+LIBGTK2_DEPENDENCIES = uclibc pkgconfig png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cairo pango atk
$(eval $(call AUTOTARGETS,package,libgtk2))