aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-05-04 10:51:02 +0000
committerRene Ladan <rene@FreeBSD.org>2014-05-04 10:51:02 +0000
commit32e92194b7278e4656bb4581bbdec8b4cfec766b (patch)
treedc2a77fb28bb97e39d913fa8c2e661b6e3af9bd3 /x11-drivers
parent496193d869a804c89a9888cf31ea076b3fb7eead (diff)
downloadports-32e92194b7278e4656bb4581bbdec8b4cfec766b.tar.gz
ports-32e92194b7278e4656bb4581bbdec8b4cfec766b.zip
Notes
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/Makefile3
-rw-r--r--x11-drivers/xf86-input-magictouch/Makefile23
-rw-r--r--x11-drivers/xf86-input-magictouch/distinfo2
-rw-r--r--x11-drivers/xf86-input-magictouch/pkg-descr1
-rw-r--r--x11-drivers/xf86-input-magictouch/pkg-plist6
-rw-r--r--x11-drivers/xf86-video-cyrix/Makefile18
-rw-r--r--x11-drivers/xf86-video-cyrix/distinfo2
-rw-r--r--x11-drivers/xf86-video-cyrix/pkg-descr1
-rw-r--r--x11-drivers/xf86-video-cyrix/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-sis-intel/Makefile28
-rw-r--r--x11-drivers/xf86-video-sis-intel/distinfo2
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis.h55
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis300_accel.c29
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis310_accel.c122
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis_3daccel.c11
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis_accel.c29
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.c11
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.h11
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis_driver.c12
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis_memcpy.c12
-rw-r--r--x11-drivers/xf86-video-sis-intel/files/patch-src-sis_mergedfb.c18
-rw-r--r--x11-drivers/xf86-video-sis-intel/pkg-descr2
-rw-r--r--x11-drivers/xf86-video-sis-intel/pkg-plist4
23 files changed, 0 insertions, 407 deletions
diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile
index 6f33c52aedb2..909842f24d68 100644
--- a/x11-drivers/Makefile
+++ b/x11-drivers/Makefile
@@ -11,7 +11,6 @@
SUBDIR += xf86-input-hyperpen
SUBDIR += xf86-input-joystick
SUBDIR += xf86-input-keyboard
- SUBDIR += xf86-input-magictouch
SUBDIR += xf86-input-mouse
SUBDIR += xf86-input-mutouch
SUBDIR += xf86-input-penmount
@@ -23,7 +22,6 @@
SUBDIR += xf86-video-ati
SUBDIR += xf86-video-chips
SUBDIR += xf86-video-cirrus
- SUBDIR += xf86-video-cyrix
SUBDIR += xf86-video-dummy
SUBDIR += xf86-video-fbdev
SUBDIR += xf86-video-glint
@@ -45,7 +43,6 @@
SUBDIR += xf86-video-scfb
SUBDIR += xf86-video-siliconmotion
SUBDIR += xf86-video-sis
- SUBDIR += xf86-video-sis-intel
SUBDIR += xf86-video-sunffb
SUBDIR += xf86-video-tdfx
SUBDIR += xf86-video-tga
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
deleted file mode 100644
index a240996010da..000000000000
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= xf86-input-magictouch
-PORTVERSION= 1.0.0.5
-PORTREVISION= 10
-CATEGORIES= x11-drivers
-
-MAINTAINER= x11@FreeBSD.org
-COMMENT= X.Org magictouch input driver
-
-BROKEN= Does not compile
-DEPRECATED= Does not compile
-EXPIRATION_DATE=2014-05-01
-
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver
-.endif
-
-XORG_CAT= driver
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-magictouch/distinfo b/x11-drivers/xf86-input-magictouch/distinfo
deleted file mode 100644
index db49b5dd63f5..000000000000
--- a/x11-drivers/xf86-input-magictouch/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-input-magictouch-1.0.0.5.tar.bz2) = 9cedc831e9d86889f473fbe3b8f1478afe5ed8c0dd71492aeb896cc681d7444c
-SIZE (xorg/driver/xf86-input-magictouch-1.0.0.5.tar.bz2) = 218289
diff --git a/x11-drivers/xf86-input-magictouch/pkg-descr b/x11-drivers/xf86-input-magictouch/pkg-descr
deleted file mode 100644
index b3eb245f9619..000000000000
--- a/x11-drivers/xf86-input-magictouch/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-input-magictouch driver.
diff --git a/x11-drivers/xf86-input-magictouch/pkg-plist b/x11-drivers/xf86-input-magictouch/pkg-plist
deleted file mode 100644
index 3a718e056dda..000000000000
--- a/x11-drivers/xf86-input-magictouch/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/xorg/modules/input/magictouch_drv.a
-lib/xorg/modules/input/magictouch_drv.so
-man/man4/magictouch.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
deleted file mode 100644
index 64f416a6972d..000000000000
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= xf86-video-cyrix
-PORTVERSION= 1.1.0
-PORTREVISION= 11
-CATEGORIES= x11-drivers
-
-MAINTAINER= x11@FreeBSD.org
-COMMENT= X.Org cyrix display driver
-
-IGNORE= requires pciVideoPtr typedef
-DEPRECATED= requires pciVideoPtr typedef
-EXPIRATION_DATE=2014-05-01
-
-XORG_CAT= driver
-USE_XORG= xextproto xf86dgaproto
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-cyrix/distinfo b/x11-drivers/xf86-video-cyrix/distinfo
deleted file mode 100644
index a1cb1a006c76..000000000000
--- a/x11-drivers/xf86-video-cyrix/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-cyrix-1.1.0.tar.bz2) = d6a66778e0f6ddd907cba5784386bd6bb526f773b5db9faa35875ba67c2ca6ad
-SIZE (xorg/driver/xf86-video-cyrix-1.1.0.tar.bz2) = 249372
diff --git a/x11-drivers/xf86-video-cyrix/pkg-descr b/x11-drivers/xf86-video-cyrix/pkg-descr
deleted file mode 100644
index 91f0ec52af30..000000000000
--- a/x11-drivers/xf86-video-cyrix/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-cyrix driver.
diff --git a/x11-drivers/xf86-video-cyrix/pkg-plist b/x11-drivers/xf86-video-cyrix/pkg-plist
deleted file mode 100644
index 4bb76298e681..000000000000
--- a/x11-drivers/xf86-video-cyrix/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/cyrix_drv.so
-man/man4/cyrix.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
deleted file mode 100644
index 9fadf6ebe13e..000000000000
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Alexey Illarionov <littlesavage@orionet.ru>
-# $FreeBSD$
-
-PORTNAME= xf86-video-sis-intel
-PORTVERSION= 300407
-PORTREVISION= 8
-CATEGORIES= x11-drivers
-MASTER_SITES= http://downloadmirror.intel.com/15443/eng/
-DISTNAME= sis_drv_src_300407
-
-MAINTAINER= littlesavage@orionet.ru
-COMMENT= X.Org sis display driver provided by Intel
-
-IGNORE= requires pciVideoPtr typedef
-DEPRECATED= requires pciVideoPtr typedef
-EXPIRATION_DATE=2014-05-01
-
-CONFLICTS= xf86-video-sis-[0-9]*
-WRKSRC= ${WRKDIR}/2d-driver
-
-USE_GL= gl
-
-XORG_CAT= driver
-USE_XORG= xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
-MAN4= sis.4x
-
-NO_STAGE= yes
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis-intel/distinfo b/x11-drivers/xf86-video-sis-intel/distinfo
deleted file mode 100644
index 16fa14117d3c..000000000000
--- a/x11-drivers/xf86-video-sis-intel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/sis_drv_src_300407.tar.bz2) = 98bab5fe714d2eb0c1fbdde81581e3af0195c2500357de85362b8717edff24ee
-SIZE (xorg/driver/sis_drv_src_300407.tar.bz2) = 756990
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis.h b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis.h
deleted file mode 100644
index 853d652af325..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis.h
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/sis.h.orig 2007-05-02 05:13:01.000000000 +0400
-+++ src/sis.h 2008-06-10 19:44:21.000000000 +0400
-@@ -60,7 +60,6 @@
- #define TWDEBUG
- #endif
-
--#include "xf86_ansic.h"
- #include "compiler.h"
- #include "xf86Pci.h"
- #include "xf86Priv.h"
-@@ -88,16 +87,16 @@
- (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
- #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902,0)
- #endif
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SIS_HAVE_RR_FUNC
- #ifdef HaveDriverFuncs
- #undef SIS_HaveDriverFuncs
- #define SIS_HaveDriverFuncs HaveDriverFuncs
- #define SIS_HAVE_DRIVER_FUNC
- #endif /* HaveDriverFuncs */
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SISISXORG6899900
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SISISXORG6899901
- #ifdef RANDR
- #define SIS_HAVE_RR_GET_MODE_MM
-@@ -181,7 +180,6 @@
- #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,14,0)
- #define SISNEWDRI
- #endif
--#define SIS315DRI /* define this if dri is adapted for 315/330 series */
- #include "xf86drm.h"
- #include "sarea.h"
- #define _XF86DRI_SERVER_
-@@ -230,14 +228,14 @@
-
- #undef SISCHECKOSSSE
- #ifdef XORG_VERSION_CURRENT
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SISCHECKOSSSE /* Automatic check OS for SSE; requires SigIll facility */
- #endif
- #endif
-
- #undef SISGAMMARAMP
- #ifdef XORG_VERSION_CURRENT
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SISGAMMARAMP /* Driver can set gamma ramp; requires additional symbols in xf86sym.h */
- #endif
- #endif
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis300_accel.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis300_accel.c
deleted file mode 100644
index dc4b9d9bbef6..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis300_accel.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/sis300_accel.c.orig 2008-06-06 00:43:06.000000000 +0400
-+++ src/sis300_accel.c 2008-05-27 02:53:37.000000000 +0400
-@@ -1231,7 +1231,7 @@
-
- #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */
- if(pSiS->useEXA) {
--#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
-
- if(pSiS->scrnOffset < 8192) {
- int obase = 0;
-@@ -1253,7 +1253,7 @@
- "Not enough video RAM for offscreen memory manager. Xv disabled\n");
- }
-
--#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- pSiS->EXADriverPtr->card.offscreenByteAlign = 16; /* src/dst: double quad word boundary */
- pSiS->EXADriverPtr->card.offscreenPitch = 4;
- #else
-@@ -1430,7 +1430,7 @@
- pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16, TRUE,
- SiSScratchSave, pSiS);
-
-- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+ #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- if(pSiS->exa_scratch) {
- pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
- pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis310_accel.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis310_accel.c
deleted file mode 100644
index d64ac0a802bc..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis310_accel.c
+++ /dev/null
@@ -1,122 +0,0 @@
---- src/sis310_accel.c.orig 2007-05-02 05:12:57.000000000 +0400
-+++ src/sis310_accel.c 2008-06-09 22:15:56.000000000 +0400
-@@ -65,7 +65,7 @@
- # define SIS_NEED_ARRAY
- # undef SISNEWRENDER
- # ifdef XORG_VERSION_CURRENT
--# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
-+# if (XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0))
- # define SISNEWRENDER
- # endif
- # endif
-@@ -1099,13 +1099,13 @@
-
- SiSOccpyCmdQue(pSiS);
- #ifdef SISVRAMQ
-- if(op > SiSRenderOpsMAX) return FALSE;
-- if(!SiSRenderOps[op]) return FALSE;
-+ if(op > SiSRenderOpsMAX) {SiSReleaseCmdQue(pSiS); return FALSE;}
-+ if(!SiSRenderOps[op]) {SiSReleaseCmdQue(pSiS); return FALSE;}
- #else
-- if(op != PictOpOver) return FALSE;
-+ if(op != PictOpOver) {SiSReleaseCmdQue(pSiS); return FALSE;}
- #endif
-
-- if((width > 2048) || (height > 2048)) return FALSE;
-+ if((width > 2048) || (height > 2048)) { SiSReleaseCmdQue(pSiS); return FALSE;}
-
- pitch = (width + 31) & ~31;
- sizeNeeded = (pitch << bppshift) * height;
-@@ -1115,8 +1115,10 @@
- texType, op, width, height, texPitch, sizeNeeded, sbpp, sbppshift, bppshift);
- #endif
-
-- if(!SiSAllocateLinear(pScrn, (sizeNeeded + sbpp - 1) >> sbppshift))
-+ if(!SiSAllocateLinear(pScrn, (sizeNeeded + sbpp - 1) >> sbppshift)) {
-+ SiSReleaseCmdQue(pSiS);
- return FALSE;
-+ }
-
- width <<= bppshift; /* -> bytes (for engine and memcpy) */
- pitch <<= bppshift; /* -> bytes */
-@@ -1159,6 +1161,7 @@
- SiSSetupCMDFlag(ALPHA_BLEND | SRCVIDEO | A_PERPIXELALPHA)
- break;
- default:
-+ SiSReleaseCmdQue(pSiS);
- return FALSE;
- }
- SiSSyncWP
-@@ -1463,11 +1466,11 @@
-
- w = pSrc->drawable.width;
-
--#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
- pSiS->EXADriverPtr->card.offscreenPitch - 1) &
- ~(pSiS->EXADriverPtr->card.offscreenPitch - 1);
--#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
- pSiS->EXADriverPtr->card.pixmapPitchAlign - 1) &
- ~(pSiS->EXADriverPtr->card.pixmapPitchAlign - 1);
-@@ -1482,11 +1485,11 @@
- if(size > pSiS->exa_scratch->size)
- return FALSE;
-
--#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
- pSiS->EXADriverPtr->card.offscreenByteAlign - 1) &
- ~(pSiS->EXADriverPtr->card.offscreenByteAlign - 1);
--#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
- pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1) &
- ~(pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1);
-@@ -1496,7 +1499,7 @@
- ~(pSiS->EXADriverPtr->pixmapOffsetAlign - 1);
- #endif
-
--#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- if(pSiS->exa_scratch_next + size >
- pSiS->exa_scratch->offset + pSiS->exa_scratch->size) {
- (pSiS->EXADriverPtr->accel.WaitMarker)(pSrc->drawable.pScreen, 0);
-@@ -1513,7 +1516,7 @@
- memcpy(pDst, pSrc, sizeof(*pDst));
- pDst->devKind = dst_pitch;
-
--#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next;
- #else
- pDst->devPrivate.ptr = pSiS->EXADriverPtr->memoryBase + pSiS->exa_scratch_next;
-@@ -1755,7 +1758,7 @@
-
- #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */
- if(pSiS->useEXA) {
--#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
-
- int obase = 0;
-
-@@ -1776,7 +1779,7 @@
- "Not enough video RAM for offscreen memory manager. Xv disabled\n");
- }
-
--#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- pSiS->EXADriverPtr->card.offscreenByteAlign = 16; /* src/dst: double quad word boundary */
- pSiS->EXADriverPtr->card.offscreenPitch = 4; /* pitch: double word boundary */
- #else
-@@ -1945,7 +1948,7 @@
- SiSScratchSave, pSiS);
- if(pSiS->exa_scratch) {
- pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
-- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+ #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
- #else
- pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_3daccel.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_3daccel.c
deleted file mode 100644
index b9dd8ce8937f..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_3daccel.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sis_3daccel.c.orig 2008-06-06 00:41:57.000000000 +0400
-+++ src/sis_3daccel.c 2008-05-27 02:54:55.000000000 +0400
-@@ -64,7 +64,7 @@
- # define SIS_NEED_ARRAY
- # undef SISNEWRENDER
- # ifdef XORG_VERSION_CURRENT
--# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
-+# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- # define SISNEWRENDER
- # endif
- # endif
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_accel.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_accel.c
deleted file mode 100644
index 9fb21f3f5d32..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_accel.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/sis_accel.c.orig 2008-06-06 00:41:32.000000000 +0400
-+++ src/sis_accel.c 2008-05-27 02:53:54.000000000 +0400
-@@ -781,7 +781,7 @@
-
- #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */
- if(pSiS->useEXA) {
--#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
-
- /* data */
- pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase;
-@@ -795,7 +795,7 @@
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Not enough video RAM for offscreen memory manager. Xv disabled\n");
- }
--#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- pSiS->EXADriverPtr->card.offscreenByteAlign = 8; /* src/dst: double quad word boundary */
- pSiS->EXADriverPtr->card.offscreenPitch = 1;
- #else
-@@ -946,7 +946,7 @@
- SiSScratchSave, pSiS);
- if(pSiS->exa_scratch) {
- pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
-- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+ #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
- #else
- pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.c
deleted file mode 100644
index c70fb3302e34..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sis_dri.c.orig 2007-05-02 05:13:00.000000000 +0400
-+++ src/sis_dri.c 2008-06-06 01:17:19.000000000 +0400
-@@ -56,7 +56,7 @@
-
- #ifdef XORG_VERSION_CURRENT
- #define SISHAVECREATEBUSID
--#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0)
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- extern char *DRICreatePCIBusID(pciVideoPtr PciInfo);
- #endif
- #else
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.h b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.h
deleted file mode 100644
index 8d77d4b29aa7..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sis_dri.h.orig 2008-06-06 01:29:26.000000000 +0400
-+++ src/sis_dri.h 2008-06-06 01:29:01.000000000 +0400
-@@ -116,7 +116,7 @@
- int dummy;
- } SISDRIContextRec, *SISDRIContextPtr;
-
--#ifdef XFree86Server
-+#if defined(XFree86Server) || defined(XORG_VERSION_CURRENT)
-
- #include "screenint.h"
-
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_driver.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_driver.c
deleted file mode 100644
index 619fc14c42a7..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_driver.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/sis_driver.c.orig 2007-05-02 05:13:00.000000000 +0400
-+++ src/sis_driver.c 2008-05-27 03:31:36.000000000 +0400
-@@ -559,9 +559,7 @@
- pScrn->FreeScreen = SISFreeScreen;
- pScrn->ValidMode = SISValidMode;
- #ifdef X_XF86MiscPassMessage
-- if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
- pScrn->HandleMessage = SISHandleMessage;
-- }
- #endif
- foundScreen = TRUE;
- }
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_memcpy.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_memcpy.c
deleted file mode 100644
index ea09af0c2610..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_memcpy.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/sis_memcpy.c.orig 2007-05-02 05:13:01.000000000 +0400
-+++ src/sis_memcpy.c 2008-05-27 03:01:00.000000000 +0400
-@@ -844,9 +844,7 @@
-
- #ifdef SISCHECKOSSSE
-
--#ifndef XFree86LOADER
- #include <setjmp.h>
--#endif
-
- static jmp_buf sigill_return;
-
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_mergedfb.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_mergedfb.c
deleted file mode 100644
index b0f4c02c5240..000000000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_mergedfb.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sis_mergedfb.c.orig 2008-06-06 00:39:10.000000000 +0400
-+++ src/sis_mergedfb.c 2008-06-06 00:32:21.000000000 +0400
-@@ -2631,13 +2631,13 @@
-
- REQUEST_SIZE_MATCH(xXineramaSelectInputReq);
-
-- pWin = SecurityLookupWindow(stuff->window, client, SecurityWriteAccess);
-+ pWin = SecurityLookupWindow(stuff->window, client, DixWriteAccess);
- if(!pWin)
- return BadWindow;
-
- pHead = (SiSXineramaEventPtr *)SecurityLookupIDByType(client,
- pWin->drawable.id, EventType,
-- SecurityWriteAccess);
-+ DixWriteAccess);
-
- if(stuff->enable & (XineramaLayoutChangeNotifyMask)) {
-
diff --git a/x11-drivers/xf86-video-sis-intel/pkg-descr b/x11-drivers/xf86-video-sis-intel/pkg-descr
deleted file mode 100644
index 81e087ab71aa..000000000000
--- a/x11-drivers/xf86-video-sis-intel/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-This package contains the X.Org SiS driver provided by Intel for their
-D201GLY/D201GLY2 motherboards
diff --git a/x11-drivers/xf86-video-sis-intel/pkg-plist b/x11-drivers/xf86-video-sis-intel/pkg-plist
deleted file mode 100644
index c4fda3a35443..000000000000
--- a/x11-drivers/xf86-video-sis-intel/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/xorg/modules/drivers/sis_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg