Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=50af7496c86aa6a65bb530eb40c861c3d4accfa8

commit 50af7496c86aa6a65bb530eb40c861c3d4accfa8
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Tue Sep 1 22:26:21 2009 +0200

xf86-video-tseng-1.2.2-1-i686
*version bump
*added fix

diff --git a/source/x11/xf86-video-tseng/FixABI.diff 
b/source/x11/xf86-video-tseng/FixABI.diff
new file mode 100644
index 0000000..942e836
--- /dev/null
+++ b/source/x11/xf86-video-tseng/FixABI.diff
@@ -0,0 +1,65 @@
+From 17ebee6804a99af32747b801c5b979ba5248a9d8 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airl...@redhat.com>
+Date: Tue, 28 Jul 2009 03:32:40 +0000
+Subject: tseng: update for resources/RAC API removal
+
+---
+diff --git a/src/tseng_driver.c b/src/tseng_driver.c
+index efa19c8..1b61da8 100644
+--- a/src/tseng_driver.c
++++ b/src/tseng_driver.c
+@@ -42,8 +42,10 @@
+
+ #include "fb.h"
+
++#ifndef XSERVER_LIBPCIACCESS
+ #include "xf86RAC.h"
+ #include "xf86Resources.h"
++#endif
+ #include "xf86int10.h"
+
+ #include "xf86xv.h"
+@@ -889,10 +891,12 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
+         pTseng->FbAddress = PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM);
+
+
++#ifndef XSERVER_LIBPCIACCESS
+     if (xf86RegisterResources(pTseng->pEnt->index,NULL,ResNone)) {
+         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot register FB memory.\n");
+         return FALSE;
+     }
++#endif
+
+     /* The W32 linear map address space is always 4Mb (mainly because the
+      * memory-mapped registers are located near the top of the 4MB area).
+@@ -1089,13 +1093,14 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
+     else
+       VGAHWPTR(pScrn)->MapSize = 0x10000;
+
++#ifndef XSERVER_LIBPCIACCESS
+     /*
+      * XXX At least part of this range does appear to be disabled,
+      * but to play safe, it is marked as "unused" for now.
+      * Changed this to "disable". Otherwise it might interfere with DGA.
+      */
+     xf86SetOperatingState(resVgaMem, pTseng->pEnt->index, ResDisableOpr);
+-
++#endif
+     /* hibit processing (TsengProcessOptions() must have been called first) */
+     pTseng->save_divide = 0x40;              /* default */
+     if (pTseng->ChipType == ET4000) {
+@@ -1466,9 +1471,10 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int 
argc, char **argv)
+     if (pScrn->depth == 4 || pScrn->depth == 8) { /* fb and xf4bpp */
+       vgaHWHandleColormaps(pScreen);
+     }
++#ifndef XSERVER_LIBPCIACCESS
+     pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
+     pScrn->racMemFlags = pScrn->racIoFlags;
+-
++#endif
+     /* Wrap the current CloseScreen and SaveScreen functions */
+     pScreen->SaveScreen = TsengSaveScreen;
+
+--
+cgit v0.8.2
+
diff --git a/source/x11/xf86-video-tseng/FrugalBuild 
b/source/x11/xf86-video-tseng/FrugalBuild
index f96eebf..2124f21 100644
--- a/source/x11/xf86-video-tseng/FrugalBuild
+++ b/source/x11/xf86-video-tseng/FrugalBuild
@@ -2,15 +2,17 @@
# Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu>

pkgname=xf86-video-tseng
-pkgver=1.2.1
+pkgver=1.2.2
pkgrel=1
pkgdesc="X.Org video driver for tseng cards"
url="http://xorg.freedesktop.org";
groups=('x11' 'xorg-core' 'xorg-drivers')
archs=('i686' 'x86_64')
-depends=('xorg-server>=1.6.1-2')
+depends=('xorg-server>=1.6.3')
makedepends=('randrproto>1.3.0' 'renderproto' 'xf86dgaproto' 
'videoproto>=2.2.2')
Finclude xorg
-sha1sums=('8f048c2d7e0068699f1c0bdb6443d4774fada14a')
+source=($source FixABI.diff)
+sha1sums=('b45d6a49ddb0691c45fcc4b225e937c7336ce670' \
+          '97339fa7a183e83814a40a2ba62ed2b040a25cf5')

# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to