Packages: X11: give ability to build Xorg X server instead of kdrive X server

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

6 files changed, 330 insertions, 1 deletions

diff --git a/packages/x11/x11.mk b/packages/x11/x11.mk
index 8eb41b3..d8cb59b 100644
--- a/packages/x11/x11.mk
+++ b/packages/x11/x11.mk
@@ -212,7 +212,21 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XTRANS) += xtrans_install
 ##########
 # X server
 ##########
-#kdrive
+#kdrive and Xorg
 include $(EMBTK_ROOT)/packages/x11/xserver/xserver.mk
 ROOTFS_COMPONENTS_CLEAN += xserver_clean
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XSERVER) += xserver_install
+
+# X server input drivers
+########################
+#xf86inputevdev
+include $(EMBTK_ROOT)/packages/x11/xf86inputevdev/xf86inputevdev.mk
+ROOTFS_COMPONENTS_CLEAN += xf86inputevdev_clean
+ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XF86INPUTEVDEV) += xf86inputevdev_install
+
+# X server video drivers
+########################
+#xf86videofbdev
+include $(EMBTK_ROOT)/packages/x11/xf86videofbdev/xf86videofbdev.mk
+ROOTFS_COMPONENTS_CLEAN += xf86videofbdev_clean
+ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XF86VIDEOFBDEV) += xf86videofbdev_install
diff --git a/packages/x11/xf86inputevdev/xf86inputevdev.kconfig b/packages/x11/xf86inputevdev/xf86inputevdev.kconfig
new file mode 100644
index 0000000..7701a44
--- /dev/null
+++ b/packages/x11/xf86inputevdev/xf86inputevdev.kconfig
@@ -0,0 +1,48 @@
+################################################################################
+# Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         xf86inputevdev.kconfig
+# \brief	xf86inputevdev.kconfig of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         December 2009
+################################################################################
+
+config EMBTK_HAVE_XF86INPUTEVDEV
+	bool "Have xf86-input-evdev"
+	depends on EMBTK_HAVE_XSERVER_XORG
+	help
+		X.Org evdev input driver.
+choice
+	prompt "xf86inputevdev version you wish"
+	depends on EMBTK_HAVE_XF86INPUTEVDEV
+	help
+	 Here you can choose which version of xf86inputevdev you want to use.
+
+	config  EMBTK_XF86INPUTEVDEV_VERSION_2_4_0
+		bool "xf86-input-evdev-2.4.0"
+endchoice
+
+config EMBTK_XF86INPUTEVDEV_VERSION_STRING
+	string
+	default "2.4.0"		if EMBTK_XF86INPUTEVDEV_VERSION_2_4_0
+
+config EMBTK_XF86INPUTEVDEV_NEED_PATCH
+	bool
+
+
diff --git a/packages/x11/xf86inputevdev/xf86inputevdev.mk b/packages/x11/xf86inputevdev/xf86inputevdev.mk
new file mode 100644
index 0000000..494daec
--- /dev/null
+++ b/packages/x11/xf86inputevdev/xf86inputevdev.mk
@@ -0,0 +1,106 @@
+################################################################################
+# Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         xf86inputevdev.mk
+# \brief	xf86inputevdev.mk of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         December 2009
+################################################################################
+
+XF86INPUTEVDEV_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XF86INPUTEVDEV_VERSION_STRING)))
+XF86INPUTEVDEV_SITE := http://xorg.freedesktop.org/archive/individual/driver
+XF86INPUTEVDEV_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xf86-input-evdev/$(XF86INPUTEVDEV_VERSION)
+XF86INPUTEVDEV_PACKAGE := xf86-input-evdev-$(XF86INPUTEVDEV_VERSION).tar.bz2
+XF86INPUTEVDEV_BUILD_DIR := $(PACKAGES_BUILD)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)
+
+XF86INPUTEVDEV_BINS =
+XF86INPUTEVDEV_SBINS =
+XF86INPUTEVDEV_INCLUDES = xorg
+XF86INPUTEVDEV_LIBS = xorg
+XF86INPUTEVDEV_PKGCONFIGS = xorg-evdev.pc
+
+XF86INPUTEVDEV_DEPS = xserver_install
+
+xf86inputevdev_install: $(XF86INPUTEVDEV_BUILD_DIR)/.installed
+
+$(XF86INPUTEVDEV_BUILD_DIR)/.installed: $(XF86INPUTEVDEV_DEPS) \
+	download_xf86inputevdev $(XF86INPUTEVDEV_BUILD_DIR)/.decompressed \
+	$(XF86INPUTEVDEV_BUILD_DIR)/.configured
+	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	xf86inputevdev-$(XF86INPUTEVDEV_VERSION) in your root filesystem...")
+	$(call EMBTK_KILL_LT_RPATH,$(XF86INPUTEVDEV_BUILD_DIR))
+	$(Q)$(MAKE) -C $(XF86INPUTEVDEV_BUILD_DIR) $(J)
+	$(Q)$(MAKE) -C $(XF86INPUTEVDEV_BUILD_DIR) DESTDIR=$(SYSROOT) install
+	$(Q)$(MAKE) libtool_files_adapt
+	$(Q)$(MAKE) pkgconfig_files_adapt
+	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
+	@touch $@
+
+download_xf86inputevdev:
+	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(XF86INPUTEVDEV_PACKAGE) \
+	if necessary...")
+	@test -e $(DOWNLOAD_DIR)/$(XF86INPUTEVDEV_PACKAGE) || \
+	wget -O $(DOWNLOAD_DIR)/$(XF86INPUTEVDEV_PACKAGE) \
+	$(XF86INPUTEVDEV_SITE)/$(XF86INPUTEVDEV_PACKAGE)
+ifeq ($(CONFIG_EMBTK_XF86INPUTEVDEV_NEED_PATCH),y)
+	@test -e $(DOWNLOAD_DIR)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION).patch || \
+	wget -O $(DOWNLOAD_DIR)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION).patch \
+	$(XF86INPUTEVDEV_PATCH_SITE)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)-*.patch
+endif
+
+$(XF86INPUTEVDEV_BUILD_DIR)/.decompressed:
+	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(XF86INPUTEVDEV_PACKAGE) ...")
+	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(XF86INPUTEVDEV_PACKAGE)
+ifeq ($(CONFIG_EMBTK_XF86INPUTEVDEV_NEED_PATCH),y)
+	@cd $(PACKAGES_BUILD)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION); \
+	patch -p1 < $(DOWNLOAD_DIR)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION).patch
+endif
+	@touch $@
+
+$(XF86INPUTEVDEV_BUILD_DIR)/.configured:
+	$(Q)cd $(XF86INPUTEVDEV_BUILD_DIR); \
+	CC=$(TARGETCC_CACHED) \
+	CXX=$(TARGETCXX_CACHED) \
+	AR=$(TARGETAR) \
+	RANLIB=$(TARGETRANLIB) \
+	AS=$(CROSS_COMPILE)as \
+	LD=$(TARGETLD) \
+	NM=$(TARGETNM) \
+	STRIP=$(TARGETSTRIP) \
+	OBJDUMP=$(TARGETOBJDUMP) \
+	OBJCOPY=$(TARGETOBJCOPY) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
+	CPPFLGAS="-I$(SYSROOT)/usr/include" \
+	PKG_CONFIG=$(PKGCONFIG_BIN) \
+	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
+	--target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \
+	--prefix=/usr
+	@touch $@
+
+xf86inputevdev_clean:
+	$(call EMBTK_GENERIC_MESSAGE,"cleanup xf86inputevdev-$(XF86INPUTEVDEV_VERSION)...")
+	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XF86INPUTEVDEV_BINS)
+	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XF86INPUTEVDEV_SBINS)
+	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XF86INPUTEVDEV_INCLUDES)
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XF86INPUTEVDEV_LIBS)
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XF86INPUTEVDEV_PKGCONFIGS)
+
diff --git a/packages/x11/xf86videofbdev/xf86videofbdev.kconfig b/packages/x11/xf86videofbdev/xf86videofbdev.kconfig
new file mode 100644
index 0000000..3a3de2b
--- /dev/null
+++ b/packages/x11/xf86videofbdev/xf86videofbdev.kconfig
@@ -0,0 +1,47 @@
+################################################################################
+# Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         xf86videofbdev.kconfig
+# \brief	xf86videofbdev.kconfig of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         December 2009
+################################################################################
+
+config EMBTK_HAVE_XF86VIDEOFBDEV
+	bool "Have xf86-video-fbdev"
+	help
+		Xorg server framebuffer video driver
+choice
+	prompt "xf86-video-fbdev version you wish"
+	depends on EMBTK_HAVE_XF86VIDEOFBDEV
+	help
+	 Here you can choose which version of xf86-video-fbdev you want to use.
+
+	config  EMBTK_XF86VIDEOFBDEV_VERSION_0_4_2
+		bool "xf86-video-fbdev-0.4.2"
+endchoice
+
+config EMBTK_XF86VIDEOFBDEV_VERSION_STRING
+	string
+	default "0.4.2"		if EMBTK_XF86VIDEOFBDEV_VERSION_0_4_2
+
+config EMBTK_XF86VIDEOFBDEV_NEED_PATCH
+	bool
+
+
diff --git a/packages/x11/xf86videofbdev/xf86videofbdev.mk b/packages/x11/xf86videofbdev/xf86videofbdev.mk
new file mode 100644
index 0000000..79a1816
--- /dev/null
+++ b/packages/x11/xf86videofbdev/xf86videofbdev.mk
@@ -0,0 +1,106 @@
+################################################################################
+# Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         xf86videofbdev.mk
+# \brief	xf86videofbdev.mk of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         December 2009
+################################################################################
+
+XF86VIDEOFBDEV_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XF86VIDEOFBDEV_VERSION_STRING)))
+XF86VIDEOFBDEV_SITE := http://xorg.freedesktop.org/archive/individual/driver
+XF86VIDEOFBDEV_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xf86-video-fbdev/$(XF86VIDEOFBDEV_VERSION)
+XF86VIDEOFBDEV_PACKAGE := xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION).tar.bz2
+XF86VIDEOFBDEV_BUILD_DIR := $(PACKAGES_BUILD)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)
+
+XF86VIDEOFBDEV_BINS =
+XF86VIDEOFBDEV_SBINS =
+XF86VIDEOFBDEV_INCLUDES =
+XF86VIDEOFBDEV_LIBS = xorg
+XF86VIDEOFBDEV_PKGCONFIGS =
+
+XF86VIDEOFBDEV_DEPS = xserver_install
+
+xf86videofbdev_install: $(XF86VIDEOFBDEV_BUILD_DIR)/.installed
+
+$(XF86VIDEOFBDEV_BUILD_DIR)/.installed: $(XF86VIDEOFBDEV_DEPS) \
+	download_xf86videofbdev $(XF86VIDEOFBDEV_BUILD_DIR)/.decompressed \
+	$(XF86VIDEOFBDEV_BUILD_DIR)/.configured
+	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	xf86videofbdev-$(XF86VIDEOFBDEV_VERSION) in your root filesystem...")
+	$(call EMBTK_KILL_LT_RPATH,$(XF86VIDEOFBDEV_BUILD_DIR))
+	$(Q)$(MAKE) -C $(XF86VIDEOFBDEV_BUILD_DIR) $(J)
+	$(Q)$(MAKE) -C $(XF86VIDEOFBDEV_BUILD_DIR) DESTDIR=$(SYSROOT) install
+	$(Q)$(MAKE) libtool_files_adapt
+	$(Q)$(MAKE) pkgconfig_files_adapt
+	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
+	@touch $@
+
+download_xf86videofbdev:
+	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(XF86VIDEOFBDEV_PACKAGE) \
+	if necessary...")
+	@test -e $(DOWNLOAD_DIR)/$(XF86VIDEOFBDEV_PACKAGE) || \
+	wget -O $(DOWNLOAD_DIR)/$(XF86VIDEOFBDEV_PACKAGE) \
+	$(XF86VIDEOFBDEV_SITE)/$(XF86VIDEOFBDEV_PACKAGE)
+ifeq ($(CONFIG_EMBTK_XF86VIDEOFBDEV_NEED_PATCH),y)
+	@test -e $(DOWNLOAD_DIR)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION).patch || \
+	wget -O $(DOWNLOAD_DIR)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION).patch \
+	$(XF86VIDEOFBDEV_PATCH_SITE)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)-*.patch
+endif
+
+$(XF86VIDEOFBDEV_BUILD_DIR)/.decompressed:
+	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(XF86VIDEOFBDEV_PACKAGE) ...")
+	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(XF86VIDEOFBDEV_PACKAGE)
+ifeq ($(CONFIG_EMBTK_XF86VIDEOFBDEV_NEED_PATCH),y)
+	@cd $(PACKAGES_BUILD)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION); \
+	patch -p1 < $(DOWNLOAD_DIR)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION).patch
+endif
+	@touch $@
+
+$(XF86VIDEOFBDEV_BUILD_DIR)/.configured:
+	$(Q)cd $(XF86VIDEOFBDEV_BUILD_DIR); \
+	CC=$(TARGETCC_CACHED) \
+	CXX=$(TARGETCXX_CACHED) \
+	AR=$(TARGETAR) \
+	RANLIB=$(TARGETRANLIB) \
+	AS=$(CROSS_COMPILE)as \
+	LD=$(TARGETLD) \
+	NM=$(TARGETNM) \
+	STRIP=$(TARGETSTRIP) \
+	OBJDUMP=$(TARGETOBJDUMP) \
+	OBJCOPY=$(TARGETOBJCOPY) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
+	CPPFLGAS="-I$(SYSROOT)/usr/include" \
+	PKG_CONFIG=$(PKGCONFIG_BIN) \
+	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
+	--target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \
+	--prefix=/usr
+	@touch $@
+
+xf86videofbdev_clean:
+	$(call EMBTK_GENERIC_MESSAGE,"cleanup xf86videofbdev-$(XF86VIDEOFBDEV_VERSION)...")
+	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XF86VIDEOFBDEV_BINS)
+	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XF86VIDEOFBDEV_SBINS)
+	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XF86VIDEOFBDEV_INCLUDES)
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XF86VIDEOFBDEV_LIBS)
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XF86VIDEOFBDEV_PKGCONFIGS)
+
diff --git a/packages/x11/xserver/xserver.kconfig b/packages/x11/xserver/xserver.kconfig
index 64aea03..fb44f27 100644
--- a/packages/x11/xserver/xserver.kconfig
+++ b/packages/x11/xserver/xserver.kconfig
@@ -91,6 +91,14 @@ config EMBTK_HAVE_XSERVER_WITH_TSLIB
 	depends on EMBTK_HAVE_XSERVER
 	select EMBTK_HAVE_TSLIB
 
+if EMBTK_HAVE_XSERVER_XORG
+comment "Xorg server input drivers"
+source packages/x11/xf86inputevdev/xf86inputevdev.kconfig
+
+comment "Xorg server video drivers"
+source packages/x11/xf86videofbdev/xf86videofbdev.kconfig
+endif
+
 config EMBTK_XSERVER_VERSION_STRING
 	string
 	default "1.8.2"	if EMBTK_XSERVER_VERSION_1_8_2