From a7e49eb2af5d2ca6e53fb908fddfddd92696910a Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 10 Aug 2007 19:07:51 +0000
Subject: Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. 
 Doesn't quite work yet for me, but this clearly is a huge project and not
 having it quite work on the first pass is hardly unexpected.  We definately
 want this stuff in buildroot.

---
 package/x11r7/xlib_libX11/Config.in                | 18 +++++++++
 .../xlib_libX11/xlib_libX11-1.1.1-makekeys.patch   | 46 ++++++++++++++++++++++
 package/x11r7/xlib_libX11/xlib_libX11.mk           | 16 ++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 package/x11r7/xlib_libX11/Config.in
 create mode 100644 package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch
 create mode 100644 package/x11r7/xlib_libX11/xlib_libX11.mk

(limited to 'package/x11r7/xlib_libX11')

diff --git a/package/x11r7/xlib_libX11/Config.in b/package/x11r7/xlib_libX11/Config.in
new file mode 100644
index 000000000..b8720921e
--- /dev/null
+++ b/package/x11r7/xlib_libX11/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_XLIB_LIBX11
+	bool "libX11"
+	default n
+	select BR2_PACKAGE_LIBXCB
+	select BR2_PACKAGE_XUTIL_UTIL_MACROS
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XLIB_LIBXAU
+	select BR2_PACKAGE_XLIB_LIBXDMCP
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
+	select BR2_PACKAGE_XPROTO_BIGREQSPROTO
+	select BR2_PACKAGE_XPROTO_XCMISCPROTO
+	help
+	  libX11 1.1.1
+	  X.Org X11 library
diff --git a/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch b/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch
new file mode 100644
index 000000000..b08cafae6
--- /dev/null
+++ b/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch
@@ -0,0 +1,46 @@
+--- libX11-1.1.1/configure.ac.orig	2006-12-01 02:50:11.000000000 +0100
++++ libX11-1.1.1/configure.ac	2007-06-08 15:20:02.000000000 +0200
+@@ -7,6 +7,8 @@
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+         libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CANONICAL_BUILD
++AC_CANONICAL_HOST
+ AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+ 
+ AM_MAINTAINER_MODE
+@@ -18,6 +20,15 @@
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
+ 
++AC_MSG_CHECKING([for CC_FOR_BUILD])
++if test x$host != x$build ; then
++    CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++else
++    CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
+ XORG_PROG_RAWCPP
+ 
+ # Build with XCB support?
+--- libX11-1.1.1/src/util/Makefile.am.orig	2006-10-04 19:43:17.000000000 +0200
++++ libX11-1.1.1/src/util/Makefile.am	2007-06-08 15:20:42.000000000 +0200
+@@ -5,7 +5,15 @@
+ makekeys_CFLAGS=$(X11_CFLAGS)
+ 
+ #override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
++LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
++
++$(srcdir)/makekeys-makekeys.o:
++	$(COMPILE) -c $< -o $@
++
++$(srcdir)/makekeys: $(srcdir)/makekeys-makekeys.o
++	$(LINK) $< -o $@
+ 
+ EXTRA_DIST = mkks.sh
+ 
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
new file mode 100644
index 000000000..0e458ed59
--- /dev/null
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# xlib_libX11 -- X.Org X11 library
+#
+################################################################################
+
+XLIB_LIBX11_VERSION = 1.1.1
+XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
+XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBX11_AUTORECONF = YES
+XLIB_LIBX11_INSTALL_STAGING = YES
+XLIB_LIBX11_DEPENDANCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_bigreqsproto xproto_xcmiscproto
+XLIB_LIBX11_CONF_ENV = ac_cv_func_mmap_fixed_mapped=yes CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
+XLIB_LIBX11_CONF_OPT = --disable-malloc0returnsnull --with-xcb --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libX11))
-- 
cgit v1.2.3