Date: Thursday, February 5, 2015 @ 23:06:16 Author: lcarlier Revision: 230874
upgpkg: xf86-video-rendition 4.2.5-6 xorg-server 1.17 rebuild Modified: xf86-video-rendition/trunk/PKGBUILD xf86-video-rendition/trunk/git-fixes.patch -----------------+ PKGBUILD | 8 ++-- git-fixes.patch | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-05 22:03:33 UTC (rev 230873) +++ PKGBUILD 2015-02-05 22:06:16 UTC (rev 230874) @@ -3,18 +3,18 @@ pkgname=xf86-video-rendition pkgver=4.2.5 -pkgrel=5 +pkgrel=6 pkgdesc="X.org Rendition video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/"; license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18') -conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') options=('!strip') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) sha256sums=('39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb' - '93a59e9deed98af201c8bb231fdf3214fcd02dae8ef2f880b044b4fd100cdb4c') + '43301ab296b6a928ed880ea56fc476c7c2d80803c9a63b71e0391fca10457f55') prepare() { cd ${pkgname}-${pkgver} Modified: git-fixes.patch =================================================================== --- git-fixes.patch 2015-02-05 22:03:33 UTC (rev 230873) +++ git-fixes.patch 2015-02-05 22:06:16 UTC (rev 230874) @@ -33,3 +33,93 @@ -- cgit v0.9.0.2-2-gbebe +From 30a4b73644ee22904824d4847e44ca69369fad02 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <[email protected]> +Date: Tue, 30 Sep 2014 10:21:58 -0400 +Subject: Fix build against xserver 1.17 + +Also port from pci_device_map_region to pci_device_map_range. Somewhat +alarming that the previous code was using map_region but unmap_range... + +Signed-off-by: Adam Jackson <[email protected]> + +diff --git a/src/rendition.c b/src/rendition.c +index 888bb4a..9677850 100644 +--- a/src/rendition.c ++++ b/src/rendition.c +@@ -1371,6 +1371,18 @@ renditionMapMem(ScrnInfoPtr pScreenInfo) + /* Override on users request */ + WriteCombine + = xf86ReturnOptValBool(pRendition->Options, OPTION_FBWC, WriteCombine); ++#ifdef XSERVER_LIBPCIACCESS ++ mapOption = PCI_DEV_MAP_FLAG_WRITABLE; ++ if (WriteCombine) ++ mapOption |= PCI_DEV_MAP_FLAG_WRITE_COMBINE; ++ ++ err = pci_device_map_range(pRendition->PciInfo, ++ pRendition->PciInfo->regions[0].base_addr, ++ pRendition->PciInfo->regions[0].size, ++ mapOption, (void *)&pRendition->board.vmem_base); ++ ++ return (err == 0); ++#else + if (WriteCombine) { + xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG, + ("Requesting Write-Combined memory access\n")); +@@ -1381,12 +1393,6 @@ renditionMapMem(ScrnInfoPtr pScreenInfo) + mapOption = VIDMEM_MMIO; + } + +-#ifdef XSERVER_LIBPCIACCESS +- err = pci_device_map_region(pRendition->PciInfo, 0, TRUE); +- pRendition->board.vmem_base = pRendition->PciInfo->regions[0].memory; +- +- return (err == 0); +-#else + pRendition->board.vmem_base= + xf86MapPciMem(pScreenInfo->scrnIndex, mapOption, + pRendition->pcitag, +@@ -1415,7 +1421,7 @@ renditionUnmapMem(ScrnInfoPtr pScreenInfo) + #else + pci_device_unmap_range(pRendition->PciInfo, + pRendition->board.vmem_base, +- pScreenInfo->videoRam * 1024); ++ pRendition->PciInfo->regions[0].size); + #endif + return TRUE; + #ifdef DEBUG0 +-- +cgit v0.10.2 +From df5646745bf563bb36a0db1796c318fe64bf8efe Mon Sep 17 00:00:00 2001 +From: Adam Jackson <[email protected]> +Date: Tue, 30 Sep 2014 10:24:18 -0400 +Subject: Remove dependency on xf86PciInfo.h + +Signed-off-by: Adam Jackson <[email protected]> + +diff --git a/src/rendition.h b/src/rendition.h +index 297117e..4ef03a7 100644 +--- a/src/rendition.h ++++ b/src/rendition.h +@@ -14,9 +14,6 @@ + /* Everything using inb/outb, etc needs "compiler.h" */ + #include "compiler.h" + +-/* Drivers for PCI hardware need this */ +-#include "xf86PciInfo.h" +- + /* Drivers that need to access the PCI config space directly need this */ + #include "xf86Pci.h" + +@@ -66,4 +63,8 @@ + + #include "compat-api.h" + /* end of __RENDITION_H__ */ ++ ++#define PCI_CHIP_V1000 0x0001 ++#define PCI_CHIP_V2x00 0x2000 ++ + #endif +-- +cgit v0.10.2 +
