debian/changelog | 10 ++++++++-
debian/patches/10_dont_look_in_home_for_config.diff | 8 ++++---
debian/patches/13_debian_add_xkbpath_env_variable.diff | 10 ++++-----
debian/patches/21_glx_align_fixes.patch | 18 ++++++++---------
debian/patches/series | 1
5 files changed, 29 insertions(+), 18 deletions(-)
New commits:
commit 247dd7f244924a677d150e4e95330ea843e42381
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Thu Aug 16 22:50:20 2007 -0400
Add 03_auto_load_driver.diff.
This patch allows the server to select a driver and automatically create a
Devices section when none is specified in your xorg.conf. It chooses the
driver based on a set of PCI ID's that the driver itself provides in
/usr/share/xserver-xorg/pci. If no driver claims the PCI ID of your
primary video card, then it will choose a fallback based on your system.
Also clean up patch fuzz in the rest of the patch stack.
diff --git a/debian/changelog b/debian/changelog
index 5896eeb..04ca397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,7 +62,15 @@ xorg-server (2:1.3.99.0-1) UNRELEASED; urgency=low
[ Drew Parsons ]
* Update Xprint build to include pixman.
- -- Julien Cristau <[EMAIL PROTECTED]> Sat, 11 Aug 2007 18:37:57 +0200
+ [ David Nusinow ]
+ * Add 03_auto_load_driver.diff. This patch allows the server to select a
+ driver and automatically create a Devices section when none is specified
+ in your xorg.conf. It chooses the driver based on a set of PCI ID's that
+ the driver itself provides in /usr/share/xserver-xorg/pci. If no driver
+ claims the PCI ID of your primary video card, then it will choose a
+ fallback based on your system.
+
+ -- David Nusinow <[EMAIL PROTECTED]> Thu, 16 Aug 2007 22:47:49 -0400
xorg-server (2:1.3.0.0.dfsg-12) unstable; urgency=low
diff --git a/debian/patches/10_dont_look_in_home_for_config.diff
b/debian/patches/10_dont_look_in_home_for_config.diff
index a4b0b46..5b27e7f 100644
--- a/debian/patches/10_dont_look_in_home_for_config.diff
+++ b/debian/patches/10_dont_look_in_home_for_config.diff
@@ -1,6 +1,8 @@
---- hw/xfree86/common/xf86Config.c.orig 2006-03-11 20:19:59.000000000
+0200
-+++ hw/xfree86/common/xf86Config.c 2006-03-11 20:20:04.000000000 +0200
-@@ -98,7 +98,6 @@
+Index: hw/xfree86/common/xf86Config.c
+===================================================================
+--- hw/xfree86/common/xf86Config.c.orig 2007-08-16 22:47:18.000000000
-0400
++++ hw/xfree86/common/xf86Config.c 2007-08-16 22:47:21.000000000 -0400
+@@ -92,7 +92,6 @@
"/etc/X11/%R," "%P/etc/X11/%R," \
"%E," "%F," \
"/etc/X11/%F," "%P/etc/X11/%F," \
diff --git a/debian/patches/13_debian_add_xkbpath_env_variable.diff
b/debian/patches/13_debian_add_xkbpath_env_variable.diff
index 2a2ebd8..5028e64 100644
--- a/debian/patches/13_debian_add_xkbpath_env_variable.diff
+++ b/debian/patches/13_debian_add_xkbpath_env_variable.diff
@@ -1,7 +1,7 @@
Index: xorg-server/xkb/xkbInit.c
===================================================================
---- xorg-server.orig/xkb/xkbInit.c 2007-05-28 22:09:34.000000000 -0400
-+++ xorg-server/xkb/xkbInit.c 2007-05-28 22:09:39.000000000 -0400
+--- xorg-server.orig/xkb/xkbInit.c 2007-08-16 22:37:00.000000000 -0400
++++ xorg-server/xkb/xkbInit.c 2007-08-16 22:47:28.000000000 -0400
@@ -835,6 +835,14 @@
extern unsigned char XkbDfltAccessXOptions;
@@ -19,9 +19,9 @@ Index: xorg-server/xkb/xkbInit.c
if (strcmp(argv[i],"-kb")==0) {
Index: xorg-server/os/utils.c
===================================================================
---- xorg-server.orig/os/utils.c 2007-05-28 22:09:34.000000000 -0400
-+++ xorg-server/os/utils.c 2007-05-28 22:09:39.000000000 -0400
-@@ -701,6 +701,7 @@
+--- xorg-server.orig/os/utils.c 2007-08-16 22:37:00.000000000 -0400
++++ xorg-server/os/utils.c 2007-08-16 22:47:28.000000000 -0400
+@@ -683,6 +683,7 @@
*/
void InitGlobals(void)
{
diff --git a/debian/patches/21_glx_align_fixes.patch
b/debian/patches/21_glx_align_fixes.patch
index 35d1fd9..6c3331c 100644
--- a/debian/patches/21_glx_align_fixes.patch
+++ b/debian/patches/21_glx_align_fixes.patch
@@ -1,7 +1,7 @@
Index: xorg-server/GL/glx/Makefile.am
===================================================================
---- xorg-server.orig/GL/glx/Makefile.am 2007-05-23 18:05:09.000000000
+0200
-+++ xorg-server/GL/glx/Makefile.am 2007-05-23 18:05:28.000000000 +0200
+--- xorg-server.orig/GL/glx/Makefile.am 2007-08-16 22:36:59.000000000
-0400
++++ xorg-server/GL/glx/Makefile.am 2007-08-16 22:47:32.000000000 -0400
@@ -14,7 +14,8 @@
[EMAIL PROTECTED]@/src/mesa/glapi \
[EMAIL PROTECTED]@/src/mesa/main \
@@ -14,9 +14,9 @@ Index: xorg-server/GL/glx/Makefile.am
#sdk_HEADERS =
Index: xorg-server/configure.ac
===================================================================
---- xorg-server.orig/configure.ac 2007-05-23 18:02:13.000000000 +0200
-+++ xorg-server/configure.ac 2007-05-23 18:05:15.000000000 +0200
-@@ -273,6 +273,7 @@
+--- xorg-server.orig/configure.ac 2007-08-16 22:46:38.000000000 -0400
++++ xorg-server/configure.ac 2007-08-16 22:47:32.000000000 -0400
+@@ -276,6 +276,7 @@
case $host_os in
*netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha
IO]) ;;
esac
@@ -24,7 +24,7 @@ Index: xorg-server/configure.ac
;;
arm*)
ARM_VIDEO=yes
-@@ -302,6 +303,7 @@
+@@ -305,6 +306,7 @@
xorg_loader_sparcmuldiv="yes"
SPARC64_VIDEO=yes
BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
@@ -32,7 +32,7 @@ Index: xorg-server/configure.ac
;;
x86_64*|amd64*)
use_x86_asm="yes"
-@@ -316,8 +318,16 @@
+@@ -319,8 +321,16 @@
SYS_LIBS=-lamd64
;;
esac
@@ -51,8 +51,8 @@ Index: xorg-server/configure.ac
AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
Index: xorg-server/hw/dmx/glxProxy/Makefile.am
===================================================================
---- xorg-server.orig/hw/dmx/glxProxy/Makefile.am 2007-05-23
17:22:18.000000000 +0200
-+++ xorg-server/hw/dmx/glxProxy/Makefile.am 2007-05-23 18:06:28.000000000
+0200
+--- xorg-server.orig/hw/dmx/glxProxy/Makefile.am 2007-08-04
18:25:15.000000000 -0400
++++ xorg-server/hw/dmx/glxProxy/Makefile.am 2007-08-16 22:47:32.000000000
-0400
@@ -32,6 +32,7 @@
unpack.h
diff --git a/debian/patches/series b/debian/patches/series
index 49fc04a..95b31a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
001_ubuntu_add_extra_modelines_from_xorg.patch -p1
02_libvgahw_gcc4_volatile_fix.diff
+03_auto_load_driver.diff
06_use_proc_instead_of_sysfs_for_pci_domains.diff
10_dont_look_in_home_for_config.diff -p0
13_debian_add_xkbpath_env_variable.diff
commit 413cd7d4bddc0dbe1940f8591791b0382e5b34fe
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Mon Jun 4 21:33:34 2007 -0400
Fix where we point mesa source to. Also explicitly enable dri again.
diff --git a/debian/rules b/debian/rules
index bbdc727..422dc93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,8 @@ INSTALL=/usr/bin/install
# kill the .las.
confflags += --disable-static \
--enable-xorg \
- --with-mesa-source=/home/julien/src/xsf/git/lib/mesa \
+ --enable-dri \
+ --with-mesa-source=/usr/share/mesa-source \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
\
--with-serverconfig-path=/etc/X11/xserver \
--with-rgb-path=/etc/X11/rgb \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
