aboutsummaryrefslogtreecommitdiff
path: root/package/libgtk2/libgtk2.mk
diff options
context:
space:
mode:
authorGravatar Spenser Gilliland <spenser@gillilanding.com>2013-06-07 13:18:48 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-06-08 22:49:42 +0200
commit4b3d949b8af240bda451b0a4e57d60153188c2e4 (patch)
treebe1e17f0f3e4eadfea0291182bf89dc754c10cb1 /package/libgtk2/libgtk2.mk
parent003a000d629fcd06b759e0c3528fe7697a942708 (diff)
downloadbuildroot-4b3d949b8af240bda451b0a4e57d60153188c2e4.tar.gz
buildroot-4b3d949b8af240bda451b0a4e57d60153188c2e4.tar.bz2
libgtk2: bump to version 2.24.18 and drop DirectFB
* Drop DirectFB support from libgtk2 * bump libgtk2 to version 2.24.18 [Peter: fixup patch whitespace changes] Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libgtk2/libgtk2.mk')
-rw-r--r--package/libgtk2/libgtk2.mk27
1 files changed, 9 insertions, 18 deletions
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 81929587fb..8ac455b4aa 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -5,7 +5,7 @@
################################################################################
LIBGTK2_VERSION_MAJOR = 2.24
-LIBGTK2_VERSION_MINOR = 10
+LIBGTK2_VERSION_MINOR = 18
LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz
@@ -74,19 +74,14 @@ LIBGTK2_CONF_OPT = --disable-glibtest \
LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
-ifeq ($(BR2_PACKAGE_DIRECTFB),y)
- LIBGTK2_CONF_OPT += --with-gdktarget=directfb
- LIBGTK2_DEPENDENCIES += directfb
-endif
-
-ifeq ($(BR2_PACKAGE_XORG7),y)
- LIBGTK2_CONF_OPT += \
- --with-x \
- --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib \
- --with-gdktarget=x11
- LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \
- xlib_libXext xlib_libXrender
+# Xorg dependencies
+LIBGTK2_CONF_OPT += \
+ --with-x \
+ --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib \
+ --with-gdktarget=x11
+LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \
+ xlib_libXext xlib_libXrender
ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
LIBGTK2_CONF_OPT += --enable-xinerama
@@ -122,10 +117,6 @@ ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y)
LIBGTK2_DEPENDENCIES += xlib_libXdamage
endif
-else
- LIBGTK2_CONF_OPT += --without-x
-endif
-
ifeq ($(BR2_PACKAGE_LIBPNG),y)
LIBGTK2_DEPENDENCIES += libpng
else