Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=eba98b819060a7b3fc4174f4c7c14290c8a83267
commit eba98b819060a7b3fc4174f4c7c14290c8a83267 Author: bouleetbil <bouleet...@frogdev.info> Date: Thu Sep 3 11:16:56 2009 +0200 xf86-video-rendition-4.2.2-2-i686 *rebuild with new xorg diff --git a/source/x11/xf86-video-rendition/FixRessources.diff b/source/x11/xf86-video-rendition/FixRessources.diff new file mode 100644 index 0000000..518537a --- /dev/null +++ b/source/x11/xf86-video-rendition/FixRessources.diff @@ -0,0 +1,53 @@ +From d9e34c59faf63162f18dc87f599e36de024f557c Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airl...@redhat.com> +Date: Tue, 28 Jul 2009 03:32:35 +0000 +Subject: rendition: update for resources/RAC API removal + +--- +diff --git a/src/rendition.c b/src/rendition.c +index db62f8e..7a9e18b 100644 +--- a/src/rendition.c ++++ b/src/rendition.c +@@ -538,7 +538,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) + pRendition->PciInfo = xf86GetPciInfoForEntity(pRendition->pEnt->index); + pRendition->pcitag= pciTag(pRendition->PciInfo->bus, + pRendition->PciInfo->device, pRendition->PciInfo->func); +-#endif + + /* + * XXX This could be refined if some VGA memory resources are not +@@ -549,11 +548,12 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) + if (xf86RegisterResources(pRendition->pEnt->index, NULL, ResExclusive)) + return FALSE; + ++ + /* Operations for which memory access is required. */ + pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR; + /* Operations for which I/O access is required. (XXX Check this) */ + pScreenInfo->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; +- ++#endif + /* determine depth, bpp, etc. */ + if (!xf86SetDepthBpp(pScreenInfo, 0, 0, 0, Support32bppFb)) + return FALSE; +diff --git a/src/rendition.h b/src/rendition.h +index 2b43cba..84809fa 100644 +--- a/src/rendition.h ++++ b/src/rendition.h +@@ -37,11 +37,13 @@ + /* All drivers using the mi colormap manipulation need this */ + #include "micmap.h" + ++#ifndef XSERVER_LIBPCIACCESS + /* Needed by Resources Access Control (RAC) */ + #include "xf86RAC.h" + + /* Several predefined resource lists */ + #include "xf86Resources.h" ++#endif + + /* Needed by the Shadow Framebuffer */ + #include "shadowfb.h" +-- +cgit v0.8.2 + diff --git a/source/x11/xf86-video-rendition/FrugalBuild b/source/x11/xf86-video-rendition/FrugalBuild index 177a158..e1cc32a 100644 --- a/source/x11/xf86-video-rendition/FrugalBuild +++ b/source/x11/xf86-video-rendition/FrugalBuild @@ -3,14 +3,16 @@ pkgname=xf86-video-rendition pkgver=4.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org driver for rendition 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' 'videoproto>=2.2.2' 'xf86dgaproto') Finclude xorg -sha1sums=('7ad12db370763619affda31245eecfc74b18e9f7') +source=($source FixRessources.diff) +sha1sums=('7ad12db370763619affda31245eecfc74b18e9f7' \ + 'd7a3f96c69a72638b524becf78afe7b785187cb9') # optimization OK _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git