[arch-commits] Commit in xf86-video-trident/trunk (PKGBUILD git_fixes.diff)

[Laurent Carlier]

    Date: Monday, March 30, 2015 @ 20:23:13
  Author: lcarlier
Revision: 235287

upgpkg: xf86-video-trident 1.3.7-1

upstream update 1.3.7

Modified:
  xf86-video-trident/trunk/PKGBUILD
Deleted:
  xf86-video-trident/trunk/git_fixes.diff

----------------+
 PKGBUILD       |   16 +++++--------
 git_fixes.diff |   63 -------------------------------------------------------
 2 files changed, 6 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-30 17:53:42 UTC (rev 235286)
+++ PKGBUILD	2015-03-30 18:23:13 UTC (rev 235287)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-trident
-pkgver=1.3.6
-pkgrel=7
+pkgver=1.3.7
+pkgrel=1
 pkgdesc="X.org Trident video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,15 +12,11 @@
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'xf86dgaproto')
 conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
-sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104'
-            'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha256sums=('ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae'
+            'SKIP')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88 at gmail.com>
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Deleted: git_fixes.diff
===================================================================
--- git_fixes.diff	2015-03-30 17:53:42 UTC (rev 235286)
+++ git_fixes.diff	2015-03-30 18:23:13 UTC (rev 235287)
@@ -1,63 +0,0 @@
-From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Tue, 25 Sep 2012 12:55:01 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
-diff --git a/src/trident_driver.c b/src/trident_driver.c
-index dc12b76..408c870 100644
---- a/src/trident_driver.c
-+++ b/src/trident_driver.c
-@@ -56,7 +56,6 @@
- 
- #include "mipointer.h"
- 
--#include "mibstore.h"
- #include "shadow.h"
- #include "trident.h"
- #include "trident_regs.h"
-@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL)
-     	TridentAccelInit(pScreen);
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
- 
-     /* Initialise cursor functions */
---
-cgit v0.9.0.2-2-gbebe
-From 48c15909691e28ad2c188a2978b1c8ef3d9d8760 Mon Sep 17 00:00:00 2001
-From: Timo Aaltonen <tjaalton at ubuntu.com>
-Date: Wed, 26 Sep 2012 08:01:26 +0000
-Subject: Fix loading the driver without XAA
-
----
-diff --git a/src/trident_dga.c b/src/trident_dga.c
-index 0263aa7..c4b5b9a 100644
---- a/src/trident_dga.c
-+++ b/src/trident_dga.c
-@@ -37,10 +37,10 @@
- static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
- 					int *, int *, int *);
- static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr);
--static void TRIDENT_Sync(ScrnInfoPtr);
- static int  TRIDENT_GetViewport(ScrnInfoPtr);
- static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int);
- #ifdef HAVE_XAA_H
-+static void TRIDENT_Sync(ScrnInfoPtr);
- static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
- static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
- #if 0
-@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = {
-    TRIDENT_SetMode,
-    TRIDENT_SetViewport,
-    TRIDENT_GetViewport,
--   TRIDENT_Sync,
- #ifdef HAVE_XAA_H
-+   TRIDENT_Sync,
-    TRIDENT_FillRect,
-    TRIDENT_BlitRect,
- #if 0
---
-cgit v0.9.0.2-2-gbebe