X Strike Force X.Org X11 SVN commit: r2892 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-08-21 23:22:59 -0400 (Mon, 21 Aug 2006)
New Revision: 2892
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.config.in
Log:
* Steal patch from Ubuntu for xserver-xorg.config to help with the Mac mini
by Fabio.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-08-22 03:17:12 UTC (rev 2891)
+++ trunk/debian/xorg/debian/changelog 2006-08-22 03:22:59 UTC (rev 2892)
@@ -28,8 +28,10 @@
* Pull patch from Ubuntu to xserver-xorg postins to correctly update the
config file on upgrades
* Steal patch from Ubuntu to update non-latin keymaps by Colin Watson
+ * Steal patch from Ubuntu for xserver-xorg.config to help with the Mac mini
+ by Fabio.
- -- David Nusinow <dnusinow@debian.org> Mon, 21 Aug 2006 23:16:42 +0000
+ -- David Nusinow <dnusinow@debian.org> Mon, 21 Aug 2006 23:22:33 +0000
xorg (1:7.0.23) unstable; urgency=low
Modified: trunk/debian/xorg/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.config.in 2006-08-22 03:17:12 UTC (rev 2891)
+++ trunk/debian/xorg/debian/xserver-xorg.config.in 2006-08-22 03:22:59 UTC (rev 2892)
@@ -826,6 +826,8 @@
# this question requires input validation
MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil low)" xserver-xorg/config/device/identifier "$DEFAULT"
+ DEVICE_IDENTIFIER="$DEFAULT"
+
# BusID
PRIORITY=low
DEFAULT=
@@ -923,6 +925,23 @@
USE_FBDEV=false
fi
+ # it looks like Mac Mini need an extra kick. Make sure to give it to it.
+
+ if [ "$ARCH" = powerpc ] && [ "$USE_FBDEV" = "false" ]; then
+ # it looks like Mac Mini need an extra kick. Make sure to give it to it.
+ if [ -e /proc/cpuinfo ]; then
+ if [ -n "$(cat /proc/cpuinfo | grep "^machine.*PowerMac10,1")" ] && \
+ [ -n "$(cat /proc/cpuinfo | grep "^platform.*PowerMac")" ]; then
+ USE_FBDEV=true
+ fi
+ fi
+ # Make sure to force UseFBDev with Rage 128 or stuff will go bad in some
+ # old Macs.
+ if echo "$DEVICE_IDENTIFIER" | grep -q "Rage 128"; then
+ USE_FBDEV=true
+ fi
+ fi
+
if [ -n "$XORG_USE_FBDEV" ] && [ "$XORG_USE_FBDEV" = "no" ]; then
USE_FBDEV=false
fi
Reply to: