X Strike Force X.Org X11 SVN commit: r1330 - in branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian: . patches
Author: dnusinow
Date: 2006-02-26 18:52:12 -0500 (Sun, 26 Feb 2006)
New Revision: 1330
Added:
branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/patches/
branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/patches/01_savage_driver_disable_randr_on_rotation.diff
branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/patches/series
Modified:
branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/changelog
branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/rules
Log:
* Port patches from trunk
+ general/099f_savage_driver_disable_randr_on_rotation.diff
Modified: branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/changelog
===================================================================
--- branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/changelog 2006-02-26 23:36:12 UTC (rev 1329)
+++ branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/changelog 2006-02-26 23:52:12 UTC (rev 1330)
@@ -1,3 +1,10 @@
+xserver-xorg-video-savage (1:2.0.2.3-2) experimental; urgency=low
+
+ * Port patches from trunk
+ + general/099f_savage_driver_disable_randr_on_rotation.diff
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 18:51:40 -0500
+
xserver-xorg-video-savage (1:2.0.2.3-1) experimental; urgency=low
* First upload to Debian
Added: branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/patches/01_savage_driver_disable_randr_on_rotation.diff
===================================================================
--- branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/patches/01_savage_driver_disable_randr_on_rotation.diff 2006-02-26 23:36:12 UTC (rev 1329)
+++ branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/patches/01_savage_driver_disable_randr_on_rotation.diff 2006-02-26 23:52:12 UTC (rev 1330)
@@ -0,0 +1,58 @@
+Index: xf86-video-savage-X11R7.0-2.0.2.3/man/savage.man
+===================================================================
+--- xf86-video-savage-X11R7.0-2.0.2.3.orig/man/savage.man 2006-01-12 22:55:15.000000000 -0500
++++ xf86-video-savage-X11R7.0-2.0.2.3/man/savage.man 2006-02-26 18:44:31.000000000 -0500
+@@ -84,13 +84,18 @@
+ .BI "Option \*qRotate\*q \*qCW\*q"
+ .TP
+ .BI "Option \*qRotate\*q \*qCCW\*q"
+-Rotate the desktop 90 degrees clockwise or counterclockwise. This option
+-forces the ShadowFB option on, and disables acceleration.
++Rotate the desktop 90 degrees clockwise or counterclockwise.
++This option forces the ShadowFB option on, and disables acceleration and
++the RandR extension.
+ Default: no rotation.
+ .TP
+ .BI "Option \*qShadowFB\*q \*q" boolean \*q
+-Enable or disable use of the shadow framebuffer layer. This option
+-disables acceleration. Default: off.
++Enable or disable use of the shadow framebuffer layer.
++.\" See
++.\" .BR shadowfb (__drivermansuffix__)
++.\" for further information.
++This option disables acceleration.
++Default: off.
+ .TP
+ .BI "Option \*qLCDClock\*q \*q" frequency \*q
+ Override the maximum dot clock. Some LCD panels produce incorrect results if
+Index: xf86-video-savage-X11R7.0-2.0.2.3/src/savage_driver.c
+===================================================================
+--- xf86-video-savage-X11R7.0-2.0.2.3.orig/src/savage_driver.c 2006-01-12 22:55:15.000000000 -0500
++++ xf86-video-savage-X11R7.0-2.0.2.3/src/savage_driver.c 2006-02-26 18:51:20.000000000 -0500
+@@ -1127,15 +1127,23 @@
+ if ((s = xf86GetOptValString(psav->Options, OPTION_ROTATE))) {
+ if(!xf86NameCmp(s, "CW")) {
+ /* accel is disabled below for shadowFB */
++ /* RandR is disabled when the Rotate option is used (does
++ * not work well together and scrambles the screen) */
++
+ psav->shadowFB = TRUE;
+ psav->rotate = 1;
++ xf86DisableRandR();
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+- "Rotating screen clockwise - acceleration disabled\n");
++ "Rotating screen clockwise"
++ "- acceleration and RandR disabled\n");
+ } else if(!xf86NameCmp(s, "CCW")) {
+ psav->shadowFB = TRUE;
+ psav->rotate = -1;
+- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Rotating screen"
+- "counter clockwise - acceleration disabled\n");
++ xf86DisableRandR();
++ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
++ "Rotating screen counter clockwise"
++ " - acceleration and RandR disabled\n");
++
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "\"%s\" is not a valid"
+ "value for Option \"Rotate\"\n", s);
Added: branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/patches/series
===================================================================
--- branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/patches/series 2006-02-26 23:36:12 UTC (rev 1329)
+++ branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/patches/series 2006-02-26 23:52:12 UTC (rev 1330)
@@ -0,0 +1 @@
+01_savage_driver_disable_randr_on_rotation.diff
Modified: branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/rules
===================================================================
--- branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/rules 2006-02-26 23:36:12 UTC (rev 1329)
+++ branches/modular/driver/xf86-video-savage-X11R7.0-2.0.2.3/debian/rules 2006-02-26 23:52:12 UTC (rev 1330)
@@ -31,7 +31,7 @@
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -44,7 +44,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: