Date: Friday, May 8, 2015 @ 21:08:30 Author: andyrtr Revision: 238729
upgpkg: xf86-video-savage 2.3.8-1 upstream update 2.3.8 Modified: xf86-video-savage/trunk/PKGBUILD Deleted: xf86-video-savage/trunk/git-fixes.patch -----------------+ PKGBUILD | 17 +++------- git-fixes.patch | 85 ------------------------------------------------------ 2 files changed, 6 insertions(+), 96 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-05-08 19:06:40 UTC (rev 238728) +++ PKGBUILD 2015-05-08 19:08:30 UTC (rev 238729) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=xf86-video-savage -pkgver=2.3.7 -pkgrel=4 +pkgver=2.3.8 +pkgrel=1 pkgdesc="X.org savage video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/"; @@ -13,15 +13,11 @@ conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') optdepends=('savage-dri: DRI1 support from community repo') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) -sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44' - '06c113851952d21fac93f448337a446634ed644400009d0646421a6425c75d45') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}) +sha256sums=('fdcea4a86532bceb50095eaf0fe2f38bbfa160e98463b815f4b549eb9985fa63' + 'SKIP') +validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C') # Julien Cristau <[email protected]> -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i ../git-fixes.patch -} - build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr @@ -31,7 +27,6 @@ package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } Deleted: git-fixes.patch =================================================================== --- git-fixes.patch 2015-05-08 19:06:40 UTC (rev 238728) +++ git-fixes.patch 2015-05-08 19:08:30 UTC (rev 238729) @@ -1,85 +0,0 @@ -From 2e9217bb88b76cebfcd2b65b76c8733f80da77ea Mon Sep 17 00:00:00 2001 -From: Jeremy White <[email protected]> -Date: Thu, 21 Mar 2013 10:59:13 -0500 -Subject: Include xf86Modes.h to use functions from - hw/xfree86/modes/xf86Modes.c. - -Signed-off-by: Jeremy White <[email protected]> -Reviewed-by: Robert Morell <[email protected]> - -diff --git a/src/savage_driver.h b/src/savage_driver.h -index ec4b1ea..de042af 100644 ---- a/src/savage_driver.h -+++ b/src/savage_driver.h -@@ -54,6 +54,7 @@ - #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 - #include "xf86Resources.h" - #endif -+#include "xf86Modes.h" - #include "xf86Pci.h" - #include "xf86_OSproc.h" - #include "xf86Cursor.h" --- -cgit v0.10.2 -From 16a672d1ba183601d513c4cdca32b47e926a6d1e Mon Sep 17 00:00:00 2001 -From: Adam Jackson <[email protected]> -Date: Wed, 21 May 2014 14:11:46 -0400 -Subject: Use own thunk function instead of vgaHW*Weak - -I plan to remove the Weak functions from a future server. - -Signed-off-by: Adam Jackson <[email protected]> - -diff --git a/src/savage_driver.c b/src/savage_driver.c -index bca2c60..e82794f 100644 ---- a/src/savage_driver.c -+++ b/src/savage_driver.c -@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn) - return ((unsigned int) (tmp & 0x08)); - } - -+static void -+SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed) -+{ -+ vgaHWddc1SetSpeed(pScrn, speed); -+} -+ - static Bool - SavageDDC1(ScrnInfoPtr pScrn) - { -@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn) - InI2CREG(byte,psav->I2CPort); - OutI2CREG(byte | 0x12,psav->I2CPort); - -- pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read); -+ pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed, -+ SavageDDC1Read); - if (!pMon) - return FALSE; - --- -cgit v0.10.2 -From d28cd83c7b0b4a943efbe5ddf257c8ee2646ea73 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <[email protected]> -Date: Tue, 29 Jul 2014 09:15:26 -0400 -Subject: dri: Stop (uselessly) initializing the ValidateTree hooks - -Signed-off-by: Adam Jackson <[email protected]> - -diff --git a/src/savage_dri.c b/src/savage_dri.c -index bdb78e4..0842821 100644 ---- a/src/savage_dri.c -+++ b/src/savage_dri.c -@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen ) - psav->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler; - pDRIInfo->wrap.WakeupHandler = SAVAGEWakeupHandler; - -- pDRIInfo->wrap.ValidateTree = NULL; -- pDRIInfo->wrap.PostValidateTree = NULL; -- - pDRIInfo->createDummyCtx = TRUE; - pDRIInfo->createDummyCtxPriv = FALSE; - --- -cgit v0.10.2 -
