diff options
Diffstat (limited to 'x11-servers/xorg-server-snap/files')
12 files changed, 6 insertions, 174 deletions
diff --git a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf index 9a208d778fa3..e7c983833b5a 100644 --- a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf +++ b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf @@ -1,5 +1,5 @@ ---- config/cf/FreeBSD.cf.orig Sun Aug 15 10:03:36 2004 -+++ config/cf/FreeBSD.cf Sun Feb 6 03:56:59 2005 +--- config/cf/FreeBSD.cf.orig Tue May 3 21:14:57 2005 ++++ config/cf/FreeBSD.cf Mon May 9 15:21:48 2005 @@ -78,6 +78,7 @@ #define HasIssetugid YES #define HasPoll YES @@ -59,18 +59,15 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -442,7 +444,9 @@ - #define AsVISOption -Av9a - #define AsOutputArchSize 64 +@@ -446,7 +448,6 @@ + #ifdef PpcArchitecture + #define XF86INT10_BUILD X86INT10_STUB #endif - -+#ifdef PpcArchitecture -+#define XF86INT10_BUILD X86INT10_STUB -+#endif #define StandardDefines -DCSRG_BASED #if OSMajorVersion > 1 -@@ -463,18 +467,8 @@ +@@ -467,18 +468,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif diff --git a/x11-servers/xorg-server-snap/files/patch-Imake.cf b/x11-servers/xorg-server-snap/files/patch-Imake.cf deleted file mode 100644 index 14f519aa9a16..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Imake.cf +++ /dev/null @@ -1,15 +0,0 @@ ---- config/cf/Imake.cf.orig Wed Jan 19 20:53:39 2005 -+++ config/cf/Imake.cf Wed Jan 19 20:55:09 2005 -@@ -282,6 +282,10 @@ - # undef __amd64__ - # undef __x86_64__ - # endif -+# ifdef __powerpc__ -+# define PpcArchitecture -+# undef __powerpc__ -+# endif - #endif /* __FreeBSD__ */ - - /* Systems based on kernel of FreeBSD */ - - diff --git a/x11-servers/xorg-server-snap/files/patch-Pci.h b/x11-servers/xorg-server-snap/files/patch-Pci.h deleted file mode 100644 index 9a9be743bc6e..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Pci.h +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Thu Jan 20 06:51:21 2005 -+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Thu Jan 20 06:52:09 2005 -@@ -285,7 +285,7 @@ - # define ARCH_PCI_INIT linuxPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN /* Needs kernel work to remove */ --# elif defined(__OpenBSD__) -+# elif defined(__FreeBSD__) || defined(__OpenBSD__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN diff --git a/x11-servers/xorg-server-snap/files/patch-alpha_video.c b/x11-servers/xorg-server-snap/files/patch-alpha_video.c deleted file mode 100644 index 15ff05b7c4a0..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-alpha_video.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Wed Sep 1 21:05:09 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Wed Sep 1 21:06:52 2004 -@@ -487,7 +487,7 @@ - writeSparse32(int Value, pointer Base, register unsigned long Offset); - - #ifdef __FreeBSD__ --extern int sysarch(int, char *); -+extern int sysarch(int, void *); - #endif - - struct parms { diff --git a/x11-servers/xorg-server-snap/files/patch-bus-Imakefile b/x11-servers/xorg-server-snap/files/patch-bus-Imakefile deleted file mode 100644 index c5f62ec48a41..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-bus-Imakefile +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Thu Jan 20 03:43:03 2005 -+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Thu Jan 20 03:46:40 2005 -@@ -66,6 +66,13 @@ - PCIDRVRSRC = netbsdPci.c - PCIDRVROBJ = netbsdPci.o - -+#elif defined(FreeBSDArchitecture) && defined(PpcArchitecture) -+ -+XCOMM FreeBSD/PowerPC PCI driver (using /dev/pci) -+ -+PCIDRVRSRC = freebsdPci.c -+PCIDRVROBJ = freebsdPci.o -+ - #elif defined(PpcArchitecture) - - XCOMM PowerPC PCI drivers - - diff --git a/x11-servers/xorg-server-snap/files/patch-compiler.h b/x11-servers/xorg-server-snap/files/patch-compiler.h deleted file mode 100644 index 2b350252c97e..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-compiler.h +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/compiler.h.orig Fri Jan 21 03:19:16 2005 -+++ programs/Xserver/hw/xfree86/common/compiler.h Fri Jan 21 03:20:03 2005 -@@ -1068,7 +1068,7 @@ - # define write_mem_barrier() /* NOP */ - # endif /* __arm32__ */ - --# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__powerpc__) -+# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__) - - # ifndef MAP_FAILED - # define MAP_FAILED ((void *)-1) diff --git a/x11-servers/xorg-server-snap/files/patch-loader.c b/x11-servers/xorg-server-snap/files/patch-loader.c deleted file mode 100644 index f68744ce35fc..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-loader.c +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/loader.c.orig Tue Feb 22 06:58:18 2005 -+++ programs/Xserver/hw/xfree86/loader/loader.c Tue Feb 22 06:59:09 2005 -@@ -552,8 +552,8 @@ - FatalError("\n_LoaderFileToMem() read() failed: %s\n", - strerror(errno)); - --# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__)) \ -- && defined(__powerpc__) -+# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) \ -+ || defined(__FreeBSD__)) && defined(__powerpc__) - /* - * Keep the instruction cache in sync with changes in the - * main memory. diff --git a/x11-servers/xorg-server-snap/files/patch-man-Imakefile b/x11-servers/xorg-server-snap/files/patch-man-Imakefile deleted file mode 100644 index 182741ccc44c..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-man-Imakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/doc/man/Imakefile.orig Sat May 8 23:04:29 2004 -+++ programs/Xserver/hw/xfree86/doc/man/Imakefile Sat May 8 23:04:33 2004 -@@ -15,7 +15,9 @@ - - #endif - -+#if 0 - InstallManPageLong(XF86VM,$(MANDIR),XF86VidMode) - #if ExpandManNames - InstallManPageAliases(XF86VidMode,$(MANDIR),XF86VidModeQueryExtension XF86VidModeQueryVersion XF86VidModeGetModeLine XF86VidModeGetAllModeLines XF86VidModeDeleteModeLine XF86VidModeModModeLine XF86VidModeSwitchMode XF86VidModeSwitchToMode XF86VidModeLockModeSwitch XF86VidModeGetMonitor XF86VidModeGetViewPort XF86VidModeSetViewPort XF86VidModeValidateModeLine XF86VidModeSetClientVersion XF86VidModeGetDotClocks XF86VidModeGetGamma XF86VidModeSetGamma XF86VidModeSetGammaRamp XF86VidModeGetGammaRamp XF86VidModeGetGammaRampSize XF86VidModeGetPermissions) -+#endif - #endif diff --git a/x11-servers/xorg-server-snap/files/patch-mouse.c b/x11-servers/xorg-server-snap/files/patch-mouse.c deleted file mode 100644 index 745ea92c5dbb..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-mouse.c +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Jan 29 06:57:55 2005 -+++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Sat Jan 29 06:59:03 2005 -@@ -1501,8 +1501,8 @@ - - case PROT_SYSMOUSE: /* sysmouse */ - buttons = (~pBuf[0]) & 0x07; -- dx = (char)(pBuf[1]) + (char)(pBuf[3]); -- dy = - ((char)(pBuf[2]) + (char)(pBuf[4])); -+ dx = (signed char)(pBuf[1]) + (signed char)(pBuf[3]); -+ dy = - ((signed char)(pBuf[2]) + (signed char)(pBuf[4])); - /* FreeBSD sysmouse sends additional data bytes */ - if (pMse->protoPara[4] >= 8) { - /* diff --git a/x11-servers/xorg-server-snap/files/patch-os-support-Imakefile b/x11-servers/xorg-server-snap/files/patch-os-support-Imakefile deleted file mode 100644 index fab8641dacac..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-os-support-Imakefile +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Thu Jan 20 03:30:38 2005 -+++ programs/Xserver/hw/xfree86/os-support/Imakefile Thu Jan 20 03:31:37 2005 -@@ -15,6 +15,7 @@ - (defined(SunArchitecture) && defined(SparcArchitecture)) || \ - (defined(KFreeBSDArchitecture) && defined(AlphaArchitecture)) || \ - (defined(KFreeBSDArchitecture) && defined(Sparc64Architecture)) || \ -+ (defined(KFreeBSDArchitecture) && defined(PpcArchitecture)) || \ - (defined(KNetBSDArchitecture) && defined(AlphaArchitecture)) || \ - (defined(KNetBSDArchitecture) && defined(PpcArchitecture)) || \ - (defined(KNetBSDArchitecture) && defined(SparcArchitecture)) || \ diff --git a/x11-servers/xorg-server-snap/files/patch-pc98kbd b/x11-servers/xorg-server-snap/files/patch-pc98kbd deleted file mode 100644 index 7eb1a2d15342..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-pc98kbd +++ /dev/null @@ -1,39 +0,0 @@ ---- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig Tue Jan 11 06:59:02 2005 -+++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c Sun Apr 17 08:34:33 2005 -@@ -604,10 +604,12 @@ - * they need to get the same key code as the base key on the same - * physical keyboard key. - */ -- if (ModifierDown(AltMask) && (scanCode == KEY_SysReqest)) -- scanCode = KEY_Print; -- else if (scanCode == KEY_Break) -- scanCode = KEY_Pause; -+ if (!xf86IsPc98()) { -+ if (ModifierDown(AltMask) && (scanCode == KEY_SysReqest)) -+ scanCode = KEY_Print; -+ else if (scanCode == KEY_Break) -+ scanCode = KEY_Pause; -+ } - #endif - - /* ---- programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c.orig Tue Feb 8 18:14:07 2005 -+++ programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c Tue Feb 8 18:14:12 2005 -@@ -43,6 +43,9 @@ - case KEY_Prefix1: - pKbd->scanPrefix = *scanCode; /* special prefixes */ - return TRUE; -+ } -+ if (!xf86IsPc98()) { -+ switch (*scanCode) { - case 0x59: *scanCode = KEY_0x59; break; - case 0x5a: *scanCode = KEY_0x5A; break; - case 0x5b: *scanCode = KEY_0x5B; break; -@@ -71,6 +74,7 @@ - case 0x74: *scanCode = KEY_0x74; break; - case 0x75: *scanCode = KEY_0x75; break; - case 0x76: *scanCode = KEY_0x76; break; -+ } - } - break; - case KEY_Prefix0: diff --git a/x11-servers/xorg-server-snap/files/patch-xfree86-Imakefile b/x11-servers/xorg-server-snap/files/patch-xfree86-Imakefile deleted file mode 100644 index 2bd0fe1e1745..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xfree86-Imakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/Imakefile.orig Fri Dec 31 14:08:32 2004 -+++ programs/Xserver/hw/xfree86/Imakefile Fri Dec 31 14:08:34 2004 -@@ -217,8 +217,8 @@ - InstallManPage(Xorg,$(MANDIR)) - InstallGenManPage(xorg.conf,$(FILEMANDIR),$(FILEMANSUFFIX)) - -+InstallNamedNonExec($(XORGCONFIG),xorg.conf.eg,$(LIBDIR)) - #if 0 --InstallNamedNonExec($(XORGCONFIG),XF86Config.eg,$(LIBDIR)) - InstallNamedNonExec($(XF98CONFIG),XF86Config.98,$(LIBDIR)) - #endif - InstallNamedNonExec(Options,Options,$(LIBDIR)) |