Author: dnusinow
Date: 2005-09-27 22:59:41 -0500 (Tue, 27 Sep 2005)
New Revision: 635
Modified:
trunk/debian/changelog
trunk/debian/xserver-xorg.config.in
Log:
* Provide extra insurance for autodetecting drivers on installation. Also
update driver default lists for amd64 and i386. (closes: #320634)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-28 03:11:36 UTC (rev 634)
+++ trunk/debian/changelog 2005-09-28 03:59:41 UTC (rev 635)
@@ -44,6 +44,8 @@
debian/rules. Thanks Robert Millan. (closes: #322902, #330304)
* Don't reset all xserver-xorg debconf templates when "dpkg-reconfigure
xserver-xorg" is called. (closes: #320241)
+ * Provide extra insurance for autodetecting drivers on installation. Also
+ update driver default lists for amd64 and i386. (closes: #320634)
[ Branden Robinson ]
* Change xserver-xorg and xserver-xorg-dbg's recommendation of "discover1"
@@ -57,7 +59,7 @@
* Updated Czech translation (cs.po). Thanks, Miroslav Kure (closes:
#327506).
- -- David Nusinow <[EMAIL PROTECTED]> Tue, 27 Sep 2005 23:10:26 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 27 Sep 2005 23:55:10 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-09-28 03:11:36 UTC (rev 634)
+++ trunk/debian/xserver-xorg.config.in 2005-09-28 03:59:41 UTC (rev 635)
@@ -704,58 +704,58 @@
if [ -z "$DRIVER_LIST" ]; then
observe "no video driver modules found in $DRIVER_DIR"
-fi
-# Set a hard-coded module list (if necessary) and default driver module on an
-# architecture-specific basis.
-case "$ARCH" in
- alpha)
- DRIVER_LIST=${DRIVER_LIST:=ati, cirrus, glint, mga, nv, rendition, s3,
s3virge, savage, siliconmotion, tdfx, tga, vga}
- DEFAULT_DRIVER=vga
- ;;
- amd64)
- DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, cyrix, fbdev,
glint, i128, i740, i810, imstt, mga, neomagic, newport, nsc, nv, rendition, s3,
s3virge, savage, siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga,
vmware}
- DEFAULT_DRIVER=vesa
- ;;
- arm|hppa)
- DRIVER_LIST=${DRIVER_LIST:=ati, chips, fbdev, glint, mga, nv, s3, s3virge,
savage, sis, tdfx, trident, vga}
- DEFAULT_DRIVER=fbdev
- ;;
- *-i386)
- DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, cyrix, fbdev,
glint, i128, i740, i810, imstt, mga, neomagic, newport, nsc, nv, rendition, s3,
s3virge, savage, siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga, via,
vmware}
- DEFAULT_DRIVER=vesa
- ;;
- i386)
- DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, cyrix, fbdev,
glide, glint, i128, i740, i810, imstt, mga, neomagic, newport, nsc, nv,
rendition, s3, s3virge, savage, siliconmotion, sis, tdfx, tga, trident, tseng,
vesa, vga, via, vmware}
- DEFAULT_DRIVER=vesa
- ;;
- ia64)
- DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, cyrix, fbdev,
glint, i128, i740, i810, imstt, mga, neomagic, newport, nv, rendition, s3,
s3virge, savage, siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga,
vmware}
- DEFAULT_DRIVER=fbdev
- ;;
- m68k|powerpc)
- DRIVER_LIST=${DRIVER_LIST:=ati, chips, fbdev, glint, imstt, mga, nv, s3,
s3virge, savage, sis, tdfx, trident, vga}
- DEFAULT_DRIVER=fbdev
- ;;
- mips|mipsel)
- DRIVER_LIST=${DRIVER_LIST:=ati, chips, fbdev, glint, mga, newport, nv, s3,
s3virge, savage, sis, tdfx, trident}
- # Are we dealing with an SGI Indy or Indigo2?
- if [ -e /proc/cpuinfo ]; then
- if grep -q "system type.*:.*SGI Ind" /proc/cpuinfo; then
- PRIORITY=medium
- DEFAULT_DRIVER=newport
+ # Set a hard-coded module list (if necessary) and default driver module on an
+ # architecture-specific basis.
+ case "$ARCH" in
+ alpha)
+ DRIVER_LIST=${DRIVER_LIST:=ati, cirrus, glint, mga, nv, rendition, s3,
s3virge, savage, siliconmotion, tdfx, tga, vga}
+ DEFAULT_DRIVER=vga
+ ;;
+ amd64)
+ DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, cirrus_alpine,
cirrus_laguna, cyrix, fbdev, glint, i128, i740, i810, imstt, mga, neomagic,
newport, nsc, nv, rendition, riva128, s3, s3virge, savage, siliconmotion, sis,
tdfx, tga, trident, tseng, vesa, vga, vmware}
+ DEFAULT_DRIVER=vesa
+ ;;
+ arm|hppa)
+ DRIVER_LIST=${DRIVER_LIST:=ati, chips, fbdev, glint, mga, nv, s3,
s3virge, savage, sis, tdfx, trident, vga}
+ DEFAULT_DRIVER=fbdev
+ ;;
+ *-i386)
+ DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, cyrix, fbdev,
glint, i128, i740, i810, imstt, mga, neomagic, newport, nsc, nv, rendition, s3,
s3virge, savage, siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga, via,
vmware}
+ DEFAULT_DRIVER=vesa
+ ;;
+ i386)
+ DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, cirrus_alpine,
cirrus_laguna, cyrix, fbdev, glide, glint, i128, i740, i810, imstt, mga,
neomagic, newport, nsc, nv, rendition, riva128, s3, s3virge, savage,
siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga, via, vmware}
+ DEFAULT_DRIVER=vesa
+ ;;
+ ia64)
+ DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, cyrix, fbdev,
glint, i128, i740, i810, imstt, mga, neomagic, newport, nv, rendition, s3,
s3virge, savage, siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga,
vmware}
+ DEFAULT_DRIVER=fbdev
+ ;;
+ m68k|powerpc)
+ DRIVER_LIST=${DRIVER_LIST:=ati, chips, fbdev, glint, imstt, mga, nv, s3,
s3virge, savage, sis, tdfx, trident, vga}
+ DEFAULT_DRIVER=fbdev
+ ;;
+ mips|mipsel)
+ DRIVER_LIST=${DRIVER_LIST:=ati, chips, fbdev, glint, mga, newport, nv,
s3, s3virge, savage, sis, tdfx, trident}
+ # Are we dealing with an SGI Indy or Indigo2?
+ if [ -e /proc/cpuinfo ]; then
+ if grep -q "system type.*:.*SGI Ind" /proc/cpuinfo; then
+ PRIORITY=medium
+ DEFAULT_DRIVER=newport
+ fi
fi
- fi
- DEFAULT_DRIVER=${DEFAULT_DRIVER:=fbdev}
- ;;
- sparc)
- DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, fbdev, glint,
i128, i740, imstt, mga, neomagic, nv, rendition, s3virge, savage,
siliconmotion, sunbw2, suncg14, suncg3, suncg6, sunffb, sunleo, suntcx, tdfx,
trident, vesa, vga}
- DEFAULT_DRIVER=fbdev
- ;;
- *)
- internal_error "no driver list known for architecture $ARCH"
- ;;
-esac
+ DEFAULT_DRIVER=${DEFAULT_DRIVER:=fbdev}
+ ;;
+ sparc)
+ DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, fbdev, glint,
i128, i740, imstt, mga, neomagic, nv, rendition, s3virge, savage,
siliconmotion, sunbw2, suncg14, suncg3, suncg6, sunffb, sunleo, suntcx, tdfx,
trident, vesa, vga}
+ DEFAULT_DRIVER=fbdev
+ ;;
+ *)
+ internal_error "no driver list known for architecture $ARCH"
+ ;;
+ esac
+fi
observe "available video driver list set to \"$DRIVER_LIST\""
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
