Packages: X11: add recordproto as it is needed by new xorg-server

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

6 files changed, 156 insertions, 4 deletions

diff --git a/packages/x11/recordproto/recordproto.kconfig b/packages/x11/recordproto/recordproto.kconfig
new file mode 100644
index 0000000..278861e
--- /dev/null
+++ b/packages/x11/recordproto/recordproto.kconfig
@@ -0,0 +1,44 @@
+################################################################################
+# GAYE Abdoulaye Walsimou, <awg@embtoolkit.org>
+# Copyright(C) 2010 GAYE Abdoulaye Walsimou. 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         recordproto.kconfig
+# \brief	recordproto.kconfig of Embtoolkit
+# \author       GAYE Abdoulaye Walsimou, <awg@embtoolkit.org>
+# \date         June 2010
+################################################################################
+
+config EMBTK_HAVE_RECORDPROTO
+	bool "Have recordproto"
+	help
+		recordproto for X windowing system
+choice
+	prompt "recordproto version you wish"
+	depends on EMBTK_HAVE_RECORDPROTO
+	help
+		Here you can choose which version of recordproto you want to
+		use.
+
+	config  EMBTK_RECORDPROTO_VERSION_1_14
+		bool "recordproto-1.14"
+endchoice
+
+config EMBTK_RECORDPROTO_VERSION_STRING
+	string
+	default "1.14"	if EMBTK_RECORDPROTO_VERSION_1_14
+
diff --git a/packages/x11/recordproto/recordproto.mk b/packages/x11/recordproto/recordproto.mk
new file mode 100644
index 0000000..99fa301
--- /dev/null
+++ b/packages/x11/recordproto/recordproto.mk
@@ -0,0 +1,101 @@
+################################################################################
+# GAYE Abdoulaye Walsimou, <awg@embtoolkit.org>
+# Copyright(C) 2010 GAYE Abdoulaye Walsimou. 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         recordproto.mk
+# \brief	recordproto.mk of Embtoolkit
+# \author       GAYE Abdoulaye Walsimou, <awg@embtoolkit.org>
+# \date         June 2010
+################################################################################
+
+RECORDPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_RECORDPROTO_VERSION_STRING)))
+RECORDPROTO_SITE := http://ftp.x.org/pub/individual/proto
+RECORDPROTO_PACKAGE := recordproto-$(RECORDPROTO_VERSION).tar.bz2
+RECORDPROTO_BUILD_DIR := $(PACKAGES_BUILD)/recordproto-$(RECORDPROTO_VERSION)
+
+RECORDPROTO_BINS =
+RECORDPROTO_SBINS =
+RECORDPROTO_INCLUDES = X11/extensions/recordconst.h \
+			X11/extensions/recordproto.h X11/extensions/recordstr.h
+RECORDPROTO_LIBS =
+RECORDPROTO_PKGCONFIGS = recordproto.pc
+
+ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
+PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig
+else
+PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig
+endif
+
+recordproto_install: $(RECORDPROTO_BUILD_DIR)/.installed
+
+$(RECORDPROTO_BUILD_DIR)/.installed: download_recordproto \
+	$(RECORDPROTO_BUILD_DIR)/.decompressed $(RECORDPROTO_BUILD_DIR)/.configured
+	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	recordproto-$(RECORDPROTO_VERSION) in your root filesystem...")
+	$(Q)$(MAKE) -C $(RECORDPROTO_BUILD_DIR) $(J)
+	$(Q)$(MAKE) -C $(RECORDPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
+	$(Q)$(MAKE) libtool_files_adapt
+	$(Q)$(MAKE) pkgconfig_files_adapt
+	@touch $@
+
+download_recordproto:
+	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(RECORDPROTO_PACKAGE) \
+	if necessary...")
+	@test -e $(DOWNLOAD_DIR)/$(RECORDPROTO_PACKAGE) || \
+	wget -O $(DOWNLOAD_DIR)/$(RECORDPROTO_PACKAGE) \
+	$(RECORDPROTO_SITE)/$(RECORDPROTO_PACKAGE)
+
+$(RECORDPROTO_BUILD_DIR)/.decompressed:
+	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(RECORDPROTO_PACKAGE) ...")
+	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(RECORDPROTO_PACKAGE)
+	@touch $@
+
+$(RECORDPROTO_BUILD_DIR)/.configured:
+	$(Q)cd $(RECORDPROTO_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) --prefix=/usr --libdir=/usr/$(LIBDIR)
+	@touch $@
+
+recordproto_clean:
+	$(call EMBTK_GENERIC_MESSAGE,"cleanup recordproto-$(RECORDPROTO_VERSION)...")
+	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RECORDPROTO_BINS)
+	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RECORDPROTO_SBINS)
+	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RECORDPROTO_INCLUDES)
+	$(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(RECORDPROTO_LIBS)
+	$(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(RECORDPROTO_PKGCONFIGS)
+ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
+	$(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(RECORDPROTO_LIBS)
+	$(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(RECORDPROTO_PKGCONFIGS)
+endif
+
diff --git a/packages/x11/x11.kconfig b/packages/x11/x11.kconfig
index c97b00d..621a884 100644
--- a/packages/x11/x11.kconfig
+++ b/packages/x11/x11.kconfig
@@ -38,6 +38,7 @@ source packages/x11/fontsproto/fontsproto.kconfig
 source packages/x11/inputproto/inputproto.kconfig
 source packages/x11/kbproto/kbproto.kconfig
 source packages/x11/randrproto/randrproto.kconfig
+source packages/x11/recordproto/recordproto.kconfig
 source packages/x11/renderproto/renderproto.kconfig
 source packages/x11/resourceproto/resourceproto.kconfig
 source packages/x11/videoproto/videoproto.kconfig
diff --git a/packages/x11/x11.mk b/packages/x11/x11.mk
index dc624df..c7627e2 100644
--- a/packages/x11/x11.mk
+++ b/packages/x11/x11.mk
@@ -78,6 +78,11 @@ include $(EMBTK_ROOT)/packages/x11/randrproto/randrproto.mk
 ROOTFS_COMPONENTS_CLEAN += randrproto_clean
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_RANDRPROTO) += randrproto_install
 
+#recordproto
+include $(EMBTK_ROOT)/packages/x11/recordproto/recordproto.mk
+ROOTFS_COMPONENTS_CLEAN += recordproto_clean
+ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_RECORDPROTO) += recordproto_install
+
 #renderproto
 include $(EMBTK_ROOT)/packages/x11/renderproto/renderproto.mk
 ROOTFS_COMPONENTS_CLEAN += renderproto_clean
diff --git a/packages/x11/xserver/xserver.kconfig b/packages/x11/xserver/xserver.kconfig
index 4b670ea..5d164dc 100644
--- a/packages/x11/xserver/xserver.kconfig
+++ b/packages/x11/xserver/xserver.kconfig
@@ -33,6 +33,7 @@ config EMBTK_HAVE_XSERVER
 	select EMBTK_HAVE_INPUTPROTO
 	select EMBTK_HAVE_KBPROTO
 	select EMBTK_HAVE_RANDRPROTO
+	select EMBTK_HAVE_RECORDPROTO
 	select EMBTK_HAVE_RENDERPROTO
 	select EMBTK_HAVE_RESOURCEPROTO
 	select EMBTK_HAVE_VIDEOPROTO
diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk
index 6940d8a..fd96917 100644
--- a/packages/x11/xserver/xserver.mk
+++ b/packages/x11/xserver/xserver.mk
@@ -37,10 +37,10 @@ XSERVER_PKGCONFIGS =
 XSERVER_DEPS := utilmacros_install bigreqsproto_install compositeproto_install \
 		damageproto_install fixesproto_install fontsproto_install \
 		inputproto_install kbproto_install randrproto_install \
-		renderproto_install resourceproto_install videoproto_install \
-		xcbproto_install xcmiscproto_install xextproto_install \
-		xproto_install libxfont_install libxkbfile_install \
-		xtrans_install openssl_install
+		recordproto_install renderproto_install resourceproto_install \
+		videoproto_install xcbproto_install xcmiscproto_install \
+		xextproto_install xproto_install libxfont_install \
+		libxkbfile_install xtrans_install openssl_install
 
 XSERVER_CONFIGURE_OPTS := --enable-kdrive --with-sha1=libcrypto \
 		--disable-xorg --disable-aiglx --disable-glx-tls --disable-dga \