Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=2d291d7df63730adf8599d800533127a58d5c372
commit 2d291d7df63730adf8599d800533127a58d5c372 Author: bouleetbil <[email protected]> Date: Thu Sep 3 00:02:55 2009 +0200 xf86-video-newport-0.2.2-2-i686 *rebuild with new xorg diff --git a/source/x11/xf86-video-newport/FixRessources.diff b/source/x11/xf86-video-newport/FixRessources.diff new file mode 100644 index 0000000..c27f612 --- /dev/null +++ b/source/x11/xf86-video-newport/FixRessources.diff @@ -0,0 +1,51 @@ +From d0bc81e8d7af7df512e5556a2d1da0c2053c75cd Mon Sep 17 00:00:00 2001 +From: Dave Airlie <[email protected]> +Date: Tue, 28 Jul 2009 03:32:31 +0000 +Subject: newport: update for resources/RAC API removal + +--- +diff --git a/src/newport.h b/src/newport.h +index f7354e9..d4435b7 100644 +--- a/src/newport.h ++++ b/src/newport.h +@@ -23,7 +23,10 @@ + #include "xf86.h" + #include "xf86_OSproc.h" + #include "compiler.h" ++ ++#ifndef XSERVER_LIBPCIACCESS + #include "xf86Resources.h" ++#endif + + #include "xf86cmap.h" + +diff --git a/src/newport_driver.c b/src/newport_driver.c +index 757fd12..64b643a 100644 +--- a/src/newport_driver.c ++++ b/src/newport_driver.c +@@ -247,7 +247,9 @@ NewportProbe(DriverPtr drv, int flags) + Bool foundScreen = FALSE; + GDevPtr *devSections; + GDevPtr dev = NULL; ++#ifndef XSERVER_LIBPCIACCESS + resRange range[] = { {ResExcMemBlock ,0,0}, _END }; ++#endif + unsigned probedIDs[NEWPORT_MAX_BOARDS]; + memType base; + +@@ -270,10 +272,12 @@ NewportProbe(DriverPtr drv, int flags) + ScrnInfoPtr pScrn = NULL; + + entity = xf86ClaimNoSlot(drv, 0, dev, TRUE); ++#ifndef XSERVER_LIBPCIACCESS + base = (NEWPORT_BASE_ADDR0 + + busID * NEWPORT_BASE_OFFSET); + RANGE(range[0], base, base + sizeof(NewportRegs),\ + ResExcMemBlock); ++#endif + pScrn = xf86AllocateScreen(drv, 0); + xf86AddEntityToScreen(pScrn, entity); + pScrn->driverVersion = NEWPORT_VERSION; +-- +cgit v0.8.2 + diff --git a/source/x11/xf86-video-newport/FrugalBuild b/source/x11/xf86-video-newport/FrugalBuild index 26613f8..4913c79 100644 --- a/source/x11/xf86-video-newport/FrugalBuild +++ b/source/x11/xf86-video-newport/FrugalBuild @@ -3,14 +3,16 @@ pkgname=xf86-video-newport pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org driver for newport 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') Finclude xorg -sha1sums=('f6d8d3134bda3a0037d8bb511cf5b8a2b0851afc') +source=($source FixRessources.diff) +sha1sums=('f6d8d3134bda3a0037d8bb511cf5b8a2b0851afc' \ + '7302757f661e0c0565c39811d015cf7741643a89') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
