diff options
Diffstat (limited to 'source/x/x11/patch/xorg-server')
3 files changed, 11 insertions, 32 deletions
diff --git a/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff index bfa9c305d..8c0e3b546 100644 --- a/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff +++ b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff @@ -1,13 +1,14 @@ ---- ./dix/window.c.orig 2007-01-22 23:39:15.000000000 -0600 -+++ ./dix/window.c 2007-02-14 03:21:03.000000000 -0600 -@@ -140,8 +140,8 @@ - * - ******/ +diff -Nur xorg-server-1.12.1.orig/dix/window.c xorg-server-1.12.1/dix/window.c +--- xorg-server-1.12.1.orig/dix/window.c 2012-03-29 21:57:25.000000000 -0500 ++++ xorg-server-1.12.1/dix/window.c 2012-04-13 22:01:24.456073603 -0500 +@@ -145,8 +145,8 @@ --static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11}; --static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88}; -+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00}; -+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00}; + Bool bgNoneRoot = FALSE; - _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF; +-static unsigned char _back_lsb[4] = { 0x88, 0x22, 0x44, 0x11 }; +-static unsigned char _back_msb[4] = { 0x11, 0x44, 0x22, 0x88 }; ++static unsigned char _back_lsb[4] = { 0x00, 0x00, 0x00, 0x00 }; ++static unsigned char _back_msb[4] = { 0x00, 0x00, 0x00, 0x00 }; + static Bool WindowParentHasDeviceCursor(WindowPtr pWin, + DeviceIntPtr pDev, CursorPtr pCurs); diff --git a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff b/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff deleted file mode 100644 index f8abdccb2..000000000 --- a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./fb/fbpict.c.orig 2010-03-11 22:38:21.000000000 -0600 -+++ ./fb/fbpict.c 2010-04-29 14:14:52.000000000 -0500 -@@ -37,7 +37,7 @@ - #include "mipict.h" - #include "fbpict.h" - --#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) -+#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b)) - - void - fbWalkCompositeRegion (CARD8 op, diff --git a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff deleted file mode 100644 index 74f799a11..000000000 --- a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./hw/xfree86/common/xf86pciBus.c.orig 2010-07-01 12:17:35.000000000 -0500 -+++ ./hw/xfree86/common/xf86pciBus.c 2010-11-18 16:56:57.633003654 -0600 -@@ -1118,7 +1118,7 @@ - break; - case 0x102b: driverList[0] = "mga"; break; - case 0x10c8: driverList[0] = "neomagic"; break; -- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; -+ case 0x10de: case 0x12d2: driverList[0] = "nouveau" ; driverList[1] = "nv"; break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; |