(#117299) Fix xorgconfig, which was producing an invalid RgbPath setting. (#117071) Attempt to fix xorgcfg. I couldn't test without /etc/X11/xorg.conf because it was producing invalid modes on my monitor, but it worked when xorg.conf was present.

(Portage version: 2.1_pre6-r3)

4 files changed, 163 insertions, 3 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 4f13499d9fd3..7947171b20ab 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.89 2006/03/21 06:16:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.90 2006/03/23 08:17:22 spyderous Exp $
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch,
+  +files/1.0.2-try-to-fix-xorgcfg.patch, xorg-server-1.0.2.ebuild:
+  (#117299) Fix xorgconfig, which was producing an invalid RgbPath setting.
+  (#117071) Attempt to fix xorgcfg. I couldn't test without /etc/X11/xorg.conf
+  because it was producing invalid modes on my monitor, but it worked when
+  xorg.conf was present.
 
 *xorg-server-1.0.2 (21 Mar 2006)
 
diff --git a/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch b/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch
new file mode 100644
index 000000000000..dd106736d26d
--- /dev/null
+++ b/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch
@@ -0,0 +1,55 @@
+Index: xorg/hw/xfree86/utils/xorgconfig/cards.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/cards.c,v
+retrieving revision 1.4
+diff -u -b -B -r1.4 cards.c
+--- xorg/hw/xfree86/utils/xorgconfig/cards.c	1 Jul 2005 22:43:35 -0000	1.4
++++ xorg/hw/xfree86/utils/xorgconfig/cards.c	23 Mar 2006 07:42:26 -0000
+@@ -19,7 +19,7 @@
+ 
+ /* Some vars to make path names in texts more flexible. */
+ #ifndef PROJECTROOT
+-# define PROJECTROOT		"/usr/X11R6"
++# define PROJECTROOT		"/usr"
+ #endif
+ #define TREEROOT		PROJECTROOT
+ #define TREEROOTLX		TREEROOT "/lib/X11"
+Index: xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v
+retrieving revision 1.19
+diff -u -b -B -r1.19 xorgconfig.c
+--- xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c	8 Nov 2005 06:33:30 -0000	1.19
++++ xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c	23 Mar 2006 07:42:28 -0000
+@@ -157,11 +157,12 @@
+  * may be more irritated than Unix users
+  */
+ #ifndef PROJECTROOT
+-#define PROJECTROOT		"/usr/X11R6"
++#define PROJECTROOT		"/usr"
+ #endif
+ #define TREEROOT		PROJECTROOT
+ #define TREEROOTLX		TREEROOT "/lib/X11"
+ #define TREEROOTCFG		TREEROOT "/etc/X11"
++#define TREEROOTSHARE		TREEROOT "/share/X11"
+ #ifdef XDOCDIR
+ # define TREEROOTDOC		XDOCDIR
+ #else
+@@ -495,7 +496,7 @@
+ #elif defined(__FreeBSD__)
+ # define DEF_MOUSEDEV "/dev/sysmouse";
+ #else
+-# define DEF_MOUSEDEV "/dev/mouse";
++# define DEF_MOUSEDEV "/dev/input/mice";
+ #endif
+ 
+ #ifndef __UNIXOS2__
+@@ -1970,7 +1971,7 @@
+ "# file minus the extension (like \".txt\" or \".db\").  There is normally\n"
+ "# no need to change the default.\n"
+ "\n"
+-"    RgbPath	\"" TREEROOTLX "/rgb\"\n"
++"#    RgbPath	\"" TREEROOTSHARE "/rgb\"\n"
+ "\n"
+ "# Multiple FontPath entries are allowed (which are concatenated together),\n"
+ "# as well as specifying multiple comma-separated entries in one FontPath\n"
diff --git a/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch b/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch
new file mode 100644
index 000000000000..288d79c2f2fc
--- /dev/null
+++ b/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch
@@ -0,0 +1,95 @@
+Index: xorg/hw/xfree86/utils/xorgcfg/interface.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/interface.c,v
+retrieving revision 1.8
+diff -u -b -B -r1.8 interface.c
+--- xorg/hw/xfree86/utils/xorgcfg/interface.c	8 Nov 2005 06:33:30 -0000	1.8
++++ xorg/hw/xfree86/utils/xorgcfg/interface.c	23 Mar 2006 07:42:49 -0000
+@@ -65,7 +65,7 @@
+ #ifdef PROJECT_ROOT
+ #define DefaultXFree86Dir	PROJECT_ROOT
+ #else
+-#define DefaultXFree86Dir	"/usr/X11R6"
++#define DefaultXFree86Dir	"/usr"
+ #endif
+ 
+ #define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0) || \
+Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c,v
+retrieving revision 1.5
+diff -u -b -B -r1.5 keyboard-cfg.c
+--- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c	8 Nov 2005 06:33:30 -0000	1.5
++++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c	23 Mar 2006 07:42:51 -0000
+@@ -72,7 +72,7 @@
+  */
+ static XF86XkbRulesDescInfo **xkb_desc, *xkb_rules;
+ static int num_xkb_desc;
+-static char *XkbRulesDir = "lib/X11/xkb/rules/";
++static char *XkbRulesDir = "share/X11/xkb/rules/";
+ #ifdef XFREE98_XKB
+ static char *XkbRulesFile = "xfree98";
+ #else
+Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h,v
+retrieving revision 1.3
+diff -u -b -B -r1.3 keyboard-cfg.h
+--- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h	4 Dec 2004 00:43:11 -0000	1.3
++++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h	23 Mar 2006 07:42:51 -0000
+@@ -38,7 +38,7 @@
+ /*
+  * All file names are from XProjectRoot or XWINHOME environment variable.
+  */
+-#define	XkbConfigDir		"lib/X11/xkb/"
++#define	XkbConfigDir		"share/X11/xkb/"
+ #define	XkbConfigFile		"X0-config.keyboard"
+ 
+ /*
+Index: xorg/hw/xfree86/utils/xorgcfg/loader.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/loader.c,v
+retrieving revision 1.5
+diff -u -b -B -r1.5 loader.c
+--- xorg/hw/xfree86/utils/xorgcfg/loader.c	8 Dec 2005 17:54:40 -0000	1.5
++++ xorg/hw/xfree86/utils/xorgcfg/loader.c	23 Mar 2006 07:42:51 -0000
+@@ -55,7 +55,7 @@
+ #include <stdarg.h>
+ 
+ #ifndef OPTIONSPATH
+-#define OPTIONSPATH "/usr/X11R6/lib/X11"
++#define OPTIONSPATH "/usr/lib/X11"
+ #endif
+ 
+ #ifndef SIGNALRETURNSINT
+Index: xorg/hw/xfree86/utils/xorgcfg/text-mode.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v
+retrieving revision 1.6
+diff -u -b -B -r1.6 text-mode.c
+--- xorg/hw/xfree86/utils/xorgcfg/text-mode.c	8 Dec 2005 17:54:40 -0000	1.6
++++ xorg/hw/xfree86/utils/xorgcfg/text-mode.c	23 Mar 2006 07:42:55 -0000
+@@ -52,12 +52,12 @@
+ 	(strcmp((X), "keyboard") == 0))
+ 
+ #ifndef PROJECT_ROOT
+-#define PROJECT_ROOT "/usr/X11R6"
++#define PROJECT_ROOT "/usr"
+ #endif
+ 
+ #ifndef XKB_RULES_DIR
+ #ifndef __UNIXOS2__
+-#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules"
++#define XKB_RULES_DIR PROJECT_ROOT "/share/X11/xkb/rules"
+ #else
+ #define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules"
+ #endif
+@@ -558,7 +558,7 @@
+ #elif defined(__UNIXOS2__)
+ 	str = "mouse$";
+ #else
+-	str = "/dev/mouse";
++	str = "/dev/input/mice";
+ #endif
+ 
+     ClearScreen();
diff --git a/x11-base/xorg-server/xorg-server-1.0.2.ebuild b/x11-base/xorg-server/xorg-server-1.0.2.ebuild
index 8842e8c30fc4..5bd380ec6aec 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2.ebuild,v 1.1 2006/03/21 06:16:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2.ebuild,v 1.2 2006/03/23 08:17:22 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -16,7 +16,9 @@ MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
 PATCHES="${FILESDIR}/${P}-Sbus.patch
-	${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch"
+	${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch
+	${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
+	${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch"
 
 SRC_URI="${SRC_URI}
 	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2"