diff options
Diffstat (limited to 'x11-servers/xorg-server-snap/files')
22 files changed, 0 insertions, 1110 deletions
diff --git a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf deleted file mode 100644 index b2c195f77b75..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf +++ /dev/null @@ -1,82 +0,0 @@ ---- config/cf/FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 -+++ config/cf/FreeBSD.cf Wed Dec 29 13:40:20 2004 -@@ -78,6 +78,7 @@ - #define HasIssetugid YES - #define HasPoll YES - #endif -+#define BuildHtmlManPages NO - - #if OSMajorVersion >= 4 - #define HasGetIfAddrs YES -@@ -116,15 +117,14 @@ - # endif - # if (OSRelVersion < 500043) - # define NeedUIThrStubs YES --# endif --# if (OSRelVersion >= 502102) --# define ThreadsLibraries -lpthread --# elif (OSRelVersion >= 500016) --# define ThreadsLibraries -lc_r -+# define BuildThreadStubLibrary YES -+# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) -+# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) - # else --# define ThreadsLibraries -pthread -+# define BuildThreadStubLibrary NO - # endif --# define SystemMTDefines -D_THREAD_SAFE -+# define ThreadsLibraries FreeBSDPTHREAD_LIBS -+# define SystemMTDefines FreeBSDPTHREAD_CFLAGS - #endif - - /* This fixes linking C programs against libGLU on FreeBSD 3.x */ -@@ -172,12 +172,14 @@ - #endif - #endif - --#ifndef CcCmd --#define CcCmd cc --#endif --#ifndef CplusplusCmd --#define CplusplusCmd c++ -+#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) -+#define CcCmd $(CLIENTENVSETUP) FreeBSDCC -+#define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX -+#else -+#define CcCmd FreeBSDCC -+#define CplusplusCmd FreeBSDCXX - #endif -+ - #define CppCmd /usr/bin/cpp - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional -@@ -338,7 +340,7 @@ - #ifndef LibraryRpathLoadFlags - # if UseRpath - # if UseElfFormat --# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH) -+# define LibraryRpathLoadFlags -Wl,-rpath $(USRLIBDIRPATH) - # else - # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) - # endif -@@ -463,18 +465,8 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 GccAliasingArgs --#endif --#endif -- --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags FreeBSDCFLAGS - - #ifndef PreIncDir - # define PreIncDir /usr/include diff --git a/x11-servers/xorg-server-snap/files/patch-Imake.rules b/x11-servers/xorg-server-snap/files/patch-Imake.rules deleted file mode 100644 index deea1cb886a6..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Imake.rules +++ /dev/null @@ -1,67 +0,0 @@ ---- config/cf/Imake.rules.orig Mon Dec 9 15:00:42 2002 -+++ config/cf/Imake.rules Mon Oct 13 17:04:19 2003 -@@ -1406,7 +1406,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef RmanDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanDependency() /**/ - #else - #define RmanDependency() @@\ -@@ -1421,7 +1421,7 @@ - #endif /* RmanDependency */ - - #ifndef RmanCmdDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanCmdDependency /**/ - #else - #define RmanCmdDependency ProgramTargetName($(RMAN)) -@@ -1874,7 +1874,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef DependDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define DependDependency() /**/ - #else - #define DependDependency() @@\ -@@ -1969,7 +1969,7 @@ - * within the source tree. - */ - #ifndef ImakeDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define ImakeDependency(target) /**/ - #else - #define ImakeDependency(target) @@\ -@@ -2066,11 +2066,18 @@ - * ProjectUnsharedLibReferences - variables for unshared libraries - */ - #ifndef ProjectUnsharedLibReferences -+#if defined(UseInstalledLibraries) -+#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ -+Concat3(DEP,varname,LIB) = @@\ -+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ -+LintLibReferences(varname,libname,libsource) -+#else - #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ - Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\ - Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ - LintLibReferences(varname,libname,libsource) - #endif -+#endif - - /* - * ProjectUnsharedFontLibReferences - unshared font libraries -@@ -3126,6 +3133,9 @@ - - #ifdef UseInstalled - #define ImakeSubCmdHelper $(IMAKE_CMD) -+#elif defined(UseInstalledPrograms) -+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) diff --git a/x11-servers/xorg-server-snap/files/patch-Imake.tmpl b/x11-servers/xorg-server-snap/files/patch-Imake.tmpl deleted file mode 100644 index 526e2e5de8a8..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Imake.tmpl +++ /dev/null @@ -1,75 +0,0 @@ ---- config/cf/Imake.tmpl.orig Mon Dec 9 19:20:41 2002 -+++ config/cf/Imake.tmpl Thu Jan 2 14:34:20 2003 -@@ -237,7 +237,8 @@ - - #ifndef RmanCmd - #if BuildRman --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RmanCmd rman - #else - #define RmanCmd $(TOP)/config/util/rman -@@ -1348,7 +1349,8 @@ - #define LoaderLibPrefix /**/ - #endif - #ifndef ImakeCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define ImakeCmd imake - #else - #define ImakeCmd $(IMAKESRC)/imake -@@ -1359,19 +1361,22 @@ - #endif - #ifndef DependCmd - #if UseGccMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd gccmakedep - #else - #define DependCmd $(DEPENDSRC)/gccmakedep - #endif - #elif UseCCMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd ccmakedep - #else - #define DependCmd $(DEPENDSRC)/ccmakedep - #endif - #else --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd makedepend - #else - #define DependCmd $(DEPENDSRC)/makedepend -@@ -1398,21 +1403,23 @@ - #ifndef ExportListCmd - # ifndef ExportListGenSource - # define ExportListCmd /**/ --# elif !defined(UseInstalled) -+# elif !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define ExportListCmd $(CONFIGSRC)/util/exportlistgen - # else - # define ExportListCmd exportlistgen - # endif - #endif - #ifndef MkdirHierCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define MkdirHierCmd mkdirhier - #else - #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh - #endif - #endif - #ifndef RevPathCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RevPathCmd revpath - #else - #define RevPathCmd $(CONFIGSRC)/util/revpath diff --git a/x11-servers/xorg-server-snap/files/patch-Library.tmpl b/x11-servers/xorg-server-snap/files/patch-Library.tmpl deleted file mode 100644 index e94aae3bfc60..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Library.tmpl +++ /dev/null @@ -1,21 +0,0 @@ ---- config/cf/Library.tmpl.orig Mon May 24 12:06:57 2004 -+++ config/cf/Library.tmpl Fri Sep 10 21:46:00 2004 -@@ -389,7 +389,7 @@ - */ - - #ifndef MakeStringsDependency --# ifndef UseInstalled -+# if !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define MakeStringsDependency @@\ - MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ - NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -399,7 +399,8 @@ - @@\ - includes:: HostProgramTargetName($(MAKESTRS)) - # else --# define MakeStringsDependency /**/ -+# define MakeStringsDependency @@\ -+MAKESTRS = makestrs - # endif - #endif - diff --git a/x11-servers/xorg-server-snap/files/patch-X11.rules b/x11-servers/xorg-server-snap/files/patch-X11.rules deleted file mode 100644 index 052e960127fc..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-X11.rules +++ /dev/null @@ -1,17 +0,0 @@ ---- config/cf/X11.rules.orig Sun May 30 12:49:38 2004 -+++ config/cf/X11.rules Sun May 30 12:50:02 2004 -@@ -23,6 +23,14 @@ - # define UseInstalledX11 YES - #endif - -+#ifndef UseInstalledPrograms -+# define UseInstalledPrograms NO -+#endif -+ -+#ifndef UseInstalledClients -+# define UseInstalledClients NO -+#endif -+ - #ifndef ImportX11 - # ifdef UseImports - # define ImportX11 YES diff --git a/x11-servers/xorg-server-snap/files/patch-X11.tmpl b/x11-servers/xorg-server-snap/files/patch-X11.tmpl deleted file mode 100644 index c27d14d8e1ec..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-X11.tmpl +++ /dev/null @@ -1,79 +0,0 @@ ---- X11.tmpl.orig Fri Sep 3 09:18:18 2004 -+++ config/cf/X11.tmpl Wed Dec 29 13:42:37 2004 -@@ -616,7 +616,7 @@ - #define BuildXft1Library BuildRenderLibrary - #endif - #ifndef UseFontconfig --#define UseFontconfig BuildXftLibrary -+#define UseFontconfig (BuildXftLibrary || BuildXft1Library) - #endif - #ifndef BuildFontconfigLibrary - #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) -@@ -773,6 +773,9 @@ - #ifndef ThreadedProject - #define ThreadedProject ThreadedX - #endif -+#ifndef BuildThreadStubLibrary -+#define BuildThreadStubLibrary NO -+#endif - #ifndef NeedUIThrStubs - #define NeedUIThrStubs NO - #endif -@@ -1606,7 +1609,7 @@ - #endif - - #ifndef PsWrap --# ifndef UseInstalled -+# if !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define PsWrap $(PSWRAPSRC)/pswrap - # else - # define PsWrap pswrap -@@ -1683,7 +1686,7 @@ - - INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ - --#if UseInstalledX11 -+#if UseInstalledX11 || UseInstalledClients - RGB = $(XBINDIR)/rgb - FONTC = $(XBINDIR)/bdftopcf - MKFONTSCALE = $(XBINDIR)/mkfontscale -@@ -1843,6 +1846,39 @@ - DEPXLIBONLY = $(DEPXONLYLIB) - XLIBONLY = $(XONLYLIB) - LINTXONLYLIB = $(LINTXONLY) -+ -+#if BuildThreadStubLibrary -+#ifndef SharedLibXThrStub -+#define SharedLibXThrStub YES -+#endif -+#ifndef NormalLibXThrStub -+#define NormalLibXThrStub NO -+#endif -+#ifndef DebugLibXThrStub -+#define DebugLibXThrStub NO -+#endif -+#ifndef ProfileLibXThrStub -+#define ProfileLibXThrStub NO -+#endif -+ XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub -+#if SharedLibXThrStub -+#ifndef SharedXThrStubRev -+#define SharedXThrStubRev 6.1 -+#endif -+SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev) -+#else -+ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) -+#endif -+#else -+#undef SharedLibXThrStub -+#define SharedLibXThrStub NO -+#undef NormalLibXThrStub -+#define NormalLibXThrStub NO -+#undef DebugLibXThrStub -+#define DebugLibXThrStub NO -+#undef ProfileLibXThrStub -+#define ProfileLibXThrStub NO -+#endif - - #if BuildScreenSaverLibrary - #ifndef SharedLibXss diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile b/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile deleted file mode 100644 index 5dab87bd4828..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile +++ /dev/null @@ -1,8 +0,0 @@ ---- programs/Xserver/Imakefile.orig Sat May 29 14:12:45 2004 -+++ programs/Xserver/Imakefile Sat May 29 14:12:16 2004 -@@ -1095,5 +1095,3 @@ - - DEFAULTFONTPATH = DefaultFontPath - EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`" -- --InstallManPage(Xserver,$(MANDIR)) 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-elfloader.c b/x11-servers/xorg-server-snap/files/patch-elfloader.c deleted file mode 100644 index d1942e55e8a5..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-elfloader.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: programs/Xserver/hw/xfree86/loader/elfloader.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -u -r1.3 -r1.4 ---- programs/Xserver/hw/xfree86/loader/elfloader.c 30 Oct 2004 20:33:43 -0000 1.3 -+++ programs/Xserver/hw/xfree86/loader/elfloader.c 9 Nov 2004 15:58:41 -0000 1.4 -@@ -1,4 +1,4 @@ --/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.3 2004/10/30 20:33:43 alanc Exp $ */ -+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.4 2004/11/09 15:58:41 ajax Exp $ */ - /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */ - - /* -@@ -1609,6 +1609,20 @@ - break; - } - -+ case R_ALPHA_SREL32: -+ { -+ dest32 = (unsigned int *)(secp + rel->r_offset); -+ symval += rel->r_addend; -+ symval -= (unsigned long) dest32; -+ if ((long)symval >= 0x80000000 -+ || (long)symval < -(long)0x80000000) -+ FatalError("R_ALPHA_SREL32 overflow for %s: %lx\n", -+ ElfGetSymbolName(elffile, ELF_R_SYM(rel->r_info)), -+ symval); -+ *dest32 = symval; -+ break; -+ } -+ - #endif /* alpha */ - #if defined(__mc68000__) - case R_68K_32: diff --git a/x11-servers/xorg-server-snap/files/patch-i810-6_8 b/x11-servers/xorg-server-snap/files/patch-i810-6_8 deleted file mode 100644 index 698da0065d1a..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-i810-6_8 +++ /dev/null @@ -1,437 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/i810/common.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/common.h 22 Jun 2004 14:28:46 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/i810/common.h 15 Dec 2004 09:35:23 -0000 1.3.4.1 -@@ -173,7 +173,7 @@ - #define BEGIN_LP_RING(n) \ - unsigned int outring, ringmask; \ - volatile unsigned char *virt; \ -- unsigned int needed; \ -+ int needed; \ - if ((n) & 1) \ - ErrorF("BEGIN_LP_RING called with odd argument: %d\n", n); \ - if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) \ -@@ -206,7 +206,7 @@ - #define BEGIN_LP_RING(n) \ - unsigned int outring, ringmask; \ - volatile unsigned char *virt; \ -- unsigned int needed; \ -+ int needed; \ - if ((n) & 1) \ - ErrorF("BEGIN_LP_RING called with odd argument: %d\n", n); \ - if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) \ -Index: programs/Xserver/hw/xfree86/drivers/i810/i810.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810.h 22 Jun 2004 14:28:46 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810.h 15 Dec 2004 09:35:23 -0000 1.4.4.1 -@@ -172,7 +172,7 @@ - unsigned long OverlayPhysical; - unsigned long OverlayStart; - int colorKey; -- int surfaceAllocation[I810_TOTAL_SURFACES]; -+ unsigned int surfaceAllocation[I810_TOTAL_SURFACES]; - int numSurfaces; - - DGAModePtr DGAModes; -@@ -295,9 +295,10 @@ - extern void I810Sync(ScrnInfoPtr pScrn); - extern unsigned long I810LocalToPhysical(ScrnInfoPtr pScrn, - unsigned long local); --extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, int size); -+extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, -+ int size); - extern int I810AllocHigh(I810MemRange * result, I810MemRange * pool, -- int size); -+ int size); - extern Bool I810AllocateFront(ScrnInfoPtr pScrn); - - extern int I810AllocateGARTMemory(ScrnInfoPtr pScrn); -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -u -u -r1.4 -r1.4.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c 30 Jul 2004 20:30:52 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c 15 Dec 2004 09:35:23 -0000 1.4.2.1 -@@ -259,7 +259,7 @@ - #ifdef XF86DRI - /* VT switching tries to do this. - */ -- if (!pI810->LockHeld && pI810->directRenderingEnabled) { -+ if ((!pI810->LockHeld && pI810->directRenderingEnabled) || !pScrn->vtSema) { - return; - } - #endif -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c 22 Jun 2004 14:28:46 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c 15 Dec 2004 09:35:23 -0000 1.4.4.1 -@@ -290,7 +290,7 @@ - unsigned long dcacheHandle; - int sysmem_size = 0; - int back_size = 0; -- int pitch_idx = 0; -+ unsigned int pitch_idx = 0; - int bufs; - int width = pScrn->displayWidth * pI810->cpp; - int i; -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v -retrieving revision 1.9 -retrieving revision 1.9.2.1 -diff -u -u -r1.9 -r1.9.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 25 Aug 2004 00:30:41 -0000 1.9 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 15 Dec 2004 09:35:23 -0000 1.9.2.1 -@@ -1124,14 +1124,6 @@ - xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr); - xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr); - -- pI810->LpRing = xalloc(sizeof(I810RingBuffer)); -- if (!pI810->LpRing) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "Could not allocate lpring data structure.\n"); -- I810FreeRec(pScrn); -- return FALSE; -- } -- - return TRUE; - } - -@@ -1159,7 +1151,7 @@ - I810MapMem(ScrnInfoPtr pScrn) - { - I810Ptr pI810 = I810PTR(pScrn); -- unsigned i; -+ long i; - - for (i = 2; i < pI810->FbMapSize; i <<= 1) ; - pI810->FbMapSize = i; -@@ -2074,6 +2066,13 @@ - pI810 = I810PTR(pScrn); - hwp = VGAHWPTR(pScrn); - -+ pI810->LpRing = xcalloc(sizeof(I810RingBuffer),1); -+ if (!pI810->LpRing) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Could not allocate lpring data structure.\n"); -+ return FALSE; -+ } -+ - miClearVisualTypes(); - - /* Re-implemented Direct Color support, -jens */ -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -u -u -r1.4 -r1.4.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 30 Aug 2004 03:19:08 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 15 Dec 2004 09:35:23 -0000 1.4.2.1 -@@ -55,7 +55,7 @@ - int - I810AllocLow(I810MemRange * result, I810MemRange * pool, int size) - { -- if (size > pool->Size) -+ if (size > (long)pool->Size) - return 0; - - pool->Size -= size; -@@ -69,7 +69,7 @@ - int - I810AllocHigh(I810MemRange * result, I810MemRange * pool, int size) - { -- if (size > pool->Size) -+ if (size > (long)pool->Size) - return 0; - - pool->Size -= size; -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h,v -retrieving revision 1.3 -retrieving revision 1.3.4.1 -diff -u -u -r1.3 -r1.3.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h 22 Jun 2004 14:28:46 -0000 1.3 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h 15 Dec 2004 09:35:23 -0000 1.3.4.1 -@@ -459,11 +459,11 @@ - #define I830_HEAD_MASK 0x001FFFFC - - #define RING_START 0x08 --#define START_ADDR 0x00FFFFF8 -+#define START_ADDR 0x03FFFFF8 - #define I830_RING_START_MASK 0xFFFFF000 - - #define RING_LEN 0x0C --#define RING_NR_PAGES 0x000FF000 -+#define RING_NR_PAGES 0x001FF000 - #define I830_RING_NR_PAGES 0x001FF000 - #define RING_REPORT_MASK 0x00000006 - #define RING_REPORT_64K 0x00000002 -Index: programs/Xserver/hw/xfree86/drivers/i810/i830.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v -retrieving revision 1.5 -retrieving revision 1.5.4.1 -diff -u -u -r1.5 -r1.5.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i830.h 6 Jul 2004 14:37:47 -0000 1.5 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830.h 15 Dec 2004 09:35:23 -0000 1.5.4.1 -@@ -180,17 +180,17 @@ - int CacheLines; - - /* These are set in PreInit and never changed. */ -- unsigned long FbMapSize; -- unsigned long TotalVideoRam; -+ long FbMapSize; -+ long TotalVideoRam; - I830MemRange StolenMemory; /* pre-allocated memory */ -- unsigned long BIOSMemorySize; /* min stolen pool size */ -+ long BIOSMemorySize; /* min stolen pool size */ - int BIOSMemSizeLoc; - - /* These change according to what has been allocated. */ - long FreeMemory; - I830MemRange MemoryAperture; - I830MemPool StolenPool; -- unsigned long allocatedMemory; -+ long allocatedMemory; - - /* Regions allocated either from the above pools, or from agpgart. */ - /* for single and dual head configurations */ -@@ -348,7 +348,7 @@ - int xoffset; - int yoffset; - -- int SaveGeneration; -+ unsigned int SaveGeneration; - Bool vbeRestoreWorkaround; - Bool displayInfo; - Bool devicePresence; -@@ -415,7 +415,7 @@ - extern Bool I830BindGARTMemory(ScrnInfoPtr pScrn); - extern Bool I830UnbindGARTMemory(ScrnInfoPtr pScrn); - extern unsigned long I830AllocVidMem(ScrnInfoPtr pScrn, I830MemRange *result, -- I830MemPool *pool, unsigned long size, -+ I830MemPool *pool, long size, - unsigned long alignment, int flags); - - extern void I830PrintAllRegisters(I830RegPtr i830Reg); -Index: programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v -retrieving revision 1.6 -retrieving revision 1.6.2.1 -diff -u -u -r1.6 -r1.6.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 30 Jul 2004 20:38:27 -0000 1.6 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 15 Dec 2004 09:35:23 -0000 1.6.2.1 -@@ -594,6 +594,7 @@ - I830Ptr pI830 = I830PTR(pScrn); - vbeInfoPtr pVbe = pI830->pVbe; - CARD32 temp; -+ - #ifdef I915G_WORKAROUND - int getmode; - int mode; -@@ -1018,7 +1019,7 @@ - I830MapMem(ScrnInfoPtr pScrn) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned i; -+ long i; - - for (i = 2; i < pI830->FbMapSize; i <<= 1) ; - pI830->FbMapSize = i; -@@ -2898,7 +2899,7 @@ - OUTREG(LP_RING + RING_TAIL, 0); - OUTREG(LP_RING + RING_HEAD, 0); - -- if ((pI830->LpRing->mem.Start & I830_RING_START_MASK) != -+ if ((long)(pI830->LpRing->mem.Start & I830_RING_START_MASK) != - pI830->LpRing->mem.Start) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "I830SetRingRegs: Ring buffer start (%lx) violates its " -@@ -3441,7 +3442,7 @@ - I830Ptr pI8301 = I830PTR(pI830->entityPrivate->pScrn_1); - - temp = INREG(stridereg); -- if (temp / pI8301->cpp != pI830->entityPrivate->pScrn_1->displayWidth) { -+ if (temp / pI8301->cpp != (CARD32)(pI830->entityPrivate->pScrn_1->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(pI830->pipe), - (int)(temp / pI8301->cpp), pI830->entityPrivate->pScrn_1->displayWidth); -@@ -3459,7 +3460,7 @@ - sizereg = pI830->pipe ? DSPASIZE : DSPBSIZE; - - temp = INREG(stridereg); -- if (temp / pI8302->cpp != pI830->entityPrivate->pScrn_2->displayWidth) { -+ if (temp / pI8302->cpp != (CARD32)(pI830->entityPrivate->pScrn_2->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(!pI830->pipe), - (int)(temp / pI8302->cpp), pI830->entityPrivate->pScrn_2->displayWidth); -@@ -3478,7 +3479,7 @@ - I830Ptr pI8302 = I830PTR(pI830->entityPrivate->pScrn_2); - - temp = INREG(stridereg); -- if (temp / pI8301->cpp != pI830->entityPrivate->pScrn_1->displayWidth) { -+ if (temp / pI8301->cpp != (CARD32)(pI830->entityPrivate->pScrn_1->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(pI830->pipe), - (int)(temp / pI8301->cpp), pI830->entityPrivate->pScrn_1->displayWidth); -@@ -3494,7 +3495,7 @@ - sizereg = !pI830->pipe ? DSPASIZE : DSPBSIZE; - - temp = INREG(stridereg); -- if (temp / pI8302->cpp != pI830->entityPrivate->pScrn_2->displayWidth) { -+ if (temp / pI8302->cpp != ((CARD32)pI830->entityPrivate->pScrn_2->displayWidth)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(!pI830->pipe), - (int)(temp / pI8302->cpp), pI830->entityPrivate->pScrn_2->displayWidth); -@@ -3515,7 +3516,7 @@ - continue; - - temp = INREG(stridereg); -- if (temp / pI830->cpp != pScrn->displayWidth) { -+ if (temp / pI830->cpp != (CARD32)pScrn->displayWidth) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(i), - (int)(temp / pI830->cpp), pScrn->displayWidth); -@@ -4354,6 +4355,9 @@ - SaveHWOperatingState(pScrn); - #endif - -+ ResetState(pScrn, TRUE); -+ RestoreHWState(pScrn); -+ - if (IsPrimary(pScrn)) { - if (!SetDisplayDevices(pScrn, pI830->savedDevices)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -@@ -4365,8 +4369,6 @@ - } - } - -- ResetState(pScrn, TRUE); -- RestoreHWState(pScrn); - RestoreBIOSMemSize(pScrn); - if (IsPrimary(pScrn)) - I830UnbindGARTMemory(pScrn); -@@ -4506,7 +4508,8 @@ - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - I830Ptr pI830 = I830PTR(pScrn); - Bool on = xf86IsUnblank(mode); -- CARD32 temp, ctrl, base, i; -+ CARD32 temp, ctrl, base; -+ int i; - - DPRINTF(PFX, "I830BIOSSaveScreen: %d, on is %s\n", mode, BOOLTOSTRING(on)); - -Index: programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v -retrieving revision 1.4 -retrieving revision 1.4.4.1 -diff -u -u -r1.4 -r1.4.4.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 6 Jul 2004 14:37:47 -0000 1.4 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 15 Dec 2004 09:35:23 -0000 1.4.4.1 -@@ -63,10 +63,10 @@ - */ - static unsigned long - AllocFromPool(ScrnInfoPtr pScrn, I830MemRange *result, I830MemPool *pool, -- unsigned long size, unsigned long alignment, int flags) -+ long size, unsigned long alignment, int flags) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned long needed, start, end; -+ long needed, start, end; - Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0); - - if (!result || !pool || !size) -@@ -94,7 +94,7 @@ - } - } - if (needed > pool->Free.Size) { -- unsigned long extra; -+ long extra; - /* See if the pool can be grown. */ - if (pI830->StolenOnly && !dryrun) - return 0; -@@ -107,7 +107,7 @@ - return 0; - } - -- if (!dryrun && (extra > pI830->MemoryAperture.Size)) -+ if (!dryrun && ((long)extra > pI830->MemoryAperture.Size)) - return 0; - - pool->Free.Size += extra; -@@ -136,7 +136,7 @@ - } - - static unsigned long --AllocFromAGP(ScrnInfoPtr pScrn, I830MemRange *result, unsigned long size, -+AllocFromAGP(ScrnInfoPtr pScrn, I830MemRange *result, long size, - unsigned long alignment, int flags) - { - I830Ptr pI830 = I830PTR(pScrn); -@@ -212,7 +212,7 @@ - - unsigned long - I830AllocVidMem(ScrnInfoPtr pScrn, I830MemRange *result, I830MemPool *pool, -- unsigned long size, unsigned long alignment, int flags) -+ long size, unsigned long alignment, int flags) - { - I830Ptr pI830 = I830PTR(pScrn); - Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0); -@@ -392,7 +392,7 @@ - I830Allocate2DMemory(ScrnInfoPtr pScrn, const int flags) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned long size, alloced; -+ long size, alloced; - Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0); - int verbosity = dryrun ? 4 : 1; - const char *s = dryrun ? "[dryrun] " : ""; -@@ -610,9 +610,9 @@ - return FALSE; - } - } else { -- unsigned long lineSize; -- unsigned long extra = 0; -- unsigned long maxFb = 0; -+ long lineSize; -+ long extra = 0; -+ long maxFb = 0; - - /* - * XXX Need to "free" up any 3D allocations if the DRI ended up -@@ -857,7 +857,7 @@ - I830GetExcessMemoryAllocations(ScrnInfoPtr pScrn) - { - I830Ptr pI830 = I830PTR(pScrn); -- unsigned long allocated; -+ long allocated; - - allocated = pI830->StolenPool.Total.Size + pI830->allocatedMemory; - if (allocated > pI830->TotalVideoRam) -@@ -1367,7 +1367,7 @@ - I830Ptr pI830 = I830PTR(pScrn); - int pitch, ntiles, i; - static int nextTile = 0; -- static int tileGeneration = -1; -+ static unsigned int tileGeneration = -1; - - #if 0 - /* Hack to "improve" the alignment of the front buffer. diff --git a/x11-servers/xorg-server-snap/files/patch-i830_video.c b/x11-servers/xorg-server-snap/files/patch-i830_video.c deleted file mode 100644 index 259ad42669c1..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-i830_video.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig Fri Dec 31 13:43:36 2004 -+++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c Fri Dec 31 13:44:22 2004 -@@ -632,7 +632,7 @@ - pPriv->gamma0 = 0x080808; - - /* gotta uninit this someplace */ -- REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); -+ REGION_NULL(pScreen, &pPriv->clip); - - pI830->adaptor = adapt; - 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-os-Imakefile b/x11-servers/xorg-server-snap/files/patch-os-Imakefile deleted file mode 100644 index 5251895774ad..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-os-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/os/Imakefile.orig Sat May 8 18:00:52 2004 -+++ programs/Xserver/os/Imakefile Sat May 8 18:01:08 2004 -@@ -132,7 +132,7 @@ - $(RANDOM_DEFINES) - INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \ -- -I$(TOP)/lib/Xau -I../lbx Krb5Includes -+ -I$(TOP)/lib/Xau -I../lbx Krb5Includes -I$(INCROOT)/X11 - DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \ - $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines - LINTLIBS = ../dix/llib-ldix.ln diff --git a/x11-servers/xorg-server-snap/files/patch-savage-pci-id b/x11-servers/xorg-server-snap/files/patch-savage-pci-id deleted file mode 100644 index f7396543d878..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-savage-pci-id +++ /dev/null @@ -1,87 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes 2003-01-08 04:28:57.000000000 -0500 -+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-01-08 05:28:02.000000000 -0500 -@@ -457,21 +457,34 @@ - #define PCI_CHIP_TRIO64V2_DXGX 0x8901 - #define PCI_CHIP_PLATO_PX 0x8902 - #define PCI_CHIP_Trio3D 0x8904 --#define PCI_CHIP_Trio3D_2X 0x8A13 - #define PCI_CHIP_VIRGE_DXGX 0x8A01 - #define PCI_CHIP_VIRGE_GX2 0x8A10 -+#define PCI_CHIP_Trio3D_2X 0x8A13 - #define PCI_CHIP_SAVAGE3D 0x8A20 - #define PCI_CHIP_SAVAGE3D_MV 0x8A21 - #define PCI_CHIP_SAVAGE4 0x8A22 --#define PCI_CHIP_VIRGE_MX 0x8C01 --#define PCI_CHIP_VIRGE_MXPLUS 0x8C01 --#define PCI_CHIP_VIRGE_MXP 0x8C03 - #define PCI_CHIP_PROSAVAGE_PM 0x8A25 - #define PCI_CHIP_PROSAVAGE_KM 0x8A26 -+#define PCI_CHIP_VIRGE_MX 0x8C01 -+#define PCI_CHIP_VIRGE_MXPLUS 0x8C02 -+#define PCI_CHIP_VIRGE_MXP 0x8C03 - #define PCI_CHIP_SAVAGE_MX_MV 0x8C10 - #define PCI_CHIP_SAVAGE_MX 0x8C11 - #define PCI_CHIP_SAVAGE_IX_MV 0x8C12 - #define PCI_CHIP_SAVAGE_IX 0x8C13 -+#define PCI_CHIP_SUPSAV_MX128 0x8C22 -+#define PCI_CHIP_SUPSAV_MX64 0x8C24 -+#define PCI_CHIP_SUPSAV_MX64C 0x8C26 -+#define PCI_CHIP_SUPSAV_IX128SDR 0x8C2A -+#define PCI_CHIP_SUPSAV_IX128DDR 0x8C2B -+#define PCI_CHIP_SUPSAV_IX64SDR 0x8C2C -+#define PCI_CHIP_SUPSAV_IX64DDR 0x8C2D -+#define PCI_CHIP_SUPSAV_IXCSDR 0x8C2E -+#define PCI_CHIP_SUPSAV_IXCDDR 0x8C2F -+#define PCI_CHIP_S3TWISTER_P 0x8D01 -+#define PCI_CHIP_S3TWISTER_K 0x8D02 -+#define PCI_CHIP_PROSAVAGE_DDR 0x8D03 -+#define PCI_CHIP_PROSAVAGE_DDRK 0x8D04 - #define PCI_CHIP_SAVAGE2000 0x9102 - - /* ARK Logic */ ---- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes 2003-01-08 05:31:06.000000000 -0500 -+++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 2003-01-08 05:31:25.000000000 -0500 -@@ -3,30 +3,6 @@ - #ifndef _SAVAGE_REGS_H - #define _SAVAGE_REGS_H - --/* These are here until xf86PciInfo.h is updated. */ -- --#ifndef PCI_CHIP_S3TWISTER_P --#define PCI_CHIP_S3TWISTER_P 0x8d01 --#endif --#ifndef PCI_CHIP_S3TWISTER_K --#define PCI_CHIP_S3TWISTER_K 0x8d02 --#endif --#ifndef PCI_CHIP_SUPSAV_MX128 --#define PCI_CHIP_SUPSAV_MX128 0x8c22 --#define PCI_CHIP_SUPSAV_MX64 0x8c24 --#define PCI_CHIP_SUPSAV_MX64C 0x8c26 --#define PCI_CHIP_SUPSAV_IX128SDR 0x8c2a --#define PCI_CHIP_SUPSAV_IX128DDR 0x8c2b --#define PCI_CHIP_SUPSAV_IX64SDR 0x8c2c --#define PCI_CHIP_SUPSAV_IX64DDR 0x8c2d --#define PCI_CHIP_SUPSAV_IXCSDR 0x8c2e --#define PCI_CHIP_SUPSAV_IXCDDR 0x8c2f --#endif --#ifndef PCI_CHIP_PROSAVAGE_DDR --#define PCI_CHIP_PROSAVAGE_DDR 0x8d03 --#define PCI_CHIP_PROSAVAGE_DDRK 0x8d04 --#endif -- - #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX)) - - #define S3_SAVAGE4_SERIES(chip) ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE)) ---- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes 2003-01-08 06:28:59.000000000 -0500 -+++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2003-01-08 06:33:02.000000000 -0500 -@@ -123,8 +123,8 @@ - { PCI_CHIP_SAVAGE_IX, "Savage/IX" }, - { PCI_CHIP_PROSAVAGE_PM, "ProSavage PM133" }, - { PCI_CHIP_PROSAVAGE_KM, "ProSavage KM133" }, -- { PCI_CHIP_S3TWISTER_P, "ProSavage PN133" }, -- { PCI_CHIP_S3TWISTER_K, "ProSavage KN133" }, -+ { PCI_CHIP_S3TWISTER_P, "Twister PN133" }, -+ { PCI_CHIP_S3TWISTER_K, "Twister KN133" }, - { PCI_CHIP_SUPSAV_MX128, "SuperSavage/MX 128" }, - { PCI_CHIP_SUPSAV_MX64, "SuperSavage/MX 64" }, - { PCI_CHIP_SUPSAV_MX64C, "SuperSavage/MX 64C" }, diff --git a/x11-servers/xorg-server-snap/files/patch-xf86.tmpl b/x11-servers/xorg-server-snap/files/patch-xf86.tmpl deleted file mode 100644 index 3bf0b443d5f8..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86.tmpl +++ /dev/null @@ -1,12 +0,0 @@ ---- config/cf/xf86.tmpl.orig Tue Dec 17 04:21:38 2002 -+++ config/cf/xf86.tmpl Thu Jan 2 14:10:44 2003 -@@ -19,6 +19,9 @@ - #ifdef UseInstalled - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -+#elif UseInstalledPrograms -+ IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) 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 bdd5bc51c819..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86Events.c +++ /dev/null @@ -1,76 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig Sun Sep 26 04:17:42 2004 -+++ programs/Xserver/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-xf86cfg-Imakefile b/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile deleted file mode 100644 index 5728d915fb48..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Sat Sep 11 15:11:04 2004 -+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Sep 11 15:11:07 2004 -@@ -25,6 +25,8 @@ - SNPRINTFOBJS = snprintf.o - #endif - -+XAWLIB = -lXaw -+ - SRCS =\ - accessx.c\ - card-cfg.c\ diff --git a/x11-servers/xorg-server-snap/files/patch-xf86sym.c b/x11-servers/xorg-server-snap/files/patch-xf86sym.c deleted file mode 100644 index 1372be144354..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86sym.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/xf86sym.c.orig Fri May 7 18:51:51 2004 -+++ programs/Xserver/hw/xfree86/loader/xf86sym.c Fri May 7 18:52:02 2004 -@@ -63,7 +63,6 @@ - #include "xf86.h" - #include "xf86Resources.h" - #include "xf86_OSproc.h" --#include "xf86Parser.h" - #include "xf86Config.h" - #ifdef XINPUT - # include "xf86Xinput.h" 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)) diff --git a/x11-servers/xorg-server-snap/files/patch-xkbout.c b/x11-servers/xorg-server-snap/files/patch-xkbout.c deleted file mode 100644 index 963e881d86f7..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xkbout.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/xkbfile/xkbout.c.orig Fri May 7 18:05:29 2004 -+++ lib/xkbfile/xkbout.c Fri May 7 18:05:29 2004 -@@ -54,7 +54,6 @@ - #include "XKBsrv.h" - - #include <X11/extensions/XKBgeom.h> --#include "extensions/XKBfile.h" - - #endif - 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 e21fac8d8484..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- programs/Xserver/hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004 -+++ programs/Xserver/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 diff --git a/x11-servers/xorg-server-snap/files/patch-xorgconfig.c b/x11-servers/xorg-server-snap/files/patch-xorgconfig.c deleted file mode 100644 index 650360ec75fe..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xorgconfig.c +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Mon Nov 8 22:18:58 2004 -+++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Mon Nov 8 22:19:22 2004 -@@ -854,8 +854,7 @@ - "which is the rate at which scanlines are displayed.\n" - "\n" - "The valid range for horizontal sync and vertical sync should be documented\n" --"in the manual of your monitor. If in doubt, check the monitor database\n" --TREEROOTDOC "/Monitors to see if your monitor is there.\n" -+"in the manual of your monitor.\n" - "\n"; - - static char *hsyncintro_text = |