Commit 441c1226 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 8c1fc169 74ecbaa2

package/Config.in

+0 −33
Original line number Diff line number Diff line
@@ -319,42 +319,9 @@ source "package/qtopia4/Config.in" 


#source "package/microwin/Config.in"





choice

	prompt "X Window System server"

	default BR2_PACKAGE_XSERVER_none

	help

	  Select the X Window System server to use



config BR2_PACKAGE_XSERVER_none

	bool "none"

config BR2_PACKAGE_XSERVER_xorg

	bool "modular xorg"

	depends on BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE

# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus

config BR2_PACKAGE_XSERVER_tinyx

	bool "tinyx"

	depends on BR2_USE_WCHAR

endchoice



comment "xorg requires a toolchain with C++, LOCALE, LARGEFILE and WCHAR support"

	depends on !(BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE)

comment "tinyx requires a toolchain with WCHAR support"

	depends on !BR2_USE_WCHAR



config BR2_X11_PREFIX

	string

	default "/usr/X11R6"	if BR2_PACKAGE_XSERVER_xorg

	default "/usr"		if BR2_PACKAGE_XSERVER_tinyx

	help

	  X11 apps root location



if !BR2_PACKAGE_XSERVER_none

source "package/x11r7/Config.in"

endif



comment "X libraries and helper libraries"

#XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none

source "package/atk/Config.in"

source "package/cairo/Config.in"

source "package/pango/Config.in"

package/Makefile.in

+0 −15
Original line number Diff line number Diff line
@@ -381,23 +381,8 @@ else 
ENABLE_DEBUG:=

endif





# X Windowing system



XSERVER:=

ifeq ($(BR2_PACKAGE_TINYX),y)

XSERVER+=tinyx

endif

ifeq ($(BR2_PACKAGE_XORG),y)

XSERVER+=xorg

endif

ifeq ($(BR2_PACKAGE_XORG7),y)

XSERVER+=xserver_xorg-server

endif

ifeq ($(BR2_PACKAGE_XGGI),y)

XSERVER+=xggi

endif



X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX)))

#"))

package/atk/atk.mk

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ ATK_CONF_OPT = --enable-shared \ 
		--disable-glibtest --enable-explicit-deps=no \

		--disable-debug



ifneq ($(BR2_PACKAGE_XSERVER_none),y)

ifeq ($(BR2_PACKAGE_XORG7),y)

ATK_CONF_OPT += --with-x \

		--x-includes=$(STAGING_DIR)/usr/include/X11 \

		--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest

package/blackbox/Config.in

+1 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_BLACKBOX

	bool "blackbox"

	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7

	depends on BR2_PACKAGE_XORG7

	depends on BR2_INSTALL_LIBSTDCPP

	help

	  Blackbox is a fast, lightweight window manager for the X

package/blackbox/blackbox.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ BLACKBOX_INSTALL_TARGET:=YES 
BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \

		--x-libraries=$(STAGING_DIR)/usr/lib



BLACKBOX_DEPENDENCIES:=uclibc $(XSERVER)

BLACKBOX_DEPENDENCIES:=uclibc xserver_xorg-server



$(eval $(call AUTOTARGETS,package,blackbox))