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.
This commit is contained in:
parent
c964f7c880
commit
b46a591b91
|
@ -2,14 +2,13 @@ config BR2_PACKAGE_LIBGTK2
|
||||||
bool "libgtk2"
|
bool "libgtk2"
|
||||||
select BR2_PACKAGE_ATK
|
select BR2_PACKAGE_ATK
|
||||||
select BR2_PACKAGE_CAIRO
|
select BR2_PACKAGE_CAIRO
|
||||||
select BR2_PACKAGE_CUPS
|
|
||||||
select BR2_PACKAGE_JPEG
|
select BR2_PACKAGE_JPEG
|
||||||
select BR2_PACKAGE_LIBGLIB2
|
select BR2_PACKAGE_LIBGLIB2
|
||||||
select BR2_PACKAGE_LIBPNG
|
select BR2_PACKAGE_LIBPNG
|
||||||
select BR2_PACKAGE_PANGO
|
select BR2_PACKAGE_PANGO
|
||||||
select BR2_PACKAGE_PKGCONFIG
|
select BR2_PACKAGE_PKGCONFIG
|
||||||
select BR2_PACKAGE_TIFF
|
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
|
help
|
||||||
The GTK+ version 2 graphical user interface library
|
The GTK+ version 2 graphical user interface library
|
||||||
|
|
||||||
|
|
|
@ -92,8 +92,7 @@ LIBGTK2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
|
||||||
--disable-glibtest \
|
--disable-glibtest \
|
||||||
--enable-explicit-deps=no \
|
--enable-explicit-deps=no \
|
||||||
--disable-debug \
|
--disable-debug \
|
||||||
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
|
$(DISABLE_LARGEFILE) \
|
||||||
PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
|
|
||||||
$(LIBGTK2_CONF_OPT_X) \
|
$(LIBGTK2_CONF_OPT_X) \
|
||||||
$(LIBGTK2_CONF_OPT_DFB)
|
$(LIBGTK2_CONF_OPT_DFB)
|
||||||
|
|
||||||
|
@ -109,11 +108,11 @@ ifneq ($(BR2_PACKAGE_XSERVER_none),y)
|
||||||
--x-includes=$(STAGING_DIR)/usr/include/X11 \
|
--x-includes=$(STAGING_DIR)/usr/include/X11 \
|
||||||
--x-libraries=$(STAGING_DIR)/usr/lib \
|
--x-libraries=$(STAGING_DIR)/usr/lib \
|
||||||
--with-gdktarget=x11
|
--with-gdktarget=x11
|
||||||
LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER)
|
LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER) cups
|
||||||
else
|
else
|
||||||
LIBGTK2_CONF_OPT += --without-x
|
LIBGTK2_CONF_OPT += --without-x
|
||||||
endif
|
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))
|
$(eval $(call AUTOTARGETS,package,libgtk2))
|
||||||
|
|
Loading…
Reference in New Issue