* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2006-07-18 2:00 andersen
0 siblings, 0 replies; 16+ messages in thread
From: andersen @ 2006-07-18 2:00 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-07-18 00:19:10 -0700 (Tue, 18 Jul 2006)
New Revision: 15712
Log:
fixup some build and dependancy problems.
Modified:
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2006-07-17 03:53:12 UTC (rev 15711)
+++ trunk/buildroot/package/xorg/xorg.mk 2006-07-18 07:19:10 UTC (rev 15712)
@@ -11,7 +11,7 @@
xauth/xauth xinit/xinit xsetroot/xsetroot xset/xset \
xterm/xterm mkfontscale/mkfontscale mkfontdir/mkfontdir
-XORG_LIBS:= Xft fontconfig freetype expat Xrender Xaw Xmu Xt \
+XORG_LIBS:= Xft fontconfig expat Xrender Xaw Xmu Xt \
SM ICE Xpm Xp Xext X11 Xmuu
#############################################################
@@ -27,8 +27,8 @@
XORG_DIR:=$(BUILD_DIR)/xc
XORG_LDIR:=$(XORG_DIR)/lib
XORG_PROGS:=$(XORG_DIR)/programs
-TARGET_BINX:=/usr/X11R6/bin/
-TARGET_LIBX:=/usr/X11R6/lib/
+TARGET_BINX:=/usr/X11R6/bin
+TARGET_LIBX:=/usr/X11R6/lib
XORG_BINX:=$(TARGET_DIR)$(TARGET_BINX)
XORG_LIBX:=$(TARGET_DIR)$(TARGET_LIBX)
XORG_CF:=$(XORG_DIR)/config/cf/cross.def
@@ -49,7 +49,7 @@
$(DL_DIR)/$(XORG_SOURCE):
$(WGET) -P $(DL_DIR) $(XORG_SITE)/$(XORG_SOURCE)
-$(XORG_DIR)/.configure: $(DL_DIR)/$(XORG_SOURCE)
+$(XORG_DIR)/.configured: $(DL_DIR)/$(XORG_SOURCE)
$(XORG_CAT) $(DL_DIR)/$(XORG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ \*.patch
$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_HOST_DEF)
@@ -63,13 +63,14 @@
$(SED) 's:#.*define.*HasPam.*YES::g' $(XORG_DIR)/config/cf/linux.cf
$(SED) 's:#.*define.*CrossCompiling.*NO:#define CrossCompiling YES:g' $(XORG_DIR)/config/cf/Imake.tmpl
$(SED) 's:#.*undef.*CrossCompileDir.*:#define CrossCompileDir$(STAGING_DIR)/bin:g' $(XORG_DIR)/config/cf/Imake.tmpl
- touch $(XORG_DIR)/.configure
+ touch $(XORG_DIR)/.configured
-$(XORG_XSERVER): $(XORG_DIR)/.configure
+$(XORG_XSERVER): $(XORG_DIR)/.configured
rm -f $(TARGET_XSERVER) $(XORG_XSERVER)
( cd $(XORG_DIR) ; $(MAKE) \
PKG_CONFIG=$(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY) \
World XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
+ touch -c $(XORG_XSERVER)
$(TARGET_XSERVER): $(XORG_XSERVER)
-mkdir -p $(XORG_BINX)
@@ -88,27 +89,31 @@
cp -LRf $(XORG_DIR)/fonts/bdf/misc/*.bdf $(XORG_LIBX)/X11/fonts/misc/
( cd $(XORG_LIBX)/X11/fonts/misc/; mkfontdir )
(cd $(TARGET_DIR)/usr/bin; ln -snf $(TARGET_BINX) X11)
+ touch -c $(TARGET_XSERVER)
-$(XORG_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
+$(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER)
-mkdir -p $(XORG_LIBX)
- for dirs in $(XORG_LIBS) ; do \
- file=`find $(XORG_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"` ; \
+ set -e; for dirs in $(XORG_LIBS) ; do \
+ file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"` ; \
$(STRIP) --strip-unneeded $$file ; \
cp -f $$file $(XORG_LIBX) ; \
- file=`find $(XORG_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"` ; \
+ file=`find $(XORG_LDIR)/$$dirs -type l -iname "*$$dirs.so*"` ; \
cp -pRf $$file $(XORG_LIBX) ; \
done
(cd $(TARGET_DIR)/usr/lib; ln -snf $(TARGET_LIBX) X11)
- echo "$(TARGET_LIBX)" >> $(TARGET_DIR)/etc/ld.so.conf
+ if [ grep -q '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf ] ; then \
+ echo "$(TARGET_LIBX)" >> $(TARGET_DIR)/etc/ld.so.conf; \
+ fi;
+ touch -c $(XORG_LIBX)/libX11.so.6.2
-$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_LIBX)/libX11.so.6.2
+$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
-mkdir -p $(STAGING_DIR)$(TARGET_LIBX)
( cd $(XORG_DIR); $(MAKE) \
DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
-xorg: zlib png $(XORG_LIBX)/libX11.so.6.2 $(TARGET_XSERVER) $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
+xorg: zlib png $(XORG_LIBX)/libX11.so.6.2 $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
xorg-source: $(DL_DIR)/$(XORG_SOURCE)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2006-07-20 15:46 andersen
0 siblings, 0 replies; 16+ messages in thread
From: andersen @ 2006-07-20 15:46 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-07-20 15:46:15 -0700 (Thu, 20 Jul 2006)
New Revision: 15737
Log:
fix build and add some basic setup so it can run
Added:
trunk/buildroot/package/xorg/xorg-mmx.patch
trunk/buildroot/package/xorg/xorg-noxf86cfg.patch
trunk/buildroot/package/xorg/xorg.conf
Modified:
trunk/buildroot/package/xorg/xorg-config.patch
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/xorg-config.patch
===================================================================
--- trunk/buildroot/package/xorg/xorg-config.patch 2006-07-20 19:31:07 UTC (rev 15736)
+++ trunk/buildroot/package/xorg/xorg-config.patch 2006-07-20 22:46:15 UTC (rev 15737)
@@ -1,6 +1,6 @@
--- 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,42 @@
+@@ -0,0 +1,43 @@
+#define KDriveXServer YES
+#define TinyXServer YES
+#define XfbdevServer YES
@@ -32,7 +32,8 @@
+#define BuildIPv6 NO
+#define HasPam NO
+#define HasPamMisc NO
-+
++#define BuildXterm NO
++#define BuildXFree86ConfigTools NO
+/*
+#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
+ neomagic i740 tdfx savage \
Added: trunk/buildroot/package/xorg/xorg-mmx.patch
===================================================================
--- trunk/buildroot/package/xorg/xorg-mmx.patch 2006-07-20 19:31:07 UTC (rev 15736)
+++ trunk/buildroot/package/xorg/xorg-mmx.patch 2006-07-20 22:46:15 UTC (rev 15737)
@@ -0,0 +1,19 @@
+--- xc/programs/Xserver/fb/Imakefile.orig 2006-07-20 11:41:36.000000000 -0600
++++ xc/programs/Xserver/fb/Imakefile 2006-07-20 11:43:50.000000000 -0600
+@@ -3,16 +3,6 @@
+ XCOMM
+ XCOMM Id: Imakefile,v 1.1 1999/11/02 03:54:44 keithp Exp $
+
+-#if defined(i386Architecture) && defined(HasGcc34) && HasGcc34
+-MMXOPTIONS= -mmmx -Winline --param inline-unit-growth=10000 \
+- --param large-function-growth=10000 -DUSE_GCC34_MMX
+-
+-SpecialCObjectRule(fbmmx,fbmmx.c,$(MMXOPTIONS))
+-SpecialCObjectRule(fbpict,fbpict.c,$(MMXOPTIONS))
+-SpecialCObjectRule(fbfill,fbfill.c,$(MMXOPTIONS))
+-
+-#endif
+-
+ #if DoLoadableServer
+ #if !BuildModuleInSubdir
+ #define IHaveModules
Added: trunk/buildroot/package/xorg/xorg-noxf86cfg.patch
===================================================================
--- trunk/buildroot/package/xorg/xorg-noxf86cfg.patch 2006-07-20 19:31:07 UTC (rev 15736)
+++ trunk/buildroot/package/xorg/xorg-noxf86cfg.patch 2006-07-20 22:46:15 UTC (rev 15737)
@@ -0,0 +1,13 @@
+--- xc/programs/Xserver/hw/xfree86/Imakefile.orig 2006-07-20 12:51:58.000000000 -0600
++++ xc/programs/Xserver/hw/xfree86/Imakefile 2006-07-20 12:52:04.000000000 -0600
+@@ -84,10 +84,6 @@
+ DRIVERSDK = sdk
+ #endif
+
+-#if !BuildServersOnly || BuildXFree86ConfigTools
+-XF86CFGDIRS = xf86cfg xf86config
+-#endif
+-
+ SUBDIRS = os-support common $(I2CDIR) $(XAADIR) $(XF1BPPDIR) $(XF4BPPDIR) \
+ $(XF8_32BPPDIR) $(XF8_16BPPDIR) $(XF24_32BPPDIR) $(SHADOWFBDIR) \
+ drivers $(LOADERDIR) $(VGAHWDIR) $(FBDEVHWDIR) $(RAMDACDIR) \
Added: trunk/buildroot/package/xorg/xorg.conf
===================================================================
--- trunk/buildroot/package/xorg/xorg.conf 2006-07-20 19:31:07 UTC (rev 15736)
+++ trunk/buildroot/package/xorg/xorg.conf 2006-07-20 22:46:15 UTC (rev 15737)
@@ -0,0 +1,116 @@
+# XF86Config-4 (XFree86 server configuration file) generated by dexconf, the
+# Debian X Configuration tool, using values from the debconf database.
+#
+# Edit this file with caution, and see the XF86Config-4 manual page.
+# (Type "man XF86Config-4" at the shell prompt.)
+#
+# If you want your changes to this file preserved by dexconf, only make changes
+# before the "### BEGIN DEBCONF SECTION" line above, and/or after the
+# "### END DEBCONF SECTION" line below.
+#
+# To change things within the debconf section, run the command:
+# dpkg-reconfigure xserver-xfree86
+# as root. Also see "How do I add custom sections to a dexconf-generated
+# XF86Config or XF86Config-4 file?" in /usr/share/doc/xfree86-common/FAQ.gz.
+
+Section "Files"
+ FontPath "/usr/X11R6/lib/X11/fonts/100dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/misc"
+EndSection
+
+Section "Module"
+ Load "bitmap"
+ Load "dbe"
+ Load "ddc"
+ Load "freetype"
+ Load "int10"
+EndSection
+
+Section "InputDevice"
+ Identifier "Generic Keyboard"
+ Driver "keyboard"
+ Option "XkbRules" "xfree86"
+ Option "XkbModel" "pc104"
+ Option "XkbLayout" "us"
+ Option "XkbOptions" "altwin:meta_win"
+EndSection
+
+Section "InputDevice"
+ Identifier "PS2 Mouse"
+ Driver "mouse"
+ Option "CorePointer"
+ Option "Device" "/dev/psaux"
+ Option "Protocol" "ImPS/2"
+ Option "ZAxisMapping" "4 5"
+EndSection
+
+Section "InputDevice"
+ Identifier "USB Mouse"
+ Driver "mouse"
+ Option "SendCoreEvents" "true"
+ Option "Device" "/dev/input/mice"
+ Option "Protocol" "ImPS/2"
+ Option "ZAxisMapping" "4 5"
+EndSection
+
+Section "Device"
+ Identifier "Generic VGA Card"
+ Driver "vesa"
+ #Driver "vga"
+ #Driver "fbdev"
+EndSection
+
+Section "Monitor"
+ Identifier "Generic Monitor"
+ #HorizSync 30 - 82
+ #VertRefresh 50 - 85
+ Option "DPMS"
+EndSection
+
+Section "Screen"
+ Identifier "Default Screen"
+ Device "Generic VGA Card"
+ Monitor "Generic Monitor"
+ DefaultDepth 8
+ SubSection "Display"
+ Viewport 0 0
+ Depth 4
+ Modes "640x480"
+ EndSubSection
+ SubSection "Display"
+ Viewport 0 0
+ Depth 8
+ Modes "640x480"
+ EndSubSection
+ SubSection "Display"
+ Viewport 0 0
+ Depth 16
+ Modes "640x480"
+ EndSubSection
+ SubSection "Display"
+ Viewport 0 0
+ Depth 24
+ Modes "640x480"
+ EndSubSection
+EndSection
+
+Section "ServerFlags"
+ Option "BlankTime" "10"
+ Option "StandbyTime" "15"
+ Option "SuspendTime" "20"
+ Option "OffTime" "30"
+EndSection
+
+Section "ServerLayout"
+ Identifier "Default Layout"
+ Screen "Default Screen"
+ InputDevice "Generic Keyboard" "CoreKeyboard"
+ InputDevice "USB Mouse" "CorePointer"
+ InputDevice "PS2 Mouse"
+EndSection
+
+Section "DRI"
+ Mode 0666
+EndSection
+
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2006-07-20 19:31:07 UTC (rev 15736)
+++ trunk/buildroot/package/xorg/xorg.mk 2006-07-20 22:46:15 UTC (rev 15737)
@@ -9,11 +9,13 @@
XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap xinit/startx \
xauth/xauth xinit/xinit xsetroot/xsetroot xset/xset \
- xterm/xterm mkfontscale/mkfontscale mkfontdir/mkfontdir
+ mkfontscale/mkfontscale mkfontdir/mkfontdir \
+ #xterm/xterm
XORG_LIBS:= Xft fontconfig expat Xrender Xaw Xmu Xt \
- SM ICE Xpm Xp Xext X11 Xmuu
+ SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc
+
#############################################################
# Stuff below this line shouldn't need changes.
# if you do change, look in rxvt & matchbox for the impact!
@@ -72,6 +74,12 @@
World XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
touch -c $(XORG_XSERVER)
+$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
+ -mkdir -p $(STAGING_DIR)$(TARGET_LIBX)
+ ( cd $(XORG_DIR); $(MAKE) \
+ DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
+ touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
+
$(TARGET_XSERVER): $(XORG_XSERVER)
-mkdir -p $(XORG_BINX)
for file in $(XORG_APPS) ; do \
@@ -89,6 +97,9 @@
cp -LRf $(XORG_DIR)/fonts/bdf/misc/*.bdf $(XORG_LIBX)/X11/fonts/misc/
( cd $(XORG_LIBX)/X11/fonts/misc/; mkfontdir )
(cd $(TARGET_DIR)/usr/bin; ln -snf $(TARGET_BINX) X11)
+ mkdir -p $(TARGET_DIR)/etc/X11/
+ cp package/xorg/xorg.conf $(TARGET_DIR)/etc/X11/
+ cp -a $(STAGING_DIR)$(TARGET_LIBX)/X11/rgb* $(XORG_LIBX)/X11/
touch -c $(TARGET_XSERVER)
$(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER)
@@ -101,20 +112,15 @@
cp -pRf $$file $(XORG_LIBX) ; \
done
(cd $(TARGET_DIR)/usr/lib; ln -snf $(TARGET_LIBX) X11)
- if [ grep -q '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf ] ; then \
+ touch $(TARGET_DIR)/etc/ld.so.conf
+ if [ "`grep -c '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf`" = "0" ] ; then \
echo "$(TARGET_LIBX)" >> $(TARGET_DIR)/etc/ld.so.conf; \
fi;
touch -c $(XORG_LIBX)/libX11.so.6.2
-$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
- -mkdir -p $(STAGING_DIR)$(TARGET_LIBX)
- ( cd $(XORG_DIR); $(MAKE) \
- DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
- touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
+xorg: zlib png $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
-xorg: zlib png $(XORG_LIBX)/libX11.so.6.2 $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
-
xorg-source: $(DL_DIR)/$(XORG_SOURCE)
xorg-clean:
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2006-07-20 20:29 andersen
0 siblings, 0 replies; 16+ messages in thread
From: andersen @ 2006-07-20 20:29 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-07-20 20:29:50 -0700 (Thu, 20 Jul 2006)
New Revision: 15739
Log:
let X figure out the correct mouse protocol
Modified:
trunk/buildroot/package/xorg/xorg.conf
Changeset:
Modified: trunk/buildroot/package/xorg/xorg.conf
===================================================================
--- trunk/buildroot/package/xorg/xorg.conf 2006-07-20 22:50:22 UTC (rev 15738)
+++ trunk/buildroot/package/xorg/xorg.conf 2006-07-21 03:29:50 UTC (rev 15739)
@@ -39,18 +39,18 @@
Section "InputDevice"
Identifier "PS2 Mouse"
Driver "mouse"
- Option "CorePointer"
+ Option "SendCoreEvents" "true"
Option "Device" "/dev/psaux"
- Option "Protocol" "ImPS/2"
+ Option "Protocol" "auto"
Option "ZAxisMapping" "4 5"
EndSection
Section "InputDevice"
Identifier "USB Mouse"
Driver "mouse"
- Option "SendCoreEvents" "true"
+ Option "CorePointer"
Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
+ Option "Protocol" "auto"
Option "ZAxisMapping" "4 5"
EndSection
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2006-09-26 12:48 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2006-09-26 12:48 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2006-09-26 05:48:43 -0700 (Tue, 26 Sep 2006)
New Revision: 16225
Log:
Proper !i386 cross compilation support
Modified:
trunk/buildroot/package/xorg/xorg-config.patch
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/xorg-config.patch
===================================================================
--- trunk/buildroot/package/xorg/xorg-config.patch 2006-09-26 10:07:41 UTC (rev 16224)
+++ trunk/buildroot/package/xorg/xorg-config.patch 2006-09-26 12:48:43 UTC (rev 16225)
@@ -47,7 +47,7 @@
+#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 @@
+@@ -1,45 +1,63 @@
-/* $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 $ */
/*
@@ -57,10 +57,27 @@
* given your local configuration.
*/
-#if 0
--#undef i386Architecture
-+#define i386Architecture
++/* Undefine any architectures detected */
+ #undef i386Architecture
-#define Arm32Architecture
++#undef AMD64Architecture
++#undef PpcArchitecture
++#undef SparcArchitecture
++#undef AlphaArchitecture
+#undef Arm32Architecture
++#undef ia64Architecture
++#undef MipsArchitecture
++
++/* Cross compiling for: */
++#define REPLACE_XORG_ARCHArchitecture
++
++/* MTRR detection in linux.cf is exec'ed before cross.def, so redo it here */
++#undef HasMTRRSupport
++#if defined (i386Architecture) || defined (AMD64Architecture)
++# define HasMTRRSupport YES
++#else
++# define HasMTRRSupport NO /* no for non-ix86 */
++#endif
#undef OptimizedCDebugFlags
-#define OptimizedCDebugFlags -O2
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2006-09-26 10:07:41 UTC (rev 16224)
+++ trunk/buildroot/package/xorg/xorg.mk 2006-09-26 12:48:43 UTC (rev 16225)
@@ -48,6 +48,27 @@
HAS_FREETYPE2=NO
endif
+# figure out Xorg's idea of corresponding architecture name
+ifeq ($(BR2_alpha),y)
+XARCH=Alpha
+else ifeq ($(BR2_arm),y)
+XARCH=Arm32
+else ifeq ($(BR2_armeb),y)
+XARCH=Arm32
+else ifeq ($(BR2_i386),y)
+XARCH=i386A
+else ifeq ($(BR2_mips),y)
+XARCH=Mips
+else ifeq ($(BR2_mipsel),y)
+XARCH=Mips
+else ifeq ($(BR2_powerpc),y)
+XARCH=Ppc
+else ifeq ($(BR2_sparc),y)
+XARCH=Sparc
+else ifeq ($(BR2_x86_64),y)
+XARCH=AMD64
+endif
+
$(DL_DIR)/$(XORG_SOURCE):
$(WGET) -P $(DL_DIR) $(XORG_SITE)/$(XORG_SOURCE)
@@ -65,6 +86,7 @@
$(SED) 's:#.*define.*HasPam.*YES::g' $(XORG_DIR)/config/cf/linux.cf
$(SED) 's:#.*define.*CrossCompiling.*NO:#define CrossCompiling YES:g' $(XORG_DIR)/config/cf/Imake.tmpl
$(SED) 's:#.*undef.*CrossCompileDir.*:#define CrossCompileDir$(STAGING_DIR)/bin:g' $(XORG_DIR)/config/cf/Imake.tmpl
+ $(SED) 's:REPLACE_XORG_ARCH:$(XARCH):g' $(XORG_DIR)/config/cf/cross.def
touch $(XORG_DIR)/.configured
$(XORG_XSERVER): $(XORG_DIR)/.configured
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2006-09-27 18:17 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2006-09-27 18:17 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2006-09-27 11:17:31 -0700 (Wed, 27 Sep 2006)
New Revision: 16237
Log:
make 3.80 doesn't understand 'else ifeq(..)'
Reported by Jeff Rhyason.
Modified:
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2006-09-27 14:51:27 UTC (rev 16236)
+++ trunk/buildroot/package/xorg/xorg.mk 2006-09-27 18:17:31 UTC (rev 16237)
@@ -51,21 +51,29 @@
# figure out Xorg's idea of corresponding architecture name
ifeq ($(BR2_alpha),y)
XARCH=Alpha
-else ifeq ($(BR2_arm),y)
+endif
+ifeq ($(BR2_arm),y)
XARCH=Arm32
-else ifeq ($(BR2_armeb),y)
+endif
+ifeq ($(BR2_armeb),y)
XARCH=Arm32
-else ifeq ($(BR2_i386),y)
+endif
+ifeq ($(BR2_i386),y)
XARCH=i386A
-else ifeq ($(BR2_mips),y)
+endif
+ifeq ($(BR2_mips),y)
XARCH=Mips
-else ifeq ($(BR2_mipsel),y)
+endif
+ifeq ($(BR2_mipsel),y)
XARCH=Mips
-else ifeq ($(BR2_powerpc),y)
+endif
+ifeq ($(BR2_powerpc),y)
XARCH=Ppc
-else ifeq ($(BR2_sparc),y)
+endif
+ifeq ($(BR2_sparc),y)
XARCH=Sparc
-else ifeq ($(BR2_x86_64),y)
+endif
+ifeq ($(BR2_x86_64),y)
XARCH=AMD64
endif
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2006-10-02 18:25 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2006-10-02 18:25 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-10-02 11:25:37 -0700 (Mon, 02 Oct 2006)
New Revision: 16288
Log:
Andrew E. Mileski writes:
This looks like a typo to me. Without this patch, one ends up with
"i386AArchitecture" being defined, which doesn't match anything.
Modified:
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2006-10-01 21:37:40 UTC (rev 16287)
+++ trunk/buildroot/package/xorg/xorg.mk 2006-10-02 18:25:37 UTC (rev 16288)
@@ -59,7 +59,7 @@
XARCH=Arm32
endif
ifeq ($(BR2_i386),y)
-XARCH=i386A
+XARCH=i386
endif
ifeq ($(BR2_mips),y)
XARCH=Mips
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2006-10-14 11:34 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2006-10-14 11:34 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2006-10-14 04:34:14 -0700 (Sat, 14 Oct 2006)
New Revision: 16379
Log:
fix CrossCompileDir (patch by Andrew E. Milesk)
Modified:
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2006-10-14 11:12:20 UTC (rev 16378)
+++ trunk/buildroot/package/xorg/xorg.mk 2006-10-14 11:34:14 UTC (rev 16379)
@@ -93,7 +93,7 @@
$(SED) 's:#define LdCmd.*:#define LdCmd $(TARGET_CROSS)ld:g' $(XORG_CF)
$(SED) 's:#.*define.*HasPam.*YES::g' $(XORG_DIR)/config/cf/linux.cf
$(SED) 's:#.*define.*CrossCompiling.*NO:#define CrossCompiling YES:g' $(XORG_DIR)/config/cf/Imake.tmpl
- $(SED) 's:#.*undef.*CrossCompileDir.*:#define CrossCompileDir$(STAGING_DIR)/bin:g' $(XORG_DIR)/config/cf/Imake.tmpl
+ $(SED) 's:#.*undef.*CrossCompileDir.*:#define CrossCompileDir $(STAGING_DIR)/bin:g' $(XORG_DIR)/config/cf/Imake.tmpl
$(SED) 's:REPLACE_XORG_ARCH:$(XARCH):g' $(XORG_DIR)/config/cf/cross.def
touch $(XORG_DIR)/.configured
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2006-11-17 23:17 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2006-11-17 23:17 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-11-17 15:17:02 -0800 (Fri, 17 Nov 2006)
New Revision: 16573
Log:
fix deps so xorg can once again be selected
Modified:
trunk/buildroot/package/xorg/Config.in
Changeset:
Modified: trunk/buildroot/package/xorg/Config.in
===================================================================
--- trunk/buildroot/package/xorg/Config.in 2006-11-17 22:58:29 UTC (rev 16572)
+++ trunk/buildroot/package/xorg/Config.in 2006-11-17 23:17:02 UTC (rev 16573)
@@ -2,8 +2,8 @@
bool "X.org X Window System"
default n
depends !BR2_PACKAGE_TINYX
- depends BR2_PACKAGE_ZLIB
- depends BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_LIBPNG
help
The official X Window system and server.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2007-01-10 23:56 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-10 23:56 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-10 15:56:30 -0800 (Wed, 10 Jan 2007)
New Revision: 17236
Log:
update xorg build and installation paths
Modified:
trunk/buildroot/package/xorg/Config.in
trunk/buildroot/package/xorg/xorg-config.patch
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/Config.in
===================================================================
--- trunk/buildroot/package/xorg/Config.in 2007-01-10 23:54:35 UTC (rev 17235)
+++ trunk/buildroot/package/xorg/Config.in 2007-01-10 23:56:30 UTC (rev 17236)
@@ -4,6 +4,8 @@
depends !BR2_PACKAGE_TINYX
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_PKGCONFIG
help
The official X Window system and server.
Modified: trunk/buildroot/package/xorg/xorg-config.patch
===================================================================
--- trunk/buildroot/package/xorg/xorg-config.patch 2007-01-10 23:54:35 UTC (rev 17235)
+++ trunk/buildroot/package/xorg/xorg-config.patch 2007-01-10 23:56:30 UTC (rev 17236)
@@ -8,8 +8,8 @@
+#define ProjectRoot /usr/X11R6
+#define NothingOutsideProjectRoot YES
+
-+#define HasFreetype2 REPLACE_HAS_FREETYPE2
-+#define Freetype2Dir REPLACE_STAGING_DIR/usr
++#define HasFreetype2 YES
++#define Freetype2Dir REPLACE_STAGING_DIR
+#define HasFontconfig NO
+#define HasLibpng YES
+#define HasZlib YES
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2007-01-10 23:54:35 UTC (rev 17235)
+++ trunk/buildroot/package/xorg/xorg.mk 2007-01-10 23:56:30 UTC (rev 17236)
@@ -41,13 +41,6 @@
XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER)
TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER)
-# Check if we should use FreeType2.
-ifeq ($(BR2_PACKAGE_FREETYPE),y)
-HAS_FREETYPE2=YES
-else
-HAS_FREETYPE2=NO
-endif
-
# figure out Xorg's idea of corresponding architecture name
ifeq ($(BR2_alpha),y)
XARCH=Alpha
@@ -84,7 +77,6 @@
$(XORG_CAT) $(DL_DIR)/$(XORG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ \*.patch
$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_HOST_DEF)
- $(SED) 's:REPLACE_HAS_FREETYPE2:$(HAS_FREETYPE2):g' $(XORG_HOST_DEF)
$(SED) 's:REPLACE_GCCINC_DIR:$(shell $(TARGET_CROSS)gcc -print-file-name=include):g' $(XORG_CF)
$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_CF)
$(SED) 's:REPLACE_ARCH:$(ARCH):g' $(XORG_CF)
@@ -106,8 +98,11 @@
$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
-mkdir -p $(STAGING_DIR)$(TARGET_LIBX)
+ rm -f $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig
+ ln -fs ../../../lib/pkgconfig $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig
( cd $(XORG_DIR); $(MAKE) \
DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
+ $(SED) 's,/usr/X11R6,$(STAGING_DIR)/usr/X11R6,' $(STAGING_DIR)/usr/X11R6/lib/pkgconfig/*.pc
touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
$(TARGET_XSERVER): $(XORG_XSERVER)
@@ -149,7 +144,7 @@
touch -c $(XORG_LIBX)/libX11.so.6.2
-xorg: zlib png $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
+xorg: zlib png pkgconfig freetype $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
xorg-source: $(DL_DIR)/$(XORG_SOURCE)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2007-01-11 6:17 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-11 6:17 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-10 22:17:04 -0800 (Wed, 10 Jan 2007)
New Revision: 17238
Log:
more updates to ensure subsequent packages build
Modified:
trunk/buildroot/package/xorg/Config.in
trunk/buildroot/package/xorg/xorg-config.patch
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/Config.in
===================================================================
--- trunk/buildroot/package/xorg/Config.in 2007-01-10 23:57:40 UTC (rev 17237)
+++ trunk/buildroot/package/xorg/Config.in 2007-01-11 06:17:04 UTC (rev 17238)
@@ -5,6 +5,7 @@
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_PKGCONFIG
help
The official X Window system and server.
Modified: trunk/buildroot/package/xorg/xorg-config.patch
===================================================================
--- trunk/buildroot/package/xorg/xorg-config.patch 2007-01-10 23:57:40 UTC (rev 17237)
+++ trunk/buildroot/package/xorg/xorg-config.patch 2007-01-11 06:17:04 UTC (rev 17238)
@@ -1,6 +1,6 @@
--- 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,43 @@
+@@ -0,0 +1,44 @@
+#define KDriveXServer YES
+#define TinyXServer YES
+#define XfbdevServer YES
@@ -12,13 +12,14 @@
+#define Freetype2Dir REPLACE_STAGING_DIR
+#define HasFontconfig NO
+#define HasLibpng YES
-+#define HasZlib YES
++#define HasZlib YES
+#define HaveLib64 NO
+#define LibDirName lib
+#define SystemUsrLibDir /usr/lib
+#define TkLibDir /usr/lib
+
-+#define HasExpat NO
++#define HasExpat YES
++#define ExpatDir REPLACE_STAGING_DIR
+#define XprtServer NO
+#define BuildXprintClients NO
+#define TouchScreen NO
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2007-01-10 23:57:40 UTC (rev 17237)
+++ trunk/buildroot/package/xorg/xorg.mk 2007-01-11 06:17:04 UTC (rev 17238)
@@ -12,7 +12,7 @@
mkfontscale/mkfontscale mkfontdir/mkfontdir \
#xterm/xterm
-XORG_LIBS:= Xft fontconfig expat Xrender Xaw Xmu Xt \
+XORG_LIBS:= Xft fontconfig Xrender Xaw Xmu Xt \
SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc
@@ -97,9 +97,8 @@
touch -c $(XORG_XSERVER)
$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
- -mkdir -p $(STAGING_DIR)$(TARGET_LIBX)
- rm -f $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig
- ln -fs ../../../lib/pkgconfig $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig
+ -mkdir -p $(STAGING_DIR)/usr/X11R6
+ ln -fs ../../lib $(STAGING_DIR)$(TARGET_LIBX)
( cd $(XORG_DIR); $(MAKE) \
DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
$(SED) 's,/usr/X11R6,$(STAGING_DIR)/usr/X11R6,' $(STAGING_DIR)/usr/X11R6/lib/pkgconfig/*.pc
@@ -144,7 +143,8 @@
touch -c $(XORG_LIBX)/libX11.so.6.2
-xorg: zlib png pkgconfig freetype $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
+xorg: zlib png pkgconfig expat freetype \
+ $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
xorg-source: $(DL_DIR)/$(XORG_SOURCE)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2007-01-11 10:38 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-11 10:38 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-11 02:38:10 -0800 (Thu, 11 Jan 2007)
New Revision: 17249
Log:
a copy of mcookie will come in handy...
Added:
trunk/buildroot/package/xorg/mcookie.c
Modified:
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Added: trunk/buildroot/package/xorg/mcookie.c
===================================================================
--- trunk/buildroot/package/xorg/mcookie.c (rev 0)
+++ trunk/buildroot/package/xorg/mcookie.c 2007-01-11 10:38:10 UTC (rev 17249)
@@ -0,0 +1,425 @@
+/* mcookie.c -- Generates random numbers for xauth
+ * Created: Fri Feb 3 10:42:48 1995 by faith at cs.unc.edu
+ * Revised: Fri Mar 19 07:48:01 1999 by faith at acm.org
+ * Public Domain 1995, 1999 Rickard E. Faith (faith at acm.org)
+ * This program comes with ABSOLUTELY NO WARRANTY.
+ *
+ * $Id: mcookie.c,v 1.5 1997/07/06 00:13:06 aebr Exp $
+ *
+ * This program gathers some random bits of data and used the MD5
+ * message-digest algorithm to generate a 128-bit hexadecimal number for
+ * use with xauth(1).
+ *
+ * NOTE: Unless /dev/random is available, this program does not actually
+ * gather 128 bits of random information, so the magic cookie generated
+ * will be considerably easier to guess than one might expect.
+ *
+ * 1999-02-22 Arkadiusz Mi?kiewicz <misiek@pld.ORG.PL>
+ * - added Native Language Support
+ * 1999-03-21 aeb: Added some fragments of code from Colin Plumb.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
+#define BUFFERSIZE 4096
+
+
+#ifndef MD5_H
+#define MD5_H
+
+#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__)
+typedef unsigned int uint32;
+#else
+typedef unsigned long uint32;
+#endif
+
+struct MD5Context {
+ uint32 buf[4];
+ uint32 bits[2];
+ unsigned char in[64];
+};
+
+void MD5Init(struct MD5Context *context);
+void MD5Update(struct MD5Context *context, unsigned char const *buf,
+ unsigned len);
+void MD5Final(unsigned char digest[16], struct MD5Context *context);
+void MD5Transform(uint32 buf[4], uint32 const in[16]);
+
+/*
+ * This is needed to make RSAREF happy on some MS-DOS compilers.
+ */
+typedef struct MD5Context MD5_CTX;
+
+#endif /* !MD5_H */
+
+
+
+/*
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest. This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ */
+#include <string.h> /* for memcpy() */
+#include <endian.h>
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define byteReverse(buf, len) /* Nothing */
+#else
+void byteReverse(unsigned char *buf, unsigned longs);
+
+/*
+ * Note: this code is harmless on little-endian machines.
+ */
+void byteReverse(unsigned char *buf, unsigned longs)
+{
+ uint32 t;
+ do {
+ t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
+ ((unsigned) buf[1] << 8 | buf[0]);
+ *(uint32 *) buf = t;
+ buf += 4;
+ } while (--longs);
+}
+#endif
+
+/*
+ * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
+ * initialization constants.
+ */
+void MD5Init(struct MD5Context *ctx)
+{
+ ctx->buf[0] = 0x67452301;
+ ctx->buf[1] = 0xefcdab89;
+ ctx->buf[2] = 0x98badcfe;
+ ctx->buf[3] = 0x10325476;
+
+ ctx->bits[0] = 0;
+ ctx->bits[1] = 0;
+}
+
+/*
+ * Update context to reflect the concatenation of another buffer full
+ * of bytes.
+ */
+void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
+{
+ uint32 t;
+
+ /* Update bitcount */
+
+ t = ctx->bits[0];
+ if ((ctx->bits[0] = t + ((uint32) len << 3)) < t)
+ ctx->bits[1]++; /* Carry from low to high */
+ ctx->bits[1] += len >> 29;
+
+ t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */
+
+ /* Handle any leading odd-sized chunks */
+
+ if (t) {
+ unsigned char *p = (unsigned char *) ctx->in + t;
+
+ t = 64 - t;
+ if (len < t) {
+ memcpy(p, buf, len);
+ return;
+ }
+ memcpy(p, buf, t);
+ byteReverse(ctx->in, 16);
+ MD5Transform(ctx->buf, (uint32 *) ctx->in);
+ buf += t;
+ len -= t;
+ }
+ /* Process data in 64-byte chunks */
+
+ while (len >= 64) {
+ memcpy(ctx->in, buf, 64);
+ byteReverse(ctx->in, 16);
+ MD5Transform(ctx->buf, (uint32 *) ctx->in);
+ buf += 64;
+ len -= 64;
+ }
+
+ /* Handle any remaining bytes of data. */
+
+ memcpy(ctx->in, buf, len);
+}
+
+/*
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
+{
+ unsigned count;
+ unsigned char *p;
+
+ /* Compute number of bytes mod 64 */
+ count = (ctx->bits[0] >> 3) & 0x3F;
+
+ /* Set the first char of padding to 0x80. This is safe since there is
+ always at least one byte free */
+ p = ctx->in + count;
+ *p++ = 0x80;
+
+ /* Bytes of padding needed to make 64 bytes */
+ count = 64 - 1 - count;
+
+ /* Pad out to 56 mod 64 */
+ if (count < 8) {
+ /* Two lots of padding: Pad the first block to 64 bytes */
+ memset(p, 0, count);
+ byteReverse(ctx->in, 16);
+ MD5Transform(ctx->buf, (uint32 *) ctx->in);
+
+ /* Now fill the next block with 56 bytes */
+ memset(ctx->in, 0, 56);
+ } else {
+ /* Pad block to 56 bytes */
+ memset(p, 0, count - 8);
+ }
+ byteReverse(ctx->in, 14);
+
+ /* Append length in bits and transform */
+ ((uint32 *) ctx->in)[14] = ctx->bits[0];
+ ((uint32 *) ctx->in)[15] = ctx->bits[1];
+
+ MD5Transform(ctx->buf, (uint32 *) ctx->in);
+ byteReverse((unsigned char *) ctx->buf, 4);
+ memcpy(digest, ctx->buf, 16);
+ memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+}
+
+/* The four core functions - F1 is optimized somewhat */
+
+/* #define F1(x, y, z) (x & y | ~x & z) */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f, w, x, y, z, data, s) \
+ ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
+
+/*
+ * The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data. MD5Update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+void MD5Transform(uint32 buf[4], uint32 const in[16])
+{
+ register uint32 a, b, c, d;
+
+ a = buf[0];
+ b = buf[1];
+ c = buf[2];
+ d = buf[3];
+
+ MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+ MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+ MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+ MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+ MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+ MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+ MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+ MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+ MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+ MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+ MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+ MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+ MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+ MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+ MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+ MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+ MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+ MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+ MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+ MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+ MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+ MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+ MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+ MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+ MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+ MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+ MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+ MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+ MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+ MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+ MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+ MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+ MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+ MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+ MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+ MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+ MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+ MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+ MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+ MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+ MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+ MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+ MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+ MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+ MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+ MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+ MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+ MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+ MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+ MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+ MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+ MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+ MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+ MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+ MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+ MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+ MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+ MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+ MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+ MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+ MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+ MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+ MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+ MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+ buf[0] += a;
+ buf[1] += b;
+ buf[2] += c;
+ buf[3] += d;
+}
+
+
+
+
+struct rngs {
+ const char *path;
+ int minlength, maxlength;
+} rngs[] = {
+ { "/dev/random", 16, 16 }, /* 16 bytes = 128 bits suffice */
+ { "/proc/interrupts", 0, 0 },
+ { "/proc/slabinfo", 0, 0 },
+ { "/proc/stat", 0, 0 },
+ { "/dev/urandom", 32, 64 },
+};
+#define RNGS (sizeof(rngs)/sizeof(struct rngs))
+
+int Verbose = 0;
+
+/* The basic function to hash a file */
+static off_t
+hash_file(struct MD5Context *ctx, int fd)
+{
+ off_t count = 0;
+ ssize_t r;
+ unsigned char buf[BUFFERSIZE];
+
+ while ((r = read(fd, buf, sizeof(buf))) > 0) {
+ MD5Update(ctx, buf, r);
+ count += r;
+ }
+ /* Separate files with a null byte */
+ buf[0] = 0;
+ MD5Update(ctx, buf, 1);
+ return count;
+}
+
+int main( int argc, char **argv )
+{
+ int i;
+ struct MD5Context ctx;
+ unsigned char digest[16];
+ unsigned char buf[BUFFERSIZE];
+ int fd;
+ int c;
+ pid_t pid;
+ char *file = NULL;
+ int r;
+ struct timeval tv;
+ struct timezone tz;
+
+ while ((c = getopt( argc, argv, "vf:" )) != -1)
+ switch (c) {
+ case 'v': ++Verbose; break;
+ case 'f': file = optarg; break;
+ }
+
+ MD5Init( &ctx );
+
+ gettimeofday( &tv, &tz );
+ MD5Update( &ctx, (unsigned char *)&tv, sizeof( tv ) );
+ pid = getppid();
+ MD5Update( &ctx, (unsigned char *)&pid, sizeof( pid ));
+ pid = getpid();
+ MD5Update( &ctx, (unsigned char *)&pid, sizeof( pid ));
+
+ if (file) {
+ int count = 0;
+
+ if (file[0] == '-' && !file[1])
+ fd = fileno(stdin);
+ else
+ fd = open( file, O_RDONLY );
+
+ if (fd < 0) {
+ fprintf( stderr, "Could not open %s\n", file );
+ } else {
+ count = hash_file( &ctx, fd );
+ if (Verbose)
+ fprintf( stderr, "Got %d bytes from %s\n", count, file );
+
+ if (file[0] != '-' || file[1]) close( fd );
+ }
+ }
+
+ for (i = 0; i < RNGS; i++) {
+ if ((fd = open( rngs[i].path, O_RDONLY|O_NONBLOCK )) >= 0) {
+ int count = sizeof(buf);
+
+ if (rngs[i].maxlength && count > rngs[i].maxlength)
+ count = rngs[i].maxlength;
+ r = read( fd, buf, count );
+ if (r > 0)
+ MD5Update( &ctx, buf, r );
+ else
+ r = 0;
+ close( fd );
+ if (Verbose)
+ fprintf( stderr, "Got %d bytes from %s\n", r, rngs[i].path );
+ if (rngs[i].minlength && r >= rngs[i].minlength)
+ break;
+ } else if (Verbose)
+ fprintf( stderr, "Could not open %s\n", rngs[i].path );
+ }
+
+ MD5Final( digest, &ctx );
+ for (i = 0; i < 16; i++) printf( "%02x", digest[i] );
+ putchar ( '\n' );
+
+ /*
+ * The following is important for cases like disk full, so shell scripts
+ * can bomb out properly rather than think they succeeded.
+ */
+ if (fflush(stdout) < 0 || fclose(stdout) < 0)
+ return 1;
+
+ return 0;
+}
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2007-01-11 08:45:28 UTC (rev 17248)
+++ trunk/buildroot/package/xorg/xorg.mk 2007-01-11 10:38:10 UTC (rev 17249)
@@ -143,8 +143,12 @@
touch -c $(XORG_LIBX)/libX11.so.6.2
+$(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c
+ $(TARGET_CROSS)gcc -Wall -Os -s package/xorg/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie
+
xorg: zlib png pkgconfig expat freetype \
- $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
+ $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 \
+ $(XORG_LIBX)/libX11.so.6.2 $(TARGET_DIR)/usr/bin/mcookie
xorg-source: $(DL_DIR)/$(XORG_SOURCE)
^ permalink raw reply [flat|nested] 16+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2007-01-15 22:33 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-15 22:33 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-15 14:33:55 -0800 (Mon, 15 Jan 2007)
New Revision: 17318
Log:
update xorg build a bit more, trim the default set of bitmapped
fonts, add in the DejaVu line of unicode supporting truetype fonts
Added:
trunk/buildroot/package/xorg/Xserver
trunk/buildroot/package/xorg/Xsession
trunk/buildroot/package/xorg/fonts.alias
trunk/buildroot/package/xorg/fonts.cache-1
Modified:
trunk/buildroot/package/xorg/xorg.conf
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Added: trunk/buildroot/package/xorg/Xserver
===================================================================
--- trunk/buildroot/package/xorg/Xserver (rev 0)
+++ trunk/buildroot/package/xorg/Xserver 2007-01-15 22:33:55 UTC (rev 17318)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X11/X -br dpms nologo -nolisten tcp
Property changes on: trunk/buildroot/package/xorg/Xserver
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/buildroot/package/xorg/Xsession
===================================================================
--- trunk/buildroot/package/xorg/Xsession (rev 0)
+++ trunk/buildroot/package/xorg/Xsession 2007-01-15 22:33:55 UTC (rev 17318)
@@ -0,0 +1,5 @@
+#!/bin/sh
+export GDK_USE_XFT=1
+export LANG="en_US.UTF-8"
+export LC_ALL="en_US.UTF-8"
+/usr/bin/X11/rxvt -bg black -fg gray90
Property changes on: trunk/buildroot/package/xorg/Xsession
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/buildroot/package/xorg/fonts.alias
===================================================================
--- trunk/buildroot/package/xorg/fonts.alias (rev 0)
+++ trunk/buildroot/package/xorg/fonts.alias 2007-01-15 22:33:55 UTC (rev 17318)
@@ -0,0 +1,6 @@
+fixed -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
+7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+7x14bold -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
+
+-misc-fixed-medium-r-normal--14-110-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
Added: trunk/buildroot/package/xorg/fonts.cache-1
===================================================================
--- trunk/buildroot/package/xorg/fonts.cache-1 (rev 0)
+++ trunk/buildroot/package/xorg/fonts.cache-1 2007-01-15 22:33:55 UTC (rev 17318)
@@ -0,0 +1,12 @@
+"DejaVuSans-BoldOblique.ttf" 0 "DejaVu Sans:familylang=en:style=Bold Oblique:stylelang=en:slant=110:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4w}6a;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;) !!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~ !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1% !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7) !!#GN|>]fO|>^+~Ow1gH|>^0~{~h at FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP !)n<!!!!?+!!#PQ!!%|B q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1 !!+Wr&0h?q P0oWR !!+u{!ANVJ !!.%! /?6HG:lang=aa|ab|af|ast|ava|ay|az|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSans-Bold.ttf" 0 "DejaVu Sans:familylang=en:style=Bold:stylelang=en:slant=0:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4xpki;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;) !!!7)Rim;3$WUr)#F+zm{ao04!FFpNQNVtK!!$qe#?3E%!!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~ !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1% !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7) !!#GN|>]fO|>^+~Ow1gH|>^0~{~h at FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP !)n<!!!!?+!!#PQ!!%|B q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1 !!+Wr&0h?q P0oWR !!+u{!ANVJ |>6r||>^1!gm&i! #xw^)w0TUs!!+~~ |9.n]|>^1!|>^1!|>^1!ZK#{t!!.%! /?6HG:lang=aa|ab|af|ar|ast|ava|ay|az|az-ir|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fa|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|ku-ir|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|ug|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSans-Oblique.ttf" 0 "DejaVu Sans:familylang=en:style=Oblique:stylelang=en:slant=110:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4wUxZ;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;) !!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~ !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1% !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7) !!#GN|>]fO|>^+~Ow1gH|>^0~{~h at FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP !)n<!!!!?+!!#PQ!!%|B q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1 !!+Wr&0h?q P0oWR !!+u{!ANVJ !!.%! /?6HG:lang=aa|ab|af|ast|ava|ay|az|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSans.ttf" 0 "DejaVu Sans:familylang=en:style=Book:stylelang=en:slant=0:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4xpki;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;) !!!7)Rim;3$WUr)#F+zm{ao04!FFpNQNVtK!!$qe#?3E%!!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~ !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1% !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7) !!#GN|>]fO|>^+~Ow1gH|>^0~{~h at FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP !)n<!!!!?+!!#PQ!!%|B q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1 !!+Wr&0h?q P0oWR !!+u{!ANVJ |>6r||>^1!gm&i! #xw^)w0TUs!!+~~ |9.n]|>^1!|>^1!|>^1!ZK#{t!!.%! /?6HG:lang=aa|ab|af|ar|ast|ava|ay|az|az-ir|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fa|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|ku-ir|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|ug|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSansMono-Bold.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Bold:stylelang=en:slant=0:weight=200:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R !!#3H!)rmR!!!Kz|<lWx !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!{{K.!|>^1!|>^1!/?+uU!!!!% !!#GN {}$35|>T(~ !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !!!!G !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSansMono-BoldOblique.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Bold Oblique:stylelang=en:slant=110:weight=200:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R !!#3H!)rmR!!!Kz|<lWx !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !!!!G !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSansMono-Oblique.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Oblique:stylelang=en:slant=110:weight=80:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R !!#3H!)rmR!!!Kz|<lWx !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !!!!G !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSansMono.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Book:stylelang=en:slant=0:weight=80:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R !!#3H!)rmR!!!Kz|<lWx !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#DM|>^1!{{K.!|>^1!|>^1!/?+uU!!!!% !!#GN {}$35P0fQP !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !!!!G !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSerif-Bold.ttf" 0 "DejaVu Serif:familylang=en:style=Bold:stylelang=en:slant=0:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R# !!#3H!)rmR!!!Kz|<lWx !#Z(4 !!#6Is|M]|!!!Ue!!!%2!!!!Z !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !#x>Y !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSerif-BoldOblique.ttf" 0 "DejaVu Serif:familylang=en:style=Bold Oblique:stylelang=en:slant=110:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R# !!#3H!)rmR!!!Kz|<lWx !#Z(4 !!#6Is|M]|!!!Ue!!!%2!!!!Z !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !#x?D !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSerif-Oblique.ttf" 0 "DejaVu Serif:familylang=en:style=Oblique:stylelang=en:slant=110:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R# !!#3H!)rmR!!!Kz|<lWx !#Z(4 !!#6Is|M]|!!!Ue!!!%2!!!!Z !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !#x?D !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
+"DejaVuSerif.ttf" 0 "DejaVu Serif:familylang=en:style=Book:stylelang=en:slant=0:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M at P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R# !!#3H!)rmR!!!Kz|<lWx !#Z(4 !!#6Is|M]|!!!Ue!!!%2!!!!Z !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !#x>Y !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
Modified: trunk/buildroot/package/xorg/xorg.conf
===================================================================
--- trunk/buildroot/package/xorg/xorg.conf 2007-01-15 21:28:15 UTC (rev 17317)
+++ trunk/buildroot/package/xorg/xorg.conf 2007-01-15 22:33:55 UTC (rev 17318)
@@ -100,6 +100,7 @@
Option "StandbyTime" "15"
Option "SuspendTime" "20"
Option "OffTime" "30"
+ Option "AllowMouseOpenFail" "true"
EndSection
Section "ServerLayout"
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2007-01-15 21:28:15 UTC (rev 17317)
+++ trunk/buildroot/package/xorg/xorg.mk 2007-01-15 22:33:55 UTC (rev 17318)
@@ -12,8 +12,8 @@
mkfontscale/mkfontscale mkfontdir/mkfontdir \
#xterm/xterm
-XORG_LIBS:= Xft Xrender Xaw Xmu Xt \
- SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc
+XORG_LIBS:= Xft Xrender Xaw Xmu Xt Xcursor Xrandr Xi Xinerama Xfixes \
+ SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc fontenc
#############################################################
@@ -36,6 +36,13 @@
XORG_CF:=$(XORG_DIR)/config/cf/cross.def
XORG_HOST_DEF:=$(XORG_DIR)/config/cf/host.def
+
+DEJAVU_VERSION=2.13
+DEJAVU_SOURCE=dejavu-ttf-$(DEJAVU_VERSION).tar.bz2
+DEJAVU_CAT:=$(BZCAT)
+DEJAVU_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/dejavu
+DEJAVU_DIR:=$(BUILD_DIR)/dejavu-ttf-$(DEJAVU_VERSION)
+
# Install Xorg xserver
XSERVER:=Xorg
XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER)
@@ -126,15 +133,46 @@
cp -LRf $(XORG_DIR)/exports/lib/modules/ $(XORG_LIBX)/
( cd $(XORG_DIR)/fonts ; $(MAKE) \
DESTDIR=$(TARGET_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
- cp -LRf $(XORG_DIR)/fonts/bdf/misc/*.bdf $(XORG_LIBX)/X11/fonts/misc/
+ cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14.bdf $(XORG_LIBX)/X11/fonts/misc/
+ cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14-L1.bdf $(XORG_LIBX)/X11/fonts/misc/
+ cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14B.bdf $(XORG_LIBX)/X11/fonts/misc/
+ cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14B-L1.bdf $(XORG_LIBX)/X11/fonts/misc/
+ cp -LRf $(XORG_DIR)/fonts/bdf/misc/cursor.bdf $(XORG_LIBX)/X11/fonts/misc/
+ cp -f package/xorg/fonts.alias $(XORG_LIBX)/X11/fonts/misc/
( cd $(XORG_LIBX)/X11/fonts/misc/; mkfontdir )
(cd $(TARGET_DIR)/usr/bin; ln -snf $(TARGET_BINX) X11)
mkdir -p $(TARGET_DIR)/etc/X11/
- cp package/xorg/xorg.conf $(TARGET_DIR)/etc/X11/
- cp -a $(STAGING_DIR)$(TARGET_LIBX)/X11/rgb* $(XORG_LIBX)/X11/
+ cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/rgb* $(XORG_LIBX)/X11/
+ $(SED) "s,^sysclientrc=.*,sysclientrc=/etc/X11/Xsession,g" $(XORG_BINX)/startx
+ $(SED) "s,^sysserverrc=.*,sysserverrc=/etc/X11/Xserver,g" $(XORG_BINX)/startx
+ cp -LRf package/xorg/xorg.conf $(TARGET_DIR)/etc/X11/
+ cp -LRf package/xorg/Xsession $(TARGET_DIR)/etc/X11/
+ cp -LRf package/xorg/Xserver $(TARGET_DIR)/etc/X11/
touch -c $(TARGET_XSERVER)
-$(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER)
+$(DL_DIR)/$(DEJAVU_SOURCE):
+ $(WGET) -P $(DL_DIR) $(DEJAVU_SITE)/$(DEJAVU_SOURCE)
+
+$(DEJAVU_DIR)/.unpacked: $(DL_DIR)/$(DEJAVU_SOURCE)
+ $(DEJAVU_CAT) $(DL_DIR)/$(DEJAVU_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $(DEJAVU_DIR)/.unpacked
+
+$(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf: $(DEJAVU_DIR)/.unpacked
+ mkdir -p $(XORG_LIBX)/X11/fonts/ttf-dejavu
+ rm $(DEJAVU_DIR)/*Condensed*.ttf
+ rm $(DEJAVU_DIR)/*ExtraLight*.ttf
+ cp -LRf $(DEJAVU_DIR)/DejaVu*-Bold.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
+ cp -LRf $(DEJAVU_DIR)/DejaVu*-BoldOblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
+ cp -LRf $(DEJAVU_DIR)/DejaVu*-Oblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
+ cp -LRf $(DEJAVU_DIR)/DejaVuSans.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
+ cp -LRf $(DEJAVU_DIR)/DejaVuSansMono.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
+ cp -LRf $(DEJAVU_DIR)/DejaVuSerif.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
+ cp -LRf $(DEJAVU_DIR)/DejaVuSerif.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
+ cp package/xorg/fonts.cache-1 $(XORG_LIBX)/X11/fonts/ttf-dejavu/
+ ( cd $(XORG_LIBX)/X11/fonts/ttf-dejavu/; mkfontdir )
+ touch -c $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf
+
+$(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf
-mkdir -p $(XORG_LIBX)
set -e; for dirs in $(XORG_LIBS) ; do \
file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"` ; \
@@ -150,14 +188,13 @@
fi;
touch -c $(XORG_LIBX)/libX11.so.6.2
-
$(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c
$(TARGET_CROSS)gcc -Wall -Os -s package/xorg/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie
xorg: zlib png pkgconfig expat fontconfig $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 \
$(XORG_LIBX)/libX11.so.6.2 $(TARGET_DIR)/usr/bin/mcookie
-xorg-source: $(DL_DIR)/$(XORG_SOURCE)
+xorg-source: $(DL_DIR)/$(XORG_SOURCE) $(DL_DIR)/$(DEJAVU_SOURCE)
xorg-clean:
-rm -rf $(TARGET_DIR)/usr/X11R6
^ permalink raw reply [flat|nested] 16+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2007-01-25 20:34 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-25 20:34 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-25 12:34:10 -0800 (Thu, 25 Jan 2007)
New Revision: 17519
Log:
update DejaVu fonts to the latest
Fix broken keyboard handling
Modified:
trunk/buildroot/package/xorg/Xsession
trunk/buildroot/package/xorg/xorg.conf
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/Xsession
===================================================================
--- trunk/buildroot/package/xorg/Xsession 2007-01-25 20:27:27 UTC (rev 17518)
+++ trunk/buildroot/package/xorg/Xsession 2007-01-25 20:34:10 UTC (rev 17519)
@@ -1,5 +1,4 @@
#!/bin/sh
export GDK_USE_XFT=1
export LANG="en_US.UTF-8"
-export LC_ALL="en_US.UTF-8"
/usr/bin/X11/rxvt -bg black -fg gray90
Modified: trunk/buildroot/package/xorg/xorg.conf
===================================================================
--- trunk/buildroot/package/xorg/xorg.conf 2007-01-25 20:27:27 UTC (rev 17518)
+++ trunk/buildroot/package/xorg/xorg.conf 2007-01-25 20:34:10 UTC (rev 17519)
@@ -23,17 +23,17 @@
Load "bitmap"
Load "dbe"
Load "ddc"
+ Load "extmod"
Load "freetype"
Load "int10"
+ Load "vbe"
EndSection
Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "keyboard"
- Option "XkbRules" "xfree86"
- Option "XkbModel" "pc104"
- Option "XkbLayout" "us"
- Option "XkbOptions" "altwin:meta_win"
+ Identifier "Generic Keyboard"
+ Driver "kbd"
+ Option "CoreKeyboard"
+ Option "XkbLayout" "en_US"
EndSection
Section "InputDevice"
@@ -56,9 +56,10 @@
Section "Device"
Identifier "Generic VGA Card"
- Driver "vesa"
+ #Driver "vesa"
#Driver "vga"
- #Driver "fbdev"
+ Driver "fbdev"
+ Option "UseFBDev" "True"
EndSection
Section "Monitor"
@@ -72,26 +73,26 @@
Identifier "Default Screen"
Device "Generic VGA Card"
Monitor "Generic Monitor"
- DefaultDepth 8
+ #DefaultDepth 8
SubSection "Display"
Viewport 0 0
Depth 4
- Modes "640x480"
+ #Modes "640x480"
EndSubSection
SubSection "Display"
Viewport 0 0
Depth 8
- Modes "640x480"
+ #Modes "640x480"
EndSubSection
SubSection "Display"
Viewport 0 0
Depth 16
- Modes "640x480"
+ #Modes "640x480"
EndSubSection
SubSection "Display"
Viewport 0 0
Depth 24
- Modes "640x480"
+ #Modes "640x480"
EndSubSection
EndSection
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2007-01-25 20:27:27 UTC (rev 17518)
+++ trunk/buildroot/package/xorg/xorg.mk 2007-01-25 20:34:10 UTC (rev 17519)
@@ -10,10 +10,10 @@
XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap xinit/startx \
xauth/xauth xinit/xinit xsetroot/xsetroot xset/xset \
mkfontscale/mkfontscale mkfontdir/mkfontdir \
- #xterm/xterm
+ setxkbmap/setxkbmap #xterm/xterm
XORG_LIBS:= Xft Xrender Xaw Xmu Xt Xcursor Xrandr Xi Xinerama Xfixes \
- SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc fontenc
+ SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc fontenc xkbfile
#############################################################
@@ -37,7 +37,7 @@
XORG_HOST_DEF:=$(XORG_DIR)/config/cf/host.def
-DEJAVU_VERSION=2.13
+DEJAVU_VERSION=2.14
DEJAVU_SOURCE=dejavu-ttf-$(DEJAVU_VERSION).tar.bz2
DEJAVU_CAT:=$(BZCAT)
DEJAVU_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/dejavu
@@ -140,9 +140,22 @@
cp -LRf $(XORG_DIR)/fonts/bdf/misc/cursor.bdf $(XORG_LIBX)/X11/fonts/misc/
cp -f package/xorg/fonts.alias $(XORG_LIBX)/X11/fonts/misc/
( cd $(XORG_LIBX)/X11/fonts/misc/; mkfontdir )
+ rm -rf $(XORG_LIBX)/X11/fonts/100dpi
+ rm -rf $(XORG_LIBX)/X11/fonts/75dpi
+ rm -rf $(XORG_LIBX)/X11/fonts/cyrillic
+ rm -rf $(XORG_LIBX)/X11/fonts/local
(cd $(TARGET_DIR)/usr/bin; ln -snf $(TARGET_BINX) X11)
+ cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/xkb $(XORG_LIBX)/X11/
+ mv $(XORG_LIBX)/X11/xkb/xkbcomp $(XORG_BINX)/
+ (cd $(XORG_LIBX)/X11/xkb; ln -s ../../../bin/xkbcomp)
+ rm -rf $(XORG_LIBX)/X11/xkb/compiled
+ (cd $(XORG_LIBX)/X11/xkb; ln -s /tmp compiled)
+ cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/icons $(XORG_LIBX)/X11/
+ -cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/locale $(XORG_LIBX)/X11/
+ cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/rgb.txt $(XORG_LIBX)/X11/
+ cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/XKeysymDB $(XORG_LIBX)/X11/
+ cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/XErrorDB $(XORG_LIBX)/X11/
mkdir -p $(TARGET_DIR)/etc/X11/
- cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/rgb* $(XORG_LIBX)/X11/
$(SED) "s,^sysclientrc=.*,sysclientrc=/etc/X11/Xsession,g" $(XORG_BINX)/startx
$(SED) "s,^sysserverrc=.*,sysserverrc=/etc/X11/Xserver,g" $(XORG_BINX)/startx
cp -LRf package/xorg/xorg.conf $(TARGET_DIR)/etc/X11/
@@ -159,8 +172,8 @@
$(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf: $(DEJAVU_DIR)/.unpacked
mkdir -p $(XORG_LIBX)/X11/fonts/ttf-dejavu
- rm $(DEJAVU_DIR)/*Condensed*.ttf
- rm $(DEJAVU_DIR)/*ExtraLight*.ttf
+ rm -f $(DEJAVU_DIR)/*Condensed*.ttf
+ rm -f $(DEJAVU_DIR)/*ExtraLight*.ttf
cp -LRf $(DEJAVU_DIR)/DejaVu*-Bold.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
cp -LRf $(DEJAVU_DIR)/DejaVu*-BoldOblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
cp -LRf $(DEJAVU_DIR)/DejaVu*-Oblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2007-05-22 11:17 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2007-05-22 11:17 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-05-22 04:17:27 -0700 (Tue, 22 May 2007)
New Revision: 18667
Log:
Fixup joystick.h include with modern kernel headers. Patch from #1217.
Added:
trunk/buildroot/package/xorg/xorg-6.8.2-joystick_h.patch
Changeset:
Added: trunk/buildroot/package/xorg/xorg-6.8.2-joystick_h.patch
===================================================================
--- trunk/buildroot/package/xorg/xorg-6.8.2-joystick_h.patch (rev 0)
+++ trunk/buildroot/package/xorg/xorg-6.8.2-joystick_h.patch 2007-05-22 11:17:27 UTC (rev 18667)
@@ -0,0 +1,10 @@
+--- xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c.orig 2007-02-13 21:17:02.000000000 -0800
++++ xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c 2007-02-13 21:17:32.000000000 -0800
+@@ -1,5 +1,7 @@
+ /* $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v 1.1tsi Exp $ */
+
++#undef __STRICT_ANSI__
++
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <string.h>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2007-08-15 9:46 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-08-15 9:46 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-15 02:46:29 -0700 (Wed, 15 Aug 2007)
New Revision: 19513
Log:
Use /usr/include as std include in Xorg
Modified:
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2007-08-15 09:42:33 UTC (rev 19512)
+++ trunk/buildroot/package/xorg/xorg.mk 2007-08-15 09:46:29 UTC (rev 19513)
@@ -90,6 +90,7 @@
$(SED) 's:REPLACE_GCCINC_DIR:$(shell $(TARGET_CROSS)gcc -print-file-name=include):g' $(XORG_CF)
$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_CF)
$(SED) 's:REPLACE_ARCH:$(ARCH):g' $(XORG_CF)
+ $(SED) 's:#define StdIncDir.*:#define StdIncDir $(STAGING_DIR)/usr/include:g' $(XORG_CF)
$(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(XORG_CF)
$(SED) 's:#define RanlibCmd.*:#define RanlibCmd $(TARGET_CROSS)ranlib:g' $(XORG_CF)
$(SED) 's:#define LdCmd.*:#define LdCmd $(TARGET_CROSS)ld:g' $(XORG_CF)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/xorg
@ 2008-03-06 18:37 ninevoltz at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:37 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 10:37:29 -0800 (Thu, 06 Mar 2008)
New Revision: 21243
Log:
deprecate xorg 6.8
Modified:
trunk/buildroot/package/xorg/Config.in
Changeset:
Modified: trunk/buildroot/package/xorg/Config.in
===================================================================
--- trunk/buildroot/package/xorg/Config.in 2008-03-06 18:36:54 UTC (rev 21242)
+++ trunk/buildroot/package/xorg/Config.in 2008-03-06 18:37:29 UTC (rev 21243)
@@ -1,4 +1,5 @@
config BR2_PACKAGE_XORG
+ depends BR2_DEPRECATED
bool "X.org X Window System"
default y if BR2_PACKAGE_XSERVER_xorg
select BR2_PACKAGE_ZLIB
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2008-03-06 18:37 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-18 2:00 [Buildroot] svn commit: trunk/buildroot/package/xorg andersen
-- strict thread matches above, loose matches on Subject: below --
2006-07-20 15:46 andersen
2006-07-20 20:29 andersen
2006-09-26 12:48 jacmet at uclibc.org
2006-09-27 18:17 jacmet at uclibc.org
2006-10-02 18:25 andersen at uclibc.org
2006-10-14 11:34 jacmet at uclibc.org
2006-11-17 23:17 andersen at uclibc.org
2007-01-10 23:56 andersen at uclibc.org
2007-01-11 6:17 andersen at uclibc.org
2007-01-11 10:38 andersen at uclibc.org
2007-01-15 22:33 andersen at uclibc.org
2007-01-25 20:34 andersen at uclibc.org
2007-05-22 11:17 jacmet at uclibc.org
2007-08-15 9:46 ulf at uclibc.org
2008-03-06 18:37 ninevoltz at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox