diff options
Diffstat (limited to 'x11-servers/XFree86-4-Server-snap/files')
7 files changed, 0 insertions, 429 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h deleted file mode 100644 index f7286b494cea..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Tue Mar 4 16:42:16 2003 -+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Tue Mar 4 16:42:21 2003 -@@ -230,6 +230,10 @@ - # define ARCH_PCI_INIT linuxPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN -+# elif defined(FreeBSD) -+# define ARCH_PCI_INIT freebsdPciInit -+# define INCLUDE_XF86_MAP_PCI_MEM -+# define INCLUDE_XF86_NO_DOMAIN - # endif - # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper - #elif defined(__i386__) diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c deleted file mode 100644 index 741664e27713..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c +++ /dev/null @@ -1,35 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Tue Oct 29 15:19:13 2002 -+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Tue Mar 4 16:28:04 2003 -@@ -33,7 +33,10 @@ - #include <sys/param.h> - #ifndef __NetBSD__ - # include <sys/sysctl.h> --# else -+# ifdef __FreeBSD__ -+# include <machine/sysarch.h> -+# endif -+#else - # include <machine/sysarch.h> - #endif - #include "xf86Axp.h" -@@ -51,6 +54,8 @@ - #define MAP_FAILED ((caddr_t)-1) - #endif - -+axpDevice bsdGetAXP(void); -+ - #ifndef __NetBSD__ - extern unsigned long dense_base(void); - -@@ -260,10 +265,10 @@ - #endif /* __OpenBSD__ */ - - xf86ErrorF("\tlinear framebuffer access unavailable\n"); -+#endif - } - useDevMem = FALSE; - return; --#endif - } - - void diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c deleted file mode 100644 index 13228b270c5b..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig Wed Jan 29 11:29:49 2003 -+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c Thu Mar 13 00:12:12 2003 -@@ -304,7 +304,10 @@ - "drmAgpVendorId", - "drmCommandNone", - "drmCommandWrite", -+ "drmCtlInstHandler", -+ "drmCtlUninstHandler", - "drmFreeVersion", -+ "drmGetInterruptFromBusID", - "drmGetLibVersion", - "drmGetVersion", - "drmMap", diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c deleted file mode 100644 index 6274de047f4e..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c +++ /dev/null @@ -1,30 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Tue Feb 18 17:19:41 2003 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Thu Mar 13 00:12:12 2003 -@@ -275,6 +275,7 @@ - "drmAddMap", - "drmAgpAcquire", - "drmAgpAlloc", -+ "drmAgpBase", - "drmAgpBind", - "drmAgpDeviceId", - "drmAgpEnable", -@@ -288,8 +289,11 @@ - "drmCommandRead", - "drmCommandWrite", - "drmCommandWriteRead", -+ "drmCtlInstHandler", -+ "drmCtlUninstHandler", - "drmFreeBufs", - "drmFreeVersion", -+ "drmGetInterruptFromBusID", - "drmGetLibVersion", - "drmGetVersion", - "drmMap", -@@ -307,6 +311,7 @@ - "DRICreateInfoRec", - "DRIDestroyInfoRec", - "DRIFinishScreenInit", -+ "DRIGetDeviceInfo", - "DRIGetSAREAPrivate", - "DRILock", - "DRIQueryVersion", diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-radeondri b/x11-servers/XFree86-4-Server-snap/files/patch-radeondri deleted file mode 100644 index 33d2bc6562b4..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-radeondri +++ /dev/null @@ -1,234 +0,0 @@ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_context.c lib/GL/mesa/src/drv/r200/r200_context.c ---- lib/GL/mesa/src/drv.orig/r200/r200_context.c Tue Mar 11 17:51:23 2003 -+++ lib/GL/mesa/src/drv/r200/r200_context.c Tue Mar 11 17:46:57 2003 -@@ -391,6 +391,7 @@ - */ - _tnl_destroy_pipeline( ctx ); - _tnl_install_pipeline( ctx, r200_pipeline ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - - /* Try and keep materials and vertices separate: - */ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c lib/GL/mesa/src/drv/r200/r200_swtcl.c ---- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/r200/r200_swtcl.c Tue Mar 11 17:46:57 2003 -@@ -44,6 +44,7 @@ - #include "math/m_translate.h" - #include "tnl/tnl.h" - #include "tnl/t_context.h" -+#include "tnl/t_imm_exec.h" - #include "tnl/t_pipeline.h" - - #include "r200_context.h" -@@ -1220,6 +1221,14 @@ - r200ChooseVertexState( ctx ); - } - -+ -+void r200FlushVertices( GLcontext *ctx, GLuint flags ) -+{ -+ _tnl_flush_vertices( ctx, flags ); -+ -+ if (flags & FLUSH_STORED_VERTICES) -+ R200_FIREVERTICES( R200_CONTEXT( ctx ) ); -+} - - /**********************************************************************/ - /* Initialization. */ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h lib/GL/mesa/src/drv/r200/r200_swtcl.h ---- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/r200/r200_swtcl.h Tue Mar 11 17:46:57 2003 -@@ -42,6 +42,7 @@ - extern void r200InitSwtcl( GLcontext *ctx ); - extern void r200DestroySwtcl( GLcontext *ctx ); - -+extern void r200FlushVertices( GLcontext *ctx, GLuint flags ); - extern void r200ChooseRenderState( GLcontext *ctx ); - extern void r200ChooseVertexState( GLcontext *ctx ); - -diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c lib/GL/mesa/src/drv/r200/r200_vtxfmt.c ---- lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/r200/r200_vtxfmt.c Tue Mar 11 17:47:00 2003 -@@ -38,6 +38,7 @@ - #include "r200_ioctl.h" - #include "r200_tex.h" - #include "r200_tcl.h" -+#include "r200_swtcl.h" - #include "r200_vtxfmt.h" - - #include "api_noop.h" -@@ -59,7 +60,7 @@ - - struct r200_vb vb; - --static void r200FlushVertices( GLcontext *, GLuint ); -+static void r200VtxFmtFlushVertices( GLcontext *, GLuint ); - - static void count_func( const char *name, struct dynfn *l ) - { -@@ -357,12 +358,13 @@ - fprintf(stderr, "%s from %s\n", __FUNCTION__, caller); - - if (ctx->Driver.NeedFlush) -- r200FlushVertices( ctx, ctx->Driver.NeedFlush ); -+ r200VtxFmtFlushVertices( ctx, ctx->Driver.NeedFlush ); - - if (ctx->NewState) - _mesa_update_state( ctx ); /* clear state so fell_back sticks */ - - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - - assert( rmesa->dma.flush == 0 ); - rmesa->vb.fell_back = GL_TRUE; -@@ -404,6 +406,7 @@ - prim = rmesa->vb.prim[0]; - ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1; - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - - assert(rmesa->dma.flush == 0); - rmesa->vb.fell_back = GL_TRUE; -@@ -756,7 +759,7 @@ - fprintf(stderr, "reinstall (new install)\n"); - - _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt ); -- ctx->Driver.FlushVertices = r200FlushVertices; -+ ctx->Driver.FlushVertices = r200VtxFmtFlushVertices; - ctx->Driver.NewList = r200NewList; - rmesa->vb.installed = GL_TRUE; - vb.context = ctx; -@@ -772,6 +775,7 @@ - if (rmesa->dma.flush) - rmesa->dma.flush( rmesa ); - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - rmesa->vb.installed = GL_FALSE; - vb.context = 0; - } -@@ -931,7 +935,7 @@ - return GL_TRUE; - } - --static void r200FlushVertices( GLcontext *ctx, GLuint flags ) -+static void r200VtxFmtFlushVertices( GLcontext *ctx, GLuint flags ) - { - r200ContextPtr rmesa = R200_CONTEXT( ctx ); - -diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_context.c lib/GL/mesa/src/drv/radeon/radeon_context.c ---- lib/GL/mesa/src/drv.orig/radeon/radeon_context.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/radeon/radeon_context.c Tue Mar 11 17:47:00 2003 -@@ -382,6 +382,7 @@ - */ - _tnl_destroy_pipeline( ctx ); - _tnl_install_pipeline( ctx, radeon_pipeline ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - - /* Try and keep materials and vertices separate: - */ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c lib/GL/mesa/src/drv/radeon/radeon_swtcl.c ---- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.c Tue Mar 11 17:47:00 2003 -@@ -45,6 +45,7 @@ - #include "math/m_translate.h" - #include "tnl/tnl.h" - #include "tnl/t_context.h" -+#include "tnl/t_imm_exec.h" - #include "tnl/t_pipeline.h" - - #include "radeon_context.h" -@@ -1133,6 +1134,14 @@ - } - } - -+ -+void radeonFlushVertices( GLcontext *ctx, GLuint flags ) -+{ -+ _tnl_flush_vertices( ctx, flags ); -+ -+ if (flags & FLUSH_STORED_VERTICES) -+ RADEON_FIREVERTICES( RADEON_CONTEXT( ctx ) ); -+} - - /**********************************************************************/ - /* Initialization. */ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h lib/GL/mesa/src/drv/radeon/radeon_swtcl.h ---- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.h Tue Mar 11 17:47:00 2003 -@@ -43,6 +43,7 @@ - extern void radeonInitSwtcl( GLcontext *ctx ); - extern void radeonDestroySwtcl( GLcontext *ctx ); - -+extern void radeonFlushVertices( GLcontext *ctx, GLuint flags ); - extern void radeonChooseRenderState( GLcontext *ctx ); - extern void radeonChooseVertexState( GLcontext *ctx ); - -diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c ---- lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c Tue Mar 11 17:47:01 2003 -@@ -38,6 +38,7 @@ - #include "radeon_ioctl.h" - #include "radeon_tex.h" - #include "radeon_tcl.h" -+#include "radeon_swtcl.h" - #include "radeon_vtxfmt.h" - - #include "api_noop.h" -@@ -59,7 +60,7 @@ - - struct radeon_vb vb; - --static void radeonFlushVertices( GLcontext *, GLuint ); -+static void radeonVtxfmtFlushVertices( GLcontext *, GLuint ); - - static void count_func( const char *name, struct dynfn *l ) - { -@@ -336,12 +337,13 @@ - fprintf(stderr, "%s from %s\n", __FUNCTION__, caller); - - if (ctx->Driver.NeedFlush) -- radeonFlushVertices( ctx, ctx->Driver.NeedFlush ); -+ radeonVtxfmtFlushVertices( ctx, ctx->Driver.NeedFlush ); - - if (ctx->NewState) - _mesa_update_state( ctx ); /* clear state so fell_back sticks */ - - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - - assert( rmesa->dma.flush == 0 ); - rmesa->vb.fell_back = GL_TRUE; -@@ -382,6 +384,7 @@ - prim = rmesa->vb.prim[0]; - ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1; - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - - assert(rmesa->dma.flush == 0); - rmesa->vb.fell_back = GL_TRUE; -@@ -731,7 +734,7 @@ - fprintf(stderr, "reinstall (new install)\n"); - - _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt ); -- ctx->Driver.FlushVertices = radeonFlushVertices; -+ ctx->Driver.FlushVertices = radeonVtxfmtFlushVertices; - ctx->Driver.NewList = radeonNewList; - rmesa->vb.installed = GL_TRUE; - vb.context = ctx; -@@ -747,6 +750,7 @@ - if (rmesa->dma.flush) - rmesa->dma.flush( rmesa ); - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - rmesa->vb.installed = GL_FALSE; - vb.context = 0; - } -@@ -905,7 +909,7 @@ - return GL_TRUE; - } - --static void radeonFlushVertices( GLcontext *ctx, GLuint flags ) -+static void radeonVtxfmtFlushVertices( GLcontext *ctx, GLuint flags ) - { - radeonContextPtr rmesa = RADEON_CONTEXT( ctx ); - diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id b/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id deleted file mode 100644 index f7396543d878..000000000000 --- a/x11-servers/XFree86-4-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/XFree86-4-Server-snap/files/patch-xkbInit.c b/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c deleted file mode 100644 index 9b65d4c8b948..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c +++ /dev/null @@ -1,17 +0,0 @@ -Index: programs/Xserver/xkb/xkbInit.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/Xserver/xkb/xkbInit.c,v -retrieving revision 3.26 -retrieving revision 3.27 -diff -u -r3.26 -r3.27 ---- programs/Xserver/xkb/xkbInit.c 9 Feb 2003 06:29:20 -0000 3.26 -+++ programs/Xserver/xkb/xkbInit.c 17 Mar 2003 23:52:27 -0000 3.27 -@@ -713,7 +713,7 @@ - if (names->types) names->types = _XkbDupString(names->types); - if (names->compat) names->compat = _XkbDupString(names->compat); - if (names->geometry) names->geometry = _XkbDupString(names->geometry); -- if (names->symbols) names->geometry = _XkbDupString(names->symbols); -+ if (names->symbols) names->symbols = _XkbDupString(names->symbols); - - if (defs.model && defs.layout && rules) { - XkbComponentNamesRec rNames; |