Attachment 49913 Details for Bug 116981

[patch] sax2.patch

sax2.dif (text/plain), 8.82 KB, created by Marcus Schaefer on 2005-09-14 14:44:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Schaefer

Created: 2005-09-14 14:44:20 UTC

Size: 8.82 KB

patch

obsolete

>Index: sysp/maps/Identity.map
>===================================================================
>--- sysp/maps/Identity.map	(revision 857)
>+++ sysp/maps/Identity.map	(working copy)
>@@ -893,8 +893,8 @@
> NAME=NVidia§DEVICE=GeForce4 448 Go (0x018D)§VID=0x10de§DID=0x018D§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
> NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
> NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
>-NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
>-NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
>+NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
>+NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=3D
> NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
> NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
> NAME=NVidia§DEVICE=Quadro NVS 285§VID=0x10de§DID=0x0163§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
>Index: sysp/maps/arch/Identity.map.x86_64
>===================================================================
>--- sysp/maps/arch/Identity.map.x86_64	(revision 857)
>+++ sysp/maps/arch/Identity.map.x86_64	(working copy)
>@@ -893,8 +893,8 @@
> NAME=NVidia§DEVICE=GeForce4 448 Go (0x018D)§VID=0x10de§DID=0x018D§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
> NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
> NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
>-NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
>-NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
>+NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
>+NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=3D
> NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
> NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
> NAME=NVidia§DEVICE=Quadro NVS 285§VID=0x10de§DID=0x0163§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
>Index: sysp/maps/arch/Identity.map.i386
>===================================================================
>--- sysp/maps/arch/Identity.map.i386	(revision 857)
>+++ sysp/maps/arch/Identity.map.i386	(working copy)
>@@ -893,8 +893,8 @@
> NAME=NVidia§DEVICE=GeForce4 448 Go (0x018D)§VID=0x10de§DID=0x018D§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
> NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
> NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
>-NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
>-NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
>+NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
>+NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=3D
> NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
> NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
> NAME=NVidia§DEVICE=Quadro NVS 285§VID=0x10de§DID=0x0163§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
>Index: sysp/script/machine.pl
>===================================================================
>--- sysp/script/machine.pl	(revision 857)
>+++ sysp/script/machine.pl	(working copy)
>@@ -35,6 +35,6 @@
> 	};
> 	# any other ( default )...
> 	# -------------------------
>-	print "pc104\n";
>+	print "pc105\n";
> }
> 
>Index: rpm/sax2.changes
>===================================================================
>--- rpm/sax2.changes	(revision 859)
>+++ rpm/sax2.changes	(working copy)
>@@ -1,4 +1,13 @@
> -------------------------------------------------------------------
>+Tue Sep 13 08:45:32 CEST 2005 - ms@suse.de
>+
>+- added support for another IBook G4 display (#116594)
>+- fixed PPC keyboard detection to use pc105 as default model (#116946)
>+- switched off using xmset for enabled/disable mouse in init.pl (#116946)
>+- fixed monitor display bug crashing sax if an unknown resolution
>+  key is used. This happens for example on 720x400 displays (#116946)
>+
>+-------------------------------------------------------------------
> Mon Sep 12 18:52:30 CEST 2005 - ms@suse.de
> 
> - added support for another IBook G4 display (#116481)
>Index: api/data/cdb/Monitors
>===================================================================
>--- api/data/cdb/Monitors	(revision 859)
>+++ api/data/cdb/Monitors	(working copy)
>@@ -1,7 +1,7 @@
> # /.../
> # Copyright (c) 2001 SuSE GmbH Nuernberg, Germany.  All rights reserved.
> #
>-# Author: Marcus Schaefer <sax@suse.de>, Mon Sep 12 18:52:13 2005
>+# Author: Marcus Schaefer <sax@suse.de>, Tue Sep 13 08:45:10 2005
> #
> # Template for monitor data
> # --------------------------
>@@ -3279,6 +3279,18 @@
> }
> 
> #==============================================
>+# COLOR LCD 9C2C
>+#----------------------------------------------
>+APPLE:COLOR LCD 9C2C  {
>+ DDC=APP9C2C
>+ Option=DPMS
>+ Hsync=58-72
>+ Modeline="1440x900" 126.98 1440 1536 1688 1936 900 901 904 937
>+ Resolution=1440x900
>+ Vsync=30-90
>+}
>+
>+#==============================================
> # DATACON 159047
> #----------------------------------------------
> ARP:DATACON 159047  {
>Index: api/monitor/monitordisplay.cpp
>===================================================================
>--- api/monitor/monitordisplay.cpp	(revision 857)
>+++ api/monitor/monitordisplay.cpp	(working copy)
>@@ -362,6 +362,16 @@
> 	mColors -> setCurrentText (*mColorDict[colorKey]);
> 	// set primary resolution
> 	QString resolutionKey = *mSelectedResolution.at(0);
>+	if (! mResolutionDict[resolutionKey]) {
>+		log (L_WARN,
>+			"SCCMonitorDisplay::Warning: res key %s is missing\n",
>+			resolutionKey.ascii()
>+		);
>+		log (L_WARN,
>+			"SCCMonitorDisplay::Warning: reset to default 640x480 key\n"
>+		);
>+		resolutionKey="640x480";
>+	}
> 	mResolution -> setCurrentText (*mResolutionDict[resolutionKey]);
> 	slotResolution ( mResolution->currentItem() );
> }
>Index: init.pl
>===================================================================
>--- init.pl	(revision 857)
>+++ init.pl	(working copy)
>@@ -1384,7 +1384,7 @@
> # enable the mouse pointer again after
> # it was disabled using DisableMouse()
> #
>-	system("$spec{Xmset} -d $dpy --enable 2>/dev/null >/dev/null");
>+#	system("$spec{Xmset} -d $dpy --enable 2>/dev/null >/dev/null");
> }
> 
> #---[ DisableMouse ]----#
>@@ -1393,7 +1393,7 @@
> # disable mouse to prevent us from haply
> # mouse events
> #
>-	system("$spec{Xmset} -d $dpy --disable 2>/dev/null >/dev/null");
>+#	system("$spec{Xmset} -d $dpy --disable 2>/dev/null >/dev/null");
> }
> 
> #----[ usage ]----#

Actions: View | Diff

Attachments on bug 116981: 49913