Xautoconfig ebuild with patch by M. Guertin

4 files changed, 274 insertions, 0 deletions

diff --git a/x11-misc/Xautoconfig/Xautoconfig-0.15.ebuild b/x11-misc/Xautoconfig/Xautoconfig-0.15.ebuild
new file mode 100644
index 000000000000..613161491837
--- /dev/null
+++ b/x11-misc/Xautoconfig/Xautoconfig-0.15.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author David Chamberlain <daybird@gentoo.org>
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Xautoconfig is a PPC only config file generator for xfree86"
+SRC_URI="http://ftp.penguinppc.org/projects/xautocfg/${P}.tar.gz"
+HOMEPAGE="http://ftp.penguinppc.org/projects/xautocfg/"
+
+DEPEND=""
+
+if [ ${ARCH} != ppc ]
+then 
+	die "This is a PPC-only package"
+fi
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/Xautoconfig-0.15.diff || die
+	cp ${FILESDIR}/XF4text.h ./
+}
+
+src_compile() {
+
+	make || die "sorry, failed to compile Xautoconfig (PPC-only ebuild)"
+}
+
+src_install() {
+	
+	dodir /usr/X11R6/
+	into /usr/X11R6/
+	dobin Xautoconfig4
+
+	dodoc ChangeLog
+
+}
diff --git a/x11-misc/Xautoconfig/files/XF4text.h b/x11-misc/Xautoconfig/files/XF4text.h
new file mode 100644
index 000000000000..dfa2ae78da74
--- /dev/null
+++ b/x11-misc/Xautoconfig/files/XF4text.h
@@ -0,0 +1,153 @@
+/* This file hold the various bits of the config file for XFree86 4.0.0+ */
+
+static char *MainChunk_text =
+"# File generated by Xautoconfig4.\n"
+"Section \"ServerLayout\"\n"
+"	Identifier	\"XFree86 Configured\"\n"
+"	Screen		0  \"Screen0\" 0 0\n"
+"	InputDevice	\"Mouse0\" \"CorePointer\"\n"
+"	InputDevice	\"Keyboard0\" \"CoreKeyboard\"\n"
+"EndSection\n"
+"\n"
+"Section \"Files\"\n"
+"# The location of the RGB database.  Note, this is the name of the\n"
+"# file minus the extension (like \".txt\" or \".db\").  There is normally\n"
+"# no need to change the default.\n"
+"\n"
+"	RgbPath	\"/usr/X11R6/lib/X11/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"
+"# command (or a combination of both methods)\n"
+"\n"
+"	FontPath	\"unix/:7100\"\n"
+"	FontPath	\"unix/:-1\"\n"
+"	# If X can't find it's default font, try uncommenting these:\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/local/\"\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/misc/\"\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/truetype/\"\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/75dpi/:unscaled\"\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/100dpi/:unscaled\"\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/Type1/\"\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/CID/\"\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/Speedo/\"\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/75dpi/\"\n"
+"	FontPath	\"/usr/X11R6/lib/X11/fonts/100dpi/\"\n"
+"\n"
+"# ModulePath can be used to set a search path for the X server modules.\n"
+"# The default path is shown here.\n"
+"\n"
+"#	ModulePath	\"/usr/X11R6/lib/modules\"\n"
+"\n"
+"EndSection\n"
+"\n"
+"Section \"Module\"\n"
+"	Load	\"GLcore\"\n"
+"	Load	\"dbe\"\n"
+"	Load	\"extmod\"\n"
+"	Load	\"glx\"\n"
+"	Load	\"pex5\"\n"
+"	Load	\"record\"\n"
+"	Load	\"xie\"\n"
+"	Load	\"bitmap\"\n"
+"	Load	\"type1\"\n"
+"	Load	\"speedo\"\n"
+"	Load	\"freetype\"\n"
+"	# Uncomment for Video4Linux support\n"
+"	#Load	\"v4l\"\n"
+"EndSection\n"
+"\n"
+"Section \"InputDevice\"\n"
+"	Identifier	\"Keyboard0\"\n"
+"	Driver		\"keyboard\"\n";
+
+static char *keyboard_adb =
+"	Option		\"CustomKeycodes\"\n"
+"	Option		\"XkbModel\"	\"macintosh_old\"\n"
+"	Option		\"XkbLayout\"	\"us\"\n";
+
+static char *keyboard_adbcom =
+"# Uncomment this if your keyboard no longer works in X and you belive you are\n"
+"# using the depreciated adb keycodes\n"
+"	#Option		\"CustomKeycodes\"\n"
+"	#Option		\"XkbModel\"	\"macintosh_old\"\n"
+"	#Option		\"XkbLayout\"	\"us\"\n";
+
+/* Uncomment/fix this for APUS support
+static char *keyboardsection_powerpc_amiga =
+"   XkbKeycodes	\"amiga\"\n"
+"   XkbTypes	\"default\"\n"
+"   XkbCompat	\"default\"\n"
+"   XkbSymbols	\"amiga\"\n" 
+"   XkbGeometry	\"amiga\"\n"
+"   XkbRules	\"xfree86\"\n"
+"   XkbModel	\"pc101\"\n"
+"EndSection\n\n"
+"";
+*/
+
+static char *mouse_section = 
+"Section \"InputDevice\"\n"
+"	Identifier	\"Mouse0\"\n"
+"	Driver   	\"mouse\"\n"
+"	Option   	\"ZAxisMapping\"	\"4 5\"\n"
+"	Option   	\"Protocol\"	\"";
+
+static char *monitor_section =
+"EndSection\n"
+"\n"
+"Section \"Monitor\"\n"
+"	Identifier	\"Monitor0\"\n"
+"	UseModes	\"Modes0\"\n"
+"	ModelName	\"Monitor Model\"\n"
+"	Option		\"DPMS\"\n";
+
+static char *modes_section =
+"EndSection\n\n"
+"Section \"Modes\"\n"
+"	Identifier	\"Modes0\"\n"
+"\n"
+"	# Apple iMac modes\n"
+"	Modeline \"1024x768\"   78.525 1024 1049 1145 1312   768  769  772  800 +hsync +vsync\n"
+"	Modeline \"800x600\"    62.357  800  821  901 1040   600  601  604  632 +hsync +vsync\n"
+"	Modeline \"640x480\"    49.886  640  661  725  832   480  481  484  514 +hsync +vsync\n"
+"	# Apple monitors tend to do 832x624\n"
+"	Modeline \"832x624\"    57      832  876  940 1152   624  625  628  667 -hsync -vsync\n"
+"	# Apple PowerBook G3\n"
+"	Modeline \"800x600\"    100     800  816  824  840   600  616  624  640 -hsync -vsync\n"
+"	# Generated\n";
+
+static char *device_start =
+"\n"
+"EndSection\n"
+"Section \"Device\"\n"
+"	Identifier	\"Card0\"\n";
+
+static char *driver_on_opts =
+"	### Available Driver options are:-\n"
+"	#Option	\"SWcursor\"\n"
+"	Option	\"HWcursor\"\n"
+"	#Option	\"PciRetry\"\n"
+"	#Option	\"NoAccel\"\n"
+"	#Option	\"ShadowFB\"	\"true\"\n"
+"	Option	\"UseFBDev\"\n";
+
+
+
+static char *driver_off_opts =
+"	### Available Driver options are:-\n"
+"	#Option	\"SWcursor\"\n"
+"	#Option	\"HWcursor\"\n"
+"	#Option	\"PciRetry\"\n"
+"	#Option	\"NoAccel\"\n"
+"	#Option	\"ShadowFB\"	\"true\"\n"
+"	#Option	\"UseFBDev\"\n";
+
+static char *screen_section =
+"EndSection\n"
+"\n"
+"Section \"Screen\"\n"
+"	Identifier	\"Screen0\"\n"
+"	Device		\"Card0\"\n"
+"	Monitor		\"Monitor0\"\n"
+"	DefaultDepth	";
diff --git a/x11-misc/Xautoconfig/files/Xautoconfig-0.15.diff b/x11-misc/Xautoconfig/files/Xautoconfig-0.15.diff
new file mode 100644
index 000000000000..be52a201a7e3
--- /dev/null
+++ b/x11-misc/Xautoconfig/files/Xautoconfig-0.15.diff
@@ -0,0 +1,82 @@
+diff -uNr Xautoconfig-0.15.orig/Xautoconfig4.c Xautoconfig-0.15/Xautoconfig4.c
+--- Xautoconfig-0.15.orig/Xautoconfig4.c	Mon Feb 25 06:10:18 2002
++++ Xautoconfig-0.15/Xautoconfig4.c	Tue May  7 11:19:14 2002
+@@ -13,12 +13,12 @@
+ 
+ extern int bus, dev, func;
+ extern void findVideoDevice(void);
+-extern int checkKernelVer(), checkRedHat();
++extern int checkKernelVer(), checkRedHat(), checkMouseType();
+ extern int readMouseConfigFile(), readKBDConfigFile();
+ 
+ int main() {
+ 	FILE * f;
+-	int i, depth, fh, r, rc = 0;
++	int i, depth, fh, r, rc = 0, m;
+ 	unsigned int xsstart, xsend, xtotal = 0;
+ 	unsigned int ysstart, ysend, ytotal = 0;
+ 	double drate, vrate, hrate;
+@@ -81,7 +81,7 @@
+ 		depth = var.red.length+var.green.length+var.blue.length;
+ 
+ 	r = checkRedHat(); /* See if we're on a RedHat-like system */
+-	if(inputMess <= 3)
++	if(inputMess <= 3 && r == 1)
+ 		(int) mouse = readMouseConfigFile(&mouse);
+ 	else if (!r) {
+ 		fprintf(stdout, "You don't seem to be running on a RedHat");
+@@ -97,7 +97,11 @@
+ 
+         /* Let's be nice and backup an existing XF86Config */
+         if ((f = fopen("/etc/X11/XF86Config-4", "r"))) {
+-		system("mv /etc/X11/XF86Config /etc/X11/XF86Config-4.xautoconfig");
++		system("mv /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.xautoconfig");
++        }
++        
++	if ((f = fopen("/etc/X11/XF86Config", "r"))) {
++		system("mv /etc/X11/XF86Config /etc/X11/XF86Config.xautoconfig");
+         }
+ 
+ 	if (!(f = fopen("/etc/X11/XF86Config-4", "w"))) {
+@@ -116,8 +120,13 @@
+ 		fprintf(f, "%s\"\n", mouse);
+ 	else
+ 		fprintf(f, "IMPS/2\"\n");
+-	fprintf(f, "	Option		\"Device\"	\"/dev/mouse\"\n");
+-
++	
++	m = checkMouseType(); /* check for input layer, if none fallback to std mouse */
++	if (!m)
++		fprintf(f, "	Option		\"Device\"	\"/dev/mouse\"\n");
++	else 
++		fprintf(f, "	Option		\"Device\"	\"/dev/input/mice\"\n");
++		
+ 	/* Begin monitor */
+ 	fprintf(f, "%s", monitor_section);
+ 	/* Set a sane HorizSync / VertRefresh.  This is borred from dexter */
+diff -uNr Xautoconfig-0.15.orig/misc.c Xautoconfig-0.15/misc.c
+--- Xautoconfig-0.15.orig/misc.c	Wed Dec 27 23:40:21 2000
++++ Xautoconfig-0.15/misc.c	Tue May  7 11:18:25 2002
+@@ -27,7 +27,7 @@
+ /* to promote the sale, use or other dealings in this Software without prior */
+ /* written authorization from the XFree86 Project.*/
+ 
+-/* This file contains the routines needed for reasing /etc/sysconfig/{mouse,keyboard}
++/* This file contains the routines needed for reading /etc/sysconfig/{mouse,keyboard}
+  * and are taken from Xconfigurator 4.2.4, or so.
+  * It also contains functions to check the running kernel version. */
+ 
+@@ -203,3 +203,13 @@
+ 	}
+ 	return (int) *keyboardtype;
+ }
++
++int checkMouseType() {
++	FILE * m;
++	int result = 0;
++	/* check to see if /dev/input/mice exists */
++	if ((m = fopen("/dev/input/mice", "r")))
++		result = 1;
++
++	return result;
++}
diff --git a/x11-misc/Xautoconfig/files/digest-Xautoconfig-0.15 b/x11-misc/Xautoconfig/files/digest-Xautoconfig-0.15
new file mode 100644
index 000000000000..c58eade43fbc
--- /dev/null
+++ b/x11-misc/Xautoconfig/files/digest-Xautoconfig-0.15
@@ -0,0 +1 @@
+MD5 6daf5bb2fc1d7bc378e9686399b1c259 Xautoconfig-0.15.tar.gz 18739