diff options
Diffstat (limited to 'x11-servers/xorg-server-snap/files')
11 files changed, 0 insertions, 292 deletions
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c b/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c deleted file mode 100644 index 5894dbb727bc..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c +++ /dev/null @@ -1,14 +0,0 @@ -Index: programs/Xserver/Xext/xvmc.c -diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c ---- Xext/xvmc.c.orig Sun Jul 3 17:53:36 2005 -+++ Xext/xvmc.c Thu Jan 26 14:22:20 2006 -@@ -24,8 +24,8 @@ - - #ifdef HAS_XVMCSHM - #ifndef Lynx --#include <sys/ipc.h> - #include <sys/types.h> -+#include <sys/ipc.h> - #include <sys/shm.h> - #else - #include <ipc.h> diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c deleted file mode 100644 index 59aad379ae11..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c +++ /dev/null @@ -1,11 +0,0 @@ ---- hw/xfree86/common/xf86Config.c.orig Fri Jun 23 12:32:32 2006 -+++ hw/xfree86/common/xf86Config.c Fri Jun 23 12:32:46 2006 -@@ -1042,7 +1042,7 @@ - else - xf86Info.estimateSizesAggressively = 0; - -- xf86Info.aiglx = TRUE; -+ xf86Info.aiglx = FALSE; - xf86Info.aiglxFrom = X_DEFAULT; - if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) { - xf86Info.aiglx = value; diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c deleted file mode 100644 index 933742b00170..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c +++ /dev/null @@ -1,12 +0,0 @@ -Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c -diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c ---- hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005 -+++ hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006 -@@ -35,6 +35,7 @@ - #include "xf86Priv.h" - - #include <errno.h> -+#include <sys/types.h> - #include <sys/mman.h> - - #ifdef HAS_MTRR_SUPPORT diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c deleted file mode 100644 index e9fb876333cc..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c ---- os/xprintf.c.orig Sun Jul 3 17:53:52 2005 -+++ os/xprintf.c Thu Jan 26 12:47:37 2006 -@@ -39,7 +39,7 @@ - # ifdef __va_copy - # define va_copy __va_copy - # else --# error "no working va_copy was found" -+# define va_copy(dest, src) ((dest) = (src)) - # endif - #endif - diff --git a/x11-servers/xorg-server-snap/files/patch-at_scancode.c b/x11-servers/xorg-server-snap/files/patch-at_scancode.c deleted file mode 100644 index 68ffceb41e86..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-at_scancode.c +++ /dev/null @@ -1,31 +0,0 @@ ---- hw/xfree86/os-support/shared/at_scancode.c.orig Sun Jul 3 09:01:35 2005 -+++ hw/xfree86/os-support/shared/at_scancode.c Sat Oct 7 21:27:29 2006 -@@ -84,6 +84,10 @@ - case KEY_Prefix0: - pKbd->scanPrefix = 0; - switch (*scanCode) { -+ case 0x1e: *scanCode = KEY_AudioRaise;break; -+ case 0x1f: *scanCode = KEY_AudioLower;break; -+ case 0x20: *scanCode = KEY_Power; break; -+ case 0x25: *scanCode = KEY_Mute; break; - case KEY_KP_7: *scanCode = KEY_Home; break; /* curs home */ - case KEY_KP_8: *scanCode = KEY_Up; break; /* curs up */ - case KEY_KP_9: *scanCode = KEY_PgUp; break; /* curs pgup */ -@@ -104,6 +108,17 @@ - case 0x5b: *scanCode = KEY_LMeta; break; - case 0x5c: *scanCode = KEY_RMeta; break; - case 0x5d: *scanCode = KEY_Menu; break; -+ case 0x5e: *scanCode = KEY_L1; break; /* stop */ -+ case 0x5f: *scanCode = KEY_L2; break; /* again */ -+ case 0x60: *scanCode = KEY_L3; break; /* props */ -+ case 0x61: *scanCode = KEY_L4; break; /* undo */ -+ case 0x62: *scanCode = KEY_L5; break; /* front */ -+ case 0x63: *scanCode = KEY_L6; break; /* copy */ -+ case 0x64: *scanCode = KEY_L7; break; /* open */ -+ case 0x65: *scanCode = KEY_L8; break; /* paste */ -+ case 0x66: *scanCode = KEY_L9; break; /* find */ -+ case 0x67: *scanCode = KEY_L10; break; /* cut */ -+ case 0x68: *scanCode = KEY_Help; break; - case KEY_F3: *scanCode = KEY_F13; break; - case KEY_F4: *scanCode = KEY_F14; break; - case KEY_F5: *scanCode = KEY_F15; break; diff --git a/x11-servers/xorg-server-snap/files/patch-bsdResource.c b/x11-servers/xorg-server-snap/files/patch-bsdResource.c deleted file mode 100644 index 44388bb0a393..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-bsdResource.c +++ /dev/null @@ -1,68 +0,0 @@ ---- hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004 -+++ hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005 -@@ -18,7 +18,7 @@ - - #ifdef INCLUDE_XF86_NO_DOMAIN - --#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) -+#if defined(__alpha__) || defined(__amd64__) - - resPtr - xf86BusAccWindowsFromOS(void) -@@ -112,7 +112,7 @@ - return ret; - } - --#elif defined(__powerpc__) -+#elif defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) - - resPtr - xf86BusAccWindowsFromOS(void) -@@ -123,7 +123,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -137,7 +141,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -153,7 +161,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -175,7 +187,11 @@ - ret = xf86AddResToList(ret, &range, -1); - RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock); - ret = xf86AddResToList(ret, &range, -1); -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00ffffff, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x0000ffff, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - - return ret; diff --git a/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c b/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c deleted file mode 100644 index a7d8cb3fdd48..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c +++ /dev/null @@ -1,32 +0,0 @@ ---- hw/xfree86/os-support/bsd/bsd_kbd.c.orig Mon Oct 3 18:46:14 2005 -+++ hw/xfree86/os-support/bsd/bsd_kbd.c Fri Sep 29 23:26:17 2006 -@@ -75,6 +75,17 @@ - KbdDevPtr pKbd = (KbdDevPtr) pInfo->private; - int real_leds = 0; - -+#if defined (SYSCONS_SUPPORT) -+ if (pKbd->sunKbd) { -+ if (leds & 0x08) real_leds |= XLED1; -+ if (leds & 0x04) real_leds |= XLED4; -+ if (leds & 0x02) real_leds |= XLED3; -+ if (leds & 0x01) real_leds |= XLED2; -+ leds = real_leds; -+ real_leds = 0; -+ } -+#endif -+ - #ifdef LED_CAP - if (leds & XLED1) real_leds |= LED_CAP; - #endif -@@ -83,7 +94,11 @@ - #endif - #ifdef LED_SCR - if (leds & XLED3) real_leds |= LED_SCR; -+#ifdef LED_COMP -+ if (leds & XLED4) real_leds |= LED_COMP; -+#else - if (leds & XLED4) real_leds |= LED_SCR; -+#endif - #endif - - switch (pKbd->consType) { diff --git a/x11-servers/xorg-server-snap/files/patch-render.c b/x11-servers/xorg-server-snap/files/patch-render.c deleted file mode 100644 index 17f8b144b1a7..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-render.c +++ /dev/null @@ -1,11 +0,0 @@ ---- render/render.c.orig Mon May 29 09:43:15 2006 -+++ render/render.c Mon May 29 09:45:02 2006 -@@ -1340,7 +1340,7 @@ - { - if (buffer + sizeof (GlyphSet) < end) - { -- memcpy(&gs, buffer, sizeof(GlyphSet)); -+ gs = *(CARD32 *) buffer; - glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, - gs, - GlyphSetType, diff --git a/x11-servers/xorg-server-snap/files/patch-servermd.h b/x11-servers/xorg-server-snap/files/patch-servermd.h deleted file mode 100644 index 5bbb1e4d8ab5..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-servermd.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/servermd.h.orig Sun Jan 8 14:05:55 2006 -+++ include/servermd.h Sun Jan 8 14:06:22 2006 -@@ -216,7 +216,7 @@ - defined(__sparc__) || defined(__mc68000__) - - #if defined(__sparc) || defined(__sparc__) --# if !defined(sparc) -+# if !defined(sparc) && !defined(__FreeBSD__) - # define sparc 1 - # endif - #endif diff --git a/x11-servers/xorg-server-snap/files/patch-xf86Events.c b/x11-servers/xorg-server-snap/files/patch-xf86Events.c deleted file mode 100644 index 2d88773233b8..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86Events.c +++ /dev/null @@ -1,76 +0,0 @@ ---- hw/xfree86/common/xf86Events.c.orig Sun Sep 26 04:17:42 2004 -+++ hw/xfree86/common/xf86Events.c Sun Sep 26 04:17:25 2004 -@@ -448,7 +448,7 @@ - #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT) - static Bool first_time = TRUE; - #endif --#if defined(__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - static int kbdSun = -1; - #endif - /* Disable any keyboard processing while in suspend */ -@@ -464,7 +464,7 @@ - } - #endif - --#if defined (__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - if (kbdSun == -1) { - if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun")) - || (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun"))) -@@ -474,7 +474,7 @@ - } - if (kbdSun) - goto special; --#endif /* __sparc__ && __linux__ */ -+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */ - - #ifdef __linux__ - if (xf86Info.kbdCustomKeycodes) { -@@ -525,6 +525,7 @@ - } else - #endif /* i386 && SVR4 */ - { -+ if (!xf86IsPc98()) { - switch (scanCode) { - case 0x59: scanCode = KEY_0x59; break; - case 0x5a: scanCode = KEY_0x5A; break; -@@ -555,6 +556,7 @@ - case 0x75: scanCode = KEY_0x75; break; - case 0x76: scanCode = KEY_0x76; break; - } -+ } /* end if (!xf86IsPc98()) */ - } - } - -@@ -636,10 +638,12 @@ - * they need to get the same key code as the base key on the same - * physical keyboard key. - */ -+ if (!xf86IsPc98()) { - if (scanCode == KEY_SysReqest) - scanCode = KEY_Print; - else if (scanCode == KEY_Break) - scanCode = KEY_Pause; -+ } - #endif - - /* -@@ -676,7 +680,7 @@ - } - } - #endif --#if defined (__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - special: - if (kbdSun) { - switch (scanCode) { -@@ -710,7 +714,7 @@ - */ - scanCode--; - } --#endif /* defined (__sparc__) && defined(__linux__) */ -+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */ - - #ifdef XKB - if ((xf86Info.ddxSpecialKeys == SKWhenNeeded && diff --git a/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp b/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp deleted file mode 100644 index 04e217b8d9fe..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004 -+++ hw/xfree86/xorgconf.cpp Fri Dec 31 14:40:28 2004 -@@ -624,3 +624,11 @@ - InputDevice "Keyboard1" "CoreKeyboard" - EndSection - -+ -+XCOMM Two experimental extensions are available -- Composite and XEVIE. Uncomment -+XCOMM the section below to enable Composite. Many extensions can also be disabled -+XCOMM in this manner. -+ -+XCOMM Section "Extensions" -+XCOMM Option "Composite" "Enable" -+XCOMM EndSection |