Author: branden
Date: 2004-04-14 02:31:14 -0500 (Wed, 14 Apr 2004)
New Revision: 1246
Modified:
trunk/debian/changelog
trunk/debian/xserver-xfree86.config.in
Log:
Update list of available video drivers on each architecture.
Migrate video driver list logic to the shell-lib.sh functions observe() and
internal_error().
Update copyright notice.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-14 07:15:33 UTC (rev 1245)
+++ trunk/debian/changelog 2004-04-14 07:31:14 UTC (rev 1246)
@@ -170,8 +170,11 @@
a structure definition, though objects that link against libXtst don't
necessarily link against libXi (thanks, Glenn Maynard). (Closes: #242830)
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Apr 2004 02:12:41 -0500
+ * Update list of available video drivers on each architecture in
+ xserver-xfree86's config script.
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Apr 2004 02:28:42 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2004-04-14 07:15:33 UTC (rev
1245)
+++ trunk/debian/xserver-xfree86.config.in 2004-04-14 07:31:14 UTC (rev
1246)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian xserver-xfree86 package configuration script
-# Copyright 2000--2003 Branden Robinson.
+# Copyright 2000--2004 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
@@ -561,40 +561,44 @@
debug_echo "could not autodetect X server driver: discover not found"
fi
-# build list of available video drivers, omitting the atimisc, r128, and radeon
-# sub-modules (the ati driver knows to load these)
-DRIVER_LIST="$(echo $(find /usr/X11R6/lib/modules/drivers -name '*_drv.o' 2>
/dev/null | sed 's|^.*/\(.*\)_drv\.o|\1|' | egrep -v '(atimisc|r128|radeon)' |
sort) | sed 's/ /, /g')"
+# Build list of available video drivers, omitting the atimisc, r128, and
+# radeon sub-modules (the ati driver knows when and how to load these).
+# v4l is not a display driver, and dummy is for advanced users.
+DRIVER_LIST="$(echo $(find /usr/X11R6/lib/modules/drivers -name '*_drv.o' \
+ 2>/dev/null | sed 's|^.*/\(.*\)_drv\.o|\1|' \
+ | egrep -v '(atimisc|dummy|r128|radeon|v4l)' | sort) \
+ | sed 's/ /, /g')"
if [ -z "$DRIVER_LIST" ]; then
- debug_echo "No modules found in module directory; falling back to hard-coded
list for $ARCH."
+ observe "no modules found in module directory; falling back to hard-coded" \
+ "list for $ARCH"
case "$ARCH" in
alpha)
- DRIVER_LIST="ati, glint, mga, nv, rendition, s3, s3virge, siliconmotion,
tdfx, tga, vga"
+ DRIVER_LIST="ati, cirrus, glint, mga, nv, rendition, s3, s3virge,
savage, siliconmotion, tdfx, tga, vga"
;;
- arm)
- DRIVER_LIST="ati, chips, fbdev, glint, imstt, mga, s3virge, savage,
tdfx, trident, vga"
+ arm|hppa)
+ DRIVER_LIST="ati, chips, fbdev, glint, mga, nv, s3, s3virge, savage,
sis, tdfx, trident, vga"
;;
- i386|hurd-i386)
- DRIVER_LIST="apm, ark, ati, chips, cirrus, cyrix, fbdev, glide, glint,
i128, i740, i810, imstt, mga, neomagic, nv, rendition, s3, s3virge, savage,
siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga, vmware"
+ hurd-i386)
+ 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"
;;
+ i386)
+ 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,
vmware"
+ ;;
ia64)
- DRIVER_LIST="apm, ark, ati, chips, cirrus, cyrix, fbdev, glint, i128,
i740, i810, imstt, mga, neomagic, nv, rendition, s3, s3virge, savage,
siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga, vmware"
+ 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"
;;
- hppa)
- DRIVER_LIST="fbdev"
- ;;
m68k|powerpc)
- DRIVER_LIST="ati, chips, fbdev, glint, imstt, mga, s3, s3virge, savage,
sis, tdfx, trident, vga"
+ DRIVER_LIST="ati, chips, fbdev, glint, imstt, mga, nv, s3, s3virge,
savage, sis, tdfx, trident, vga"
;;
mips|mipsel)
- DRIVER_LIST="ati, chips, fbdev, glint, mga, newport, nv, s3virge, savage,
sis, tdfx, trident"
+ DRIVER_LIST="ati, chips, fbdev, glint, mga, newport, nv, s3, s3virge,
savage, sis, tdfx, trident"
;;
sparc)
- DRIVER_LIST="ati, fbdev, glint, sunbw2, suncg14, suncg3, suncg6, sunffb,
sunleo, suntcx"
+ 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"
;;
*)
- echo "Sorry, no driver list known for architecture $ARCH." | fold -w
${COLUMNS:-80} >&2
- exit 0
+ internal_error "no driver list known for architecture $ARCH"
;;
esac
fi
