Date: Tue, 10 Jun 2008 20:49:25 GMT From: Alexey Illarionov <littlesavage@orionet.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/124461: [NEW PORT] x11-drivers/xf86-video-sis-intel: SiS Mirage*1 video driver from Intel Message-ID: <200806102049.m5AKnPXA024197@www.freebsd.org> Resent-Message-ID: <200806102050.m5AKo14M003813@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124461 >Category: ports >Synopsis: [NEW PORT] x11-drivers/xf86-video-sis-intel: SiS Mirage*1 video driver from Intel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jun 10 20:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Alexey Illarionov >Release: 6.3-RELEASE >Organization: >Environment: System: 6.3-RELEASE >Description: X.Org SiS driver provided by Intel for their D201GLY/D201GLY2 motherboards found on http://downloadcenter.intel.com/Detail_Desc.aspx?agr=N&Inst=Yes&ProductID=2773&DwnldID=15443&strOSs=39&OSFullName=Linux*&lang=eng These drivers are different from freedesktop X.org xf86-video-sis driver - it has fixed some high resolution problems (i.e. vertical 'noise' on screen). >How-To-Repeat: >Fix: Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # . # ./xf86-video-sis-intel # ./xf86-video-sis-intel/distinfo # ./xf86-video-sis-intel/pkg-descr # ./xf86-video-sis-intel/pkg-plist # ./xf86-video-sis-intel/files # ./xf86-video-sis-intel/files/patch-src-sis.h # ./xf86-video-sis-intel/files/patch-src-sis300_accel.c # ./xf86-video-sis-intel/files/patch-src-sis310_accel.c # ./xf86-video-sis-intel/files/patch-src-sis_3daccel.c # ./xf86-video-sis-intel/files/patch-src-sis_accel.c # ./xf86-video-sis-intel/files/patch-src-sis_dri.c # ./xf86-video-sis-intel/files/patch-src-sis_dri.h # ./xf86-video-sis-intel/files/patch-src-sis_driver.c # ./xf86-video-sis-intel/files/patch-src-sis_memcpy.c # ./xf86-video-sis-intel/files/patch-src-sis_mergedfb.c # ./xf86-video-sis-intel/Makefile # echo c - . mkdir -p . > /dev/null 2>&1 echo c - ./xf86-video-sis-intel mkdir -p ./xf86-video-sis-intel > /dev/null 2>&1 echo x - ./xf86-video-sis-intel/distinfo sed 's/^X//' >./xf86-video-sis-intel/distinfo << 'END-of-./xf86-video-sis-intel/distinfo' XMD5 (xorg/driver/sis_drv_src_300407.tar.bz2) = 6b2289ea047f02f7649b853329217a76 XSHA256 (xorg/driver/sis_drv_src_300407.tar.bz2) = 98bab5fe714d2eb0c1fbdde81581e3af0195c2500357de85362b8717edff24ee XSIZE (xorg/driver/sis_drv_src_300407.tar.bz2) = 756990 END-of-./xf86-video-sis-intel/distinfo echo x - ./xf86-video-sis-intel/pkg-descr sed 's/^X//' >./xf86-video-sis-intel/pkg-descr << 'END-of-./xf86-video-sis-intel/pkg-descr' XThis package contains the X.Org SiS driver provided by Intel for their XD201GLY/D201GLY2 motherboards X X- Alexey Illarionov Xlittlesavage@orionet.ru END-of-./xf86-video-sis-intel/pkg-descr echo x - ./xf86-video-sis-intel/pkg-plist sed 's/^X//' >./xf86-video-sis-intel/pkg-plist << 'END-of-./xf86-video-sis-intel/pkg-plist' Xlib/xorg/modules/drivers/sis_drv.la Xlib/xorg/modules/drivers/sis_drv.so X@dirrmtry lib/xorg/modules/drivers X@dirrmtry lib/xorg/modules X@dirrmtry lib/xorg END-of-./xf86-video-sis-intel/pkg-plist echo c - ./xf86-video-sis-intel/files mkdir -p ./xf86-video-sis-intel/files > /dev/null 2>&1 echo x - ./xf86-video-sis-intel/files/patch-src-sis.h sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis.h << 'END-of-./xf86-video-sis-intel/files/patch-src-sis.h' X--- src/sis.h.orig 2007-05-02 05:13:01.000000000 +0400 X+++ src/sis.h 2008-06-10 19:44:21.000000000 +0400 X@@ -60,7 +60,6 @@ X #define TWDEBUG X #endif X X-#include "xf86_ansic.h" X #include "compiler.h" X #include "xf86Pci.h" X #include "xf86Priv.h" X@@ -88,16 +87,16 @@ X (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap) X #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902,0) X #endif X-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0) X+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0) X #define SIS_HAVE_RR_FUNC X #ifdef HaveDriverFuncs X #undef SIS_HaveDriverFuncs X #define SIS_HaveDriverFuncs HaveDriverFuncs X #define SIS_HAVE_DRIVER_FUNC X #endif /* HaveDriverFuncs */ X-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0) X+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0) X #define SISISXORG6899900 X-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0) X+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0) X #define SISISXORG6899901 X #ifdef RANDR X #define SIS_HAVE_RR_GET_MODE_MM X@@ -181,7 +180,6 @@ X #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,14,0) X #define SISNEWDRI X #endif X-#define SIS315DRI /* define this if dri is adapted for 315/330 series */ X #include "xf86drm.h" X #include "sarea.h" X #define _XF86DRI_SERVER_ X@@ -230,14 +228,14 @@ X X #undef SISCHECKOSSSE X #ifdef XORG_VERSION_CURRENT X-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) X+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0) X #define SISCHECKOSSSE /* Automatic check OS for SSE; requires SigIll facility */ X #endif X #endif X X #undef SISGAMMARAMP X #ifdef XORG_VERSION_CURRENT X-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) X+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0) X #define SISGAMMARAMP /* Driver can set gamma ramp; requires additional symbols in xf86sym.h */ X #endif X #endif END-of-./xf86-video-sis-intel/files/patch-src-sis.h echo x - ./xf86-video-sis-intel/files/patch-src-sis300_accel.c sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis300_accel.c << 'END-of-./xf86-video-sis-intel/files/patch-src-sis300_accel.c' X--- src/sis300_accel.c.orig 2008-06-06 00:43:06.000000000 +0400 X+++ src/sis300_accel.c 2008-05-27 02:53:37.000000000 +0400 X@@ -1231,7 +1231,7 @@ X X #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */ X if(pSiS->useEXA) { X-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X X if(pSiS->scrnOffset < 8192) { X int obase = 0; X@@ -1253,7 +1253,7 @@ X "Not enough video RAM for offscreen memory manager. Xv disabled\n"); X } X X-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) X+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X pSiS->EXADriverPtr->card.offscreenByteAlign = 16; /* src/dst: double quad word boundary */ X pSiS->EXADriverPtr->card.offscreenPitch = 4; X #else X@@ -1430,7 +1430,7 @@ X pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16, TRUE, X SiSScratchSave, pSiS); X X- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+ #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X if(pSiS->exa_scratch) { X pSiS->exa_scratch_next = pSiS->exa_scratch->offset; X pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; END-of-./xf86-video-sis-intel/files/patch-src-sis300_accel.c echo x - ./xf86-video-sis-intel/files/patch-src-sis310_accel.c sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis310_accel.c << 'END-of-./xf86-video-sis-intel/files/patch-src-sis310_accel.c' X--- src/sis310_accel.c.orig 2007-05-02 05:12:57.000000000 +0400 X+++ src/sis310_accel.c 2008-06-09 22:15:56.000000000 +0400 X@@ -65,7 +65,7 @@ X # define SIS_NEED_ARRAY X # undef SISNEWRENDER X # ifdef XORG_VERSION_CURRENT X-# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) X+# if (XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)) X # define SISNEWRENDER X # endif X # endif X@@ -1099,13 +1099,13 @@ X X SiSOccpyCmdQue(pSiS); X #ifdef SISVRAMQ X- if(op > SiSRenderOpsMAX) return FALSE; X- if(!SiSRenderOps[op]) return FALSE; X+ if(op > SiSRenderOpsMAX) {SiSReleaseCmdQue(pSiS); return FALSE;} X+ if(!SiSRenderOps[op]) {SiSReleaseCmdQue(pSiS); return FALSE;} X #else X- if(op != PictOpOver) return FALSE; X+ if(op != PictOpOver) {SiSReleaseCmdQue(pSiS); return FALSE;} X #endif X X- if((width > 2048) || (height > 2048)) return FALSE; X+ if((width > 2048) || (height > 2048)) { SiSReleaseCmdQue(pSiS); return FALSE;} X X pitch = (width + 31) & ~31; X sizeNeeded = (pitch << bppshift) * height; X@@ -1115,8 +1115,10 @@ X texType, op, width, height, texPitch, sizeNeeded, sbpp, sbppshift, bppshift); X #endif X X- if(!SiSAllocateLinear(pScrn, (sizeNeeded + sbpp - 1) >> sbppshift)) X+ if(!SiSAllocateLinear(pScrn, (sizeNeeded + sbpp - 1) >> sbppshift)) { X+ SiSReleaseCmdQue(pSiS); X return FALSE; X+ } X X width <<= bppshift; /* -> bytes (for engine and memcpy) */ X pitch <<= bppshift; /* -> bytes */ X@@ -1159,6 +1161,7 @@ X SiSSetupCMDFlag(ALPHA_BLEND | SRCVIDEO | A_PERPIXELALPHA) X break; X default: X+ SiSReleaseCmdQue(pSiS); X return FALSE; X } X SiSSyncWP X@@ -1463,11 +1466,11 @@ X X w = pSrc->drawable.width; X X-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) X+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) + X pSiS->EXADriverPtr->card.offscreenPitch - 1) & X ~(pSiS->EXADriverPtr->card.offscreenPitch - 1); X-#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) + X pSiS->EXADriverPtr->card.pixmapPitchAlign - 1) & X ~(pSiS->EXADriverPtr->card.pixmapPitchAlign - 1); X@@ -1482,11 +1485,11 @@ X if(size > pSiS->exa_scratch->size) X return FALSE; X X-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) X+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X pSiS->exa_scratch_next = (pSiS->exa_scratch_next + X pSiS->EXADriverPtr->card.offscreenByteAlign - 1) & X ~(pSiS->EXADriverPtr->card.offscreenByteAlign - 1); X-#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X pSiS->exa_scratch_next = (pSiS->exa_scratch_next + X pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1) & X ~(pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1); X@@ -1496,7 +1499,7 @@ X ~(pSiS->EXADriverPtr->pixmapOffsetAlign - 1); X #endif X X-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X if(pSiS->exa_scratch_next + size > X pSiS->exa_scratch->offset + pSiS->exa_scratch->size) { X (pSiS->EXADriverPtr->accel.WaitMarker)(pSrc->drawable.pScreen, 0); X@@ -1513,7 +1516,7 @@ X memcpy(pDst, pSrc, sizeof(*pDst)); X pDst->devKind = dst_pitch; X X-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next; X #else X pDst->devPrivate.ptr = pSiS->EXADriverPtr->memoryBase + pSiS->exa_scratch_next; X@@ -1755,7 +1758,7 @@ X X #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */ X if(pSiS->useEXA) { X-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X X int obase = 0; X X@@ -1776,7 +1779,7 @@ X "Not enough video RAM for offscreen memory manager. Xv disabled\n"); X } X X-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) X+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X pSiS->EXADriverPtr->card.offscreenByteAlign = 16; /* src/dst: double quad word boundary */ X pSiS->EXADriverPtr->card.offscreenPitch = 4; /* pitch: double word boundary */ X #else X@@ -1945,7 +1948,7 @@ X SiSScratchSave, pSiS); X if(pSiS->exa_scratch) { X pSiS->exa_scratch_next = pSiS->exa_scratch->offset; X- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+ #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; X #else X pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch; END-of-./xf86-video-sis-intel/files/patch-src-sis310_accel.c echo x - ./xf86-video-sis-intel/files/patch-src-sis_3daccel.c sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis_3daccel.c << 'END-of-./xf86-video-sis-intel/files/patch-src-sis_3daccel.c' X--- src/sis_3daccel.c.orig 2008-06-06 00:41:57.000000000 +0400 X+++ src/sis_3daccel.c 2008-05-27 02:54:55.000000000 +0400 X@@ -64,7 +64,7 @@ X # define SIS_NEED_ARRAY X # undef SISNEWRENDER X # ifdef XORG_VERSION_CURRENT X-# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) X+# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0) X # define SISNEWRENDER X # endif X # endif END-of-./xf86-video-sis-intel/files/patch-src-sis_3daccel.c echo x - ./xf86-video-sis-intel/files/patch-src-sis_accel.c sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis_accel.c << 'END-of-./xf86-video-sis-intel/files/patch-src-sis_accel.c' X--- src/sis_accel.c.orig 2008-06-06 00:41:32.000000000 +0400 X+++ src/sis_accel.c 2008-05-27 02:53:54.000000000 +0400 X@@ -781,7 +781,7 @@ X X #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */ X if(pSiS->useEXA) { X-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X X /* data */ X pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase; X@@ -795,7 +795,7 @@ X xf86DrvMsg(pScrn->scrnIndex, X_ERROR, X "Not enough video RAM for offscreen memory manager. Xv disabled\n"); X } X-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) X+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X pSiS->EXADriverPtr->card.offscreenByteAlign = 8; /* src/dst: double quad word boundary */ X pSiS->EXADriverPtr->card.offscreenPitch = 1; X #else X@@ -946,7 +946,7 @@ X SiSScratchSave, pSiS); X if(pSiS->exa_scratch) { X pSiS->exa_scratch_next = pSiS->exa_scratch->offset; X- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) X+ #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; X #else X pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch; END-of-./xf86-video-sis-intel/files/patch-src-sis_accel.c echo x - ./xf86-video-sis-intel/files/patch-src-sis_dri.c sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis_dri.c << 'END-of-./xf86-video-sis-intel/files/patch-src-sis_dri.c' X--- src/sis_dri.c.orig 2007-05-02 05:13:00.000000000 +0400 X+++ src/sis_dri.c 2008-06-06 01:17:19.000000000 +0400 X@@ -56,7 +56,7 @@ X X #ifdef XORG_VERSION_CURRENT X #define SISHAVECREATEBUSID X-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0) X+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0) X extern char *DRICreatePCIBusID(pciVideoPtr PciInfo); X #endif X #else END-of-./xf86-video-sis-intel/files/patch-src-sis_dri.c echo x - ./xf86-video-sis-intel/files/patch-src-sis_dri.h sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis_dri.h << 'END-of-./xf86-video-sis-intel/files/patch-src-sis_dri.h' X--- src/sis_dri.h.orig 2008-06-06 01:29:26.000000000 +0400 X+++ src/sis_dri.h 2008-06-06 01:29:01.000000000 +0400 X@@ -116,7 +116,7 @@ X int dummy; X } SISDRIContextRec, *SISDRIContextPtr; X X-#ifdef XFree86Server X+#if defined(XFree86Server) || defined(XORG_VERSION_CURRENT) X X #include "screenint.h" X END-of-./xf86-video-sis-intel/files/patch-src-sis_dri.h echo x - ./xf86-video-sis-intel/files/patch-src-sis_driver.c sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis_driver.c << 'END-of-./xf86-video-sis-intel/files/patch-src-sis_driver.c' X--- src/sis_driver.c.orig 2007-05-02 05:13:00.000000000 +0400 X+++ src/sis_driver.c 2008-05-27 03:31:36.000000000 +0400 X@@ -559,9 +559,7 @@ X pScrn->FreeScreen = SISFreeScreen; X pScrn->ValidMode = SISValidMode; X #ifdef X_XF86MiscPassMessage X- if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { X pScrn->HandleMessage = SISHandleMessage; X- } X #endif X foundScreen = TRUE; X } END-of-./xf86-video-sis-intel/files/patch-src-sis_driver.c echo x - ./xf86-video-sis-intel/files/patch-src-sis_memcpy.c sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis_memcpy.c << 'END-of-./xf86-video-sis-intel/files/patch-src-sis_memcpy.c' X--- src/sis_memcpy.c.orig 2007-05-02 05:13:01.000000000 +0400 X+++ src/sis_memcpy.c 2008-05-27 03:01:00.000000000 +0400 X@@ -844,9 +844,7 @@ X X #ifdef SISCHECKOSSSE X X-#ifndef XFree86LOADER X #include <setjmp.h> X-#endif X X static jmp_buf sigill_return; X END-of-./xf86-video-sis-intel/files/patch-src-sis_memcpy.c echo x - ./xf86-video-sis-intel/files/patch-src-sis_mergedfb.c sed 's/^X//' >./xf86-video-sis-intel/files/patch-src-sis_mergedfb.c << 'END-of-./xf86-video-sis-intel/files/patch-src-sis_mergedfb.c' X--- src/sis_mergedfb.c.orig 2008-06-06 00:39:10.000000000 +0400 X+++ src/sis_mergedfb.c 2008-06-06 00:32:21.000000000 +0400 X@@ -2631,13 +2631,13 @@ X X REQUEST_SIZE_MATCH(xXineramaSelectInputReq); X X- pWin = SecurityLookupWindow(stuff->window, client, SecurityWriteAccess); X+ pWin = SecurityLookupWindow(stuff->window, client, DixWriteAccess); X if(!pWin) X return BadWindow; X X pHead = (SiSXineramaEventPtr *)SecurityLookupIDByType(client, X pWin->drawable.id, EventType, X- SecurityWriteAccess); X+ DixWriteAccess); X X if(stuff->enable & (XineramaLayoutChangeNotifyMask)) { X END-of-./xf86-video-sis-intel/files/patch-src-sis_mergedfb.c echo x - ./xf86-video-sis-intel/Makefile sed 's/^X//' >./xf86-video-sis-intel/Makefile << 'END-of-./xf86-video-sis-intel/Makefile' X# New ports collection makefile for: xf86-video-sis-intel X# Date Created: 30 May 2008 X# Whom: Alexey Illarionov <littlesavage@orionet.ru> X# Based on: x11-drivers/xf86-video-sis by flz@FreeBSD.org X# X# $FreeBSD$ X# X XPORTNAME= xf86-video-sis-intel XPORTVERSION= 300407 XCATEGORIES= x11-drivers XMASTER_SITES= http://downloadmirror.intel.com/15443/eng/ XDISTNAME= sis_drv_src_300407 X XMAINTAINER= littlesavage@orionet.ru XCOMMENT= X.Org sis display driver provided by Intel X XCONFLICTS= xf86-video-sis-[0-9]* XWRKSRC= ${WRKDIR}/2d-driver X XUSE_GL= gl X XXORG_CAT= driver XUSE_XORG= xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto XMAN4= sis.4x X X.include <bsd.port.mk> END-of-./xf86-video-sis-intel/Makefile exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806102049.m5AKnPXA024197>