Commit c5c1adc3 authored by Eric Andersen's avatar Eric Andersen
Browse files

First pass at getting current x.org to into buildroot. 

Still needs more polish but is a good start.
parent 6f0d9d76

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ source "package/vtun/Config.in" 
source "package/wget/Config.in"

source "package/which/Config.in"

source "package/wireless-tools/Config.in"

source "package/xorg/Config.in"

source "package/zlib/Config.in"

package/xorg/Config.in

0 → 100644
+11 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_XORG

	bool "X.org X Window System"

	default n

	depends !BR2_PACKAGE_TINYX

	help

	  The official X Window system and server.



comment "X.org X Window System disabled, tinyx selected"

	depends on BR2_PACKAGE_TINYX

package/xorg/xorg-6.8.2-linux_config.patch

0 → 100644
+10 −0
Original line number Diff line number Diff line 
--- xc/extras/drm/shared/drm.h.orig	2004-09-20 22:25:23.042737520 +0200

+++ xc/extras/drm/shared/drm.h	2004-09-20 22:25:33.282180888 +0200

@@ -38,7 +38,6 @@

 #define _DRM_H_

 

 #if defined(__linux__)

-#include <linux/config.h>

 #include <asm/ioctl.h>		/* For _IO* macros */

 #define DRM_IOCTL_NR(n)		_IOC_NR(n)

 #define DRM_IOC_VOID		_IOC_NONE

package/xorg/xorg-6.8.2-xterm.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- xc/programs/xterm/Imakefile.orig	2004-08-13 14:57:19.000000000 +0200

+++ xc/programs/xterm/Imakefile	2004-09-20 22:04:49.505263720 +0200

@@ -93,7 +93,7 @@

 #endif

 

 #ifdef UTF8support

-    UTF8_OPTION = -DOPT_WIDE_CHARS -DOPT_LUIT_PROG

+    UTF8_OPTION = -DOPT_WIDE_CHARS -DOPT_LUIT_PROG -DOPT_256_COLORS

         UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c

         UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o

 #endif

package/xorg/xorg-config.patch

0 → 100644
+106 −0
Original line number Diff line number Diff line 
--- xc/config/cf/host.def~	Thu May 12 15:28:01 MDT 2005

+++ xc/config/cf/host.def	Thu May 12 15:28:01 MDT 2005

@@ -0,0 +1,38 @@

+#define KDriveXServer		YES

+#define TinyXServer		YES

+#define XfbdevServer		YES

+#define CrossCompiling		YES

+#define ProjectRoot             /usr/X11R6

+#define NothingOutsideProjectRoot	YES

+

+#define HasFreetype2		NO

+#define HasFontconfig		NO

+#define HasLibpng		YES

+#define HasZlib			YES

+

+#define HasExpat		NO

+#define XprtServer		NO

+#define BuildXprintClients	NO

+#define TouchScreen		NO

+#define HasTsLib		NO

+#define BuildDocs		NO

+#define BuildXF86DRI		NO

+#define BuildGlxExt		NO

+#define BuildOSMesaLib		NO

+#define BuildLBX		NO

+#define BuildLowMem		NO

+#define BuildIPv6		NO

+#define HasPam			NO

+#define HasPamMisc		NO

+

+/*

+#define XF86CardDrivers		mga glint nv tga s3virge sis rendition \

+				neomagic i740 tdfx savage \

+				cirrus vmware tseng trident chips apm \

+				GlideDriver fbdev i128 \

+				ati AgpGartDrivers DevelDrivers ark \

+				cyrix siliconmotion vesa vga \

+				XF86OSCardDrivers XF86ExtraCardDrivers

+*/

+

+#define XInputDrivers		mouse keyboard

--- xc/config/cf/cross.def~	Thu May 12 15:28:01 MDT 2005

+++ xc/config/cf/cross.def	Thu May 12 15:28:01 MDT 2005

@@ -1,45 +1,45 @@

-/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */

+/* $XFree86: xc/config/cf/cross.def,v 1.2 2001/03/30 02:15:17 keithp Exp $ */

 /*

  * This file contains redefinitions of some symbols to enable

  * cross compilation: e.g. paths for include files and paths to

  * compiler images.  It will have to be edited to reflect these

  * given your local configuration.

  */

-#if 0

-#undef i386Architecture

+#define i386Architecture

-#define Arm32Architecture

+#undef Arm32Architecture

 

 #undef OptimizedCDebugFlags

-#define OptimizedCDebugFlags 	-O2

-#define ServerCDebugFlags	-O2

+#define OptimizedCDebugFlags 	-Os

+#define ServerCDebugFlags	-Os

 #undef StandardDefines

-#define StandardDefines 	-Dlinux -D__arm__ -D_POSIX_SOURCE \

+#define StandardDefines 	-Dlinux -D__REPLACE_ARCH__ -D_POSIX_SOURCE \

 				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE

 #undef CcCmd

-#define StdIncDir /skiff/local/arm-linux/include

-#define PreIncDir 

+#define StdIncDir REPLACE_STAGING_DIR/include

+#define PreIncDir

 #undef PostIncDir

-#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include

-#define CcCmd /skiff/local/bin/arm-linux-gcc

+#define PostIncDir REPLACE_STAGING_DIR/lib/gcc-lib/REPLACE_ARCH-linux-uclibc/3.3.3/include

+#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc

 #undef CplusplusCmd

-#define HasCplusplus YES

-#define CplusplusCmd /skiff/local/bin/arm-linux-g++

+#define HasCplusplus NO

+#define CplusplusCmd NO

 #define DoRanlibCmd YES

-#define RanlibCmd /skiff/local/bin/arm-linux-ranlib

+#define RanlibCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ranlib

 #undef ExtraLoadFlags

 #define ExtraLoadFlags

 #define FbNoPixelAddrCode

 #undef TermcapLibrary

-#define TermcapLibrary -ltermcap

+#define TermcapLibrary -lncurses

 

 #undef LdPostLib

-#define LdPostLib	-L/skiff/local/arm-linux/lib

+#define LdPostLib	-LREPLACE_STAGING_DIR/REPLACE_ARCH-linux-uclibc/lib

+#undef LdCmd

+#define LdCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ld

 

 #undef ExtensionOSDefines

 #define ExtensionOSDefines

 

 #define ServerXdmcpDefines	/**/

 

 #define HostCcCmd  cc

-#endif

 #include <cross.rules>