[arch-commits] Commit in xf86-video-trident/repos (6 files)

2016-11-21 Thread Laurent Carlier 
Date: Monday, November 21, 2016 @ 12:14:49
  Author: lcarlier
Revision: 281732

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-trident/repos/staging-i686/
  xf86-video-trident/repos/staging-i686/PKGBUILD
(from rev 281731, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-i686/git-fixes.patch
(from rev 281731, xf86-video-trident/trunk/git-fixes.patch)
  xf86-video-trident/repos/staging-x86_64/
  xf86-video-trident/repos/staging-x86_64/PKGBUILD
(from rev 281731, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-x86_64/git-fixes.patch
(from rev 281731, xf86-video-trident/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   39 +++
 staging-i686/git-fixes.patch   |   28 
 staging-x86_64/PKGBUILD|   39 +++
 staging-x86_64/git-fixes.patch |   28 
 4 files changed, 134 insertions(+)

Copied: xf86-video-trident/repos/staging-i686/PKGBUILD (from rev 281731, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2016-11-21 12:14:49 UTC (rev 281732)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=xf86-video-trident
+pkgver=1.3.7
+pkgrel=3
+pkgdesc="X.org Trident video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+git-fixes.patch)
+sha256sums=('ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae'
+'SKIP'
+'22571bf377e0cd37a8bd48e4d382f1d43010e1bde6382862c226052019120335')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner 

+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../git-fixes.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-video-trident/repos/staging-i686/git-fixes.patch (from rev 281731, 
xf86-video-trident/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2016-11-21 12:14:49 UTC (rev 281732)
@@ -0,0 +1,28 @@
+From b5f4d35327863a14224d2a63885cd8b3b83a1815 Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson 
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
 b/src/compat-api.h
+@@ -75,8 +75,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer 
pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

Copied: xf86-video-trident/repos/staging-x86_64/PKGBUILD (from rev 281731, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-11-21 12:14:49 UTC (rev 281732)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=xf86-video-trident
+pkgver=1.3.7
+pkgrel=3
+pkgdesc="X.org Trident video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+git-fixes.patch)
+sha256sums=('ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae'
+'SKIP'
+'22571bf377e0cd37a8bd48e4d382f1d43010e1bde6382862c226052019120335')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner 

+

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2015-03-30 Thread Laurent Carlier 
Date: Monday, March 30, 2015 @ 20:23:22
  Author: lcarlier
Revision: 235288

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-video-trident/repos/extra-i686/PKGBUILD
(from rev 235287, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/extra-x86_64/PKGBUILD
(from rev 235287, xf86-video-trident/trunk/PKGBUILD)
Deleted:
  xf86-video-trident/repos/extra-i686/PKGBUILD
  xf86-video-trident/repos/extra-i686/git_fixes.diff
  xf86-video-trident/repos/extra-x86_64/PKGBUILD
  xf86-video-trident/repos/extra-x86_64/git_fixes.diff

-+
 /PKGBUILD   |   64 ++
 extra-i686/PKGBUILD |   36 ---
 extra-i686/git_fixes.diff   |   63 -
 extra-x86_64/PKGBUILD   |   36 ---
 extra-x86_64/git_fixes.diff |   63 -
 5 files changed, 64 insertions(+), 198 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-03-30 18:23:13 UTC (rev 235287)
+++ extra-i686/PKGBUILD 2015-03-30 18:23:22 UTC (rev 235288)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-trident
-pkgver=1.3.6
-pkgrel=7
-pkgdesc=X.org Trident video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'xf86dgaproto')
-conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION19' 
'X-ABI-VIDEODRV_VERSION=20')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git_fixes.diff)
-sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104'
-'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-trident/repos/extra-i686/PKGBUILD (from rev 235287, 
xf86-video-trident/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-03-30 18:23:22 UTC (rev 235288)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.7
+pkgrel=1
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'xf86dgaproto')
+conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION19' 
'X-ABI-VIDEODRV_VERSION=20')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha256sums=('ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae'
+'SKIP')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner 
matts...@gmail.com
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Deleted: extra-i686/git_fixes.diff
===
--- extra-i686/git_fixes.diff   2015-03-30 18:23:13 UTC (rev 235287)
+++ extra-i686/git_fixes.diff   2015-03-30 18:23:22 UTC (rev 235288)
@@ -1,63 +0,0 @@
-From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
-From: Adam Jackson a...@redhat.com
-Date: Tue, 25 Sep 2012 12:55:01 +
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson a...@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 tjaal...@ubuntu.com
-Date: Wed, 26 Sep 2012 08:01:26 +
-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 @@
-

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2015-02-05 Thread Laurent Carlier 
Date: Thursday, February 5, 2015 @ 21:20:46
  Author: lcarlier
Revision: 230843

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-trident/repos/staging-i686/
  xf86-video-trident/repos/staging-i686/PKGBUILD
(from rev 230842, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-i686/git_fixes.diff
(from rev 230842, xf86-video-trident/trunk/git_fixes.diff)
  xf86-video-trident/repos/staging-x86_64/
  xf86-video-trident/repos/staging-x86_64/PKGBUILD
(from rev 230842, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-x86_64/git_fixes.diff
(from rev 230842, xf86-video-trident/trunk/git_fixes.diff)

---+
 staging-i686/PKGBUILD |   36 ++
 staging-i686/git_fixes.diff   |   63 
 staging-x86_64/PKGBUILD   |   36 ++
 staging-x86_64/git_fixes.diff |   63 
 4 files changed, 198 insertions(+)

Copied: xf86-video-trident/repos/staging-i686/PKGBUILD (from rev 230842, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-02-05 20:20:46 UTC (rev 230843)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.6
+pkgrel=7
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'xf86dgaproto')
+conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION19' 
'X-ABI-VIDEODRV_VERSION=20')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git_fixes.diff)
+sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104'
+'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-trident/repos/staging-i686/git_fixes.diff (from rev 230842, 
xf86-video-trident/trunk/git_fixes.diff)
===
--- staging-i686/git_fixes.diff (rev 0)
+++ staging-i686/git_fixes.diff 2015-02-05 20:20:46 UTC (rev 230843)
@@ -0,0 +1,63 @@
+From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:55:01 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@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 tjaal...@ubuntu.com
+Date: Wed, 26 Sep 2012 08:01:26 +
+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

Copied: xf86-video-trident/repos/staging-x86_64/PKGBUILD (from rev 230842, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2014-07-18 Thread Laurent Carlier 
Date: Friday, July 18, 2014 @ 13:58:47
  Author: lcarlier
Revision: 217403

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-trident/repos/staging-i686/
  xf86-video-trident/repos/staging-i686/PKGBUILD
(from rev 217402, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-i686/git_fixes.diff
(from rev 217402, xf86-video-trident/trunk/git_fixes.diff)
  xf86-video-trident/repos/staging-x86_64/
  xf86-video-trident/repos/staging-x86_64/PKGBUILD
(from rev 217402, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-x86_64/git_fixes.diff
(from rev 217402, xf86-video-trident/trunk/git_fixes.diff)

---+
 staging-i686/PKGBUILD |   36 ++
 staging-i686/git_fixes.diff   |   63 
 staging-x86_64/PKGBUILD   |   36 ++
 staging-x86_64/git_fixes.diff |   63 
 4 files changed, 198 insertions(+)

Copied: xf86-video-trident/repos/staging-i686/PKGBUILD (from rev 217402, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2014-07-18 11:58:47 UTC (rev 217403)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.6
+pkgrel=6
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'xf86dgaproto')
+conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION18' 
'X-ABI-VIDEODRV_VERSION=19')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git_fixes.diff)
+sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104'
+'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-trident/repos/staging-i686/git_fixes.diff (from rev 217402, 
xf86-video-trident/trunk/git_fixes.diff)
===
--- staging-i686/git_fixes.diff (rev 0)
+++ staging-i686/git_fixes.diff 2014-07-18 11:58:47 UTC (rev 217403)
@@ -0,0 +1,63 @@
+From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:55:01 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@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 tjaal...@ubuntu.com
+Date: Wed, 26 Sep 2012 08:01:26 +
+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

Copied: xf86-video-trident/repos/staging-x86_64/PKGBUILD (from rev 217402, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2013-12-28 Thread Andreas Radke 
Date: Saturday, December 28, 2013 @ 20:56:58
  Author: andyrtr
Revision: 202881

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-trident/repos/staging-i686/
  xf86-video-trident/repos/staging-i686/PKGBUILD
(from rev 202880, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-i686/git_fixes.diff
(from rev 202880, xf86-video-trident/trunk/git_fixes.diff)
  xf86-video-trident/repos/staging-x86_64/
  xf86-video-trident/repos/staging-x86_64/PKGBUILD
(from rev 202880, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-x86_64/git_fixes.diff
(from rev 202880, xf86-video-trident/trunk/git_fixes.diff)

---+
 staging-i686/PKGBUILD |   32 
 staging-i686/git_fixes.diff   |   63 
 staging-x86_64/PKGBUILD   |   32 
 staging-x86_64/git_fixes.diff |   63 
 4 files changed, 190 insertions(+)

Copied: xf86-video-trident/repos/staging-i686/PKGBUILD (from rev 202880, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-12-28 19:56:58 UTC (rev 202881)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.6
+pkgrel=5
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'xf86dgaproto')
+conflicts=('xorg-server1.15.0' 'X-ABI-VIDEODRV_VERSION15' 
'X-ABI-VIDEODRV_VERSION=16')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git_fixes.diff)
+sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104'
+'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-trident/repos/staging-i686/git_fixes.diff (from rev 202880, 
xf86-video-trident/trunk/git_fixes.diff)
===
--- staging-i686/git_fixes.diff (rev 0)
+++ staging-i686/git_fixes.diff 2013-12-28 19:56:58 UTC (rev 202881)
@@ -0,0 +1,63 @@
+From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:55:01 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@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 tjaal...@ubuntu.com
+Date: Wed, 26 Sep 2012 08:01:26 +
+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

Copied: xf86-video-trident/repos/staging-x86_64/PKGBUILD (from rev 202880, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-12-28 19:56:58 UTC (rev 202881)
@@

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2013-03-09 Thread Andreas Radke 
Date: Saturday, March 9, 2013 @ 18:40:14
  Author: andyrtr
Revision: 179758

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-trident/repos/staging-i686/
  xf86-video-trident/repos/staging-i686/PKGBUILD
(from rev 179757, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-i686/git_fixes.diff
(from rev 179757, xf86-video-trident/trunk/git_fixes.diff)
  xf86-video-trident/repos/staging-x86_64/
  xf86-video-trident/repos/staging-x86_64/PKGBUILD
(from rev 179757, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-x86_64/git_fixes.diff
(from rev 179757, xf86-video-trident/trunk/git_fixes.diff)

---+
 staging-i686/PKGBUILD |   33 
 staging-i686/git_fixes.diff   |   63 
 staging-x86_64/PKGBUILD   |   33 
 staging-x86_64/git_fixes.diff |   63 
 4 files changed, 192 insertions(+)

Copied: xf86-video-trident/repos/staging-i686/PKGBUILD (from rev 179757, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-03-09 17:40:14 UTC (rev 179758)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.6
+pkgrel=4
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 
'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server1.14.0' 'X-ABI-VIDEODRV_VERSION14' 
'X-ABI-VIDEODRV_VERSION=15')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git_fixes.diff)
+sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104'
+'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-trident/repos/staging-i686/git_fixes.diff (from rev 179757, 
xf86-video-trident/trunk/git_fixes.diff)
===
--- staging-i686/git_fixes.diff (rev 0)
+++ staging-i686/git_fixes.diff 2013-03-09 17:40:14 UTC (rev 179758)
@@ -0,0 +1,63 @@
+From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:55:01 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@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 tjaal...@ubuntu.com
+Date: Wed, 26 Sep 2012 08:01:26 +
+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

Copied: xf86-video-trident/repos/staging-x86_64/PKGBUILD (from rev 179757, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2012-10-20 Thread andyrtr 
Date: Saturday, October 20, 2012 @ 13:43:29
  Author: andyrtr
Revision: 169416

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-video-trident/repos/extra-i686/PKGBUILD
(from rev 169415, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/extra-i686/git_fixes.diff
(from rev 169415, xf86-video-trident/trunk/git_fixes.diff)
  xf86-video-trident/repos/extra-x86_64/PKGBUILD
(from rev 169415, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/extra-x86_64/git_fixes.diff
(from rev 169415, xf86-video-trident/trunk/git_fixes.diff)
Deleted:
  xf86-video-trident/repos/extra-i686/PKGBUILD
  xf86-video-trident/repos/extra-x86_64/PKGBUILD

-+
 extra-i686/PKGBUILD |   64 +-
 extra-i686/git_fixes.diff   |   63 +
 extra-x86_64/PKGBUILD   |   64 +-
 extra-x86_64/git_fixes.diff |   63 +
 4 files changed, 192 insertions(+), 62 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-20 17:42:53 UTC (rev 169415)
+++ extra-i686/PKGBUILD 2012-10-20 17:43:29 UTC (rev 169416)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-trident
-pkgver=1.3.6
-pkgrel=2
-pkgdesc=X.org Trident video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 
'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-trident/repos/extra-i686/PKGBUILD (from rev 169415, 
xf86-video-trident/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-20 17:43:29 UTC (rev 169416)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.6
+pkgrel=3
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 
'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git_fixes.diff)
+sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104'
+'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-trident/repos/extra-i686/git_fixes.diff (from rev 169415, 
xf86-video-trident/trunk/git_fixes.diff)
===
--- extra-i686/git_fixes.diff   (rev 0)
+++ extra-i686/git_fixes.diff   2012-10-20 17:43:29 UTC (rev 169416)
@@ -0,0 +1,63 @@
+From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:55:01 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@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 tjaal...@ubuntu.com
+Date: Wed, 26 Sep 2012 08:01:26 +
+Subject: Fix loading the driver without XAA
+
+---
+diff

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2012-10-13 Thread andyrtr 
Date: Saturday, October 13, 2012 @ 07:46:02
  Author: andyrtr
Revision: 168591

db-move: moved xf86-video-trident from [testing] to [extra] (i686, x86_64)

Added:
  xf86-video-trident/repos/extra-i686/PKGBUILD
(from rev 168549, xf86-video-trident/repos/testing-i686/PKGBUILD)
  xf86-video-trident/repos/extra-x86_64/PKGBUILD
(from rev 168549, xf86-video-trident/repos/testing-x86_64/PKGBUILD)
Deleted:
  xf86-video-trident/repos/extra-i686/PKGBUILD
  xf86-video-trident/repos/extra-x86_64/PKGBUILD
  xf86-video-trident/repos/testing-i686/
  xf86-video-trident/repos/testing-x86_64/

---+
 extra-i686/PKGBUILD   |   62 
 extra-x86_64/PKGBUILD |   62 
 2 files changed, 62 insertions(+), 62 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-13 11:45:58 UTC (rev 168590)
+++ extra-i686/PKGBUILD 2012-10-13 11:46:02 UTC (rev 168591)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-trident
-pkgver=1.3.6
-pkgrel=1
-pkgdesc=X.org Trident video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel=1.12.0' 'xf86dgaproto')
-conflicts=('xorg-server1.12.0')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-trident/repos/extra-i686/PKGBUILD (from rev 168549, 
xf86-video-trident/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-13 11:46:02 UTC (rev 168591)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.6
+pkgrel=2
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 
'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-10-13 11:45:58 UTC (rev 168590)
+++ extra-x86_64/PKGBUILD   2012-10-13 11:46:02 UTC (rev 168591)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-trident
-pkgver=1.3.6
-pkgrel=1
-pkgdesc=X.org Trident video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel=1.12.0' 'xf86dgaproto')
-conflicts=('xorg-server1.12.0')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-trident/repos/extra-x86_64/PKGBUILD (from rev 168549, 
xf86-video-trident/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-10-13 11:46:02 UTC (rev 168591)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.6
+pkgrel=2
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 
'resourceproto' 'scrnsaverproto')

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2012-10-06 Thread andyrtr 
Date: Saturday, October 6, 2012 @ 16:08:27
  Author: andyrtr
Revision: 168243

db-move: moved xf86-video-trident from [staging] to [testing] (i686, x86_64)

Added:
  xf86-video-trident/repos/testing-i686/
  xf86-video-trident/repos/testing-i686/PKGBUILD
(from rev 168199, xf86-video-trident/repos/staging-i686/PKGBUILD)
  xf86-video-trident/repos/testing-x86_64/
  xf86-video-trident/repos/testing-x86_64/PKGBUILD
(from rev 168199, xf86-video-trident/repos/staging-x86_64/PKGBUILD)
Deleted:
  xf86-video-trident/repos/staging-i686/
  xf86-video-trident/repos/staging-x86_64/

-+
 testing-i686/PKGBUILD   |   31 +++
 testing-x86_64/PKGBUILD |   31 +++
 2 files changed, 62 insertions(+)

Copied: xf86-video-trident/repos/testing-i686/PKGBUILD (from rev 168199, 
xf86-video-trident/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-06 20:08:27 UTC (rev 168243)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.6
+pkgrel=2
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 
'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-trident/repos/testing-x86_64/PKGBUILD (from rev 168199, 
xf86-video-trident/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-06 20:08:27 UTC (rev 168243)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.6
+pkgrel=2
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 
'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2012-03-24 Thread Jan de Groot 
Date: Saturday, March 24, 2012 @ 06:03:48
  Author: jgc
Revision: 154198

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-video-trident/repos/extra-i686/PKGBUILD
(from rev 154197, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/extra-x86_64/PKGBUILD
(from rev 154197, xf86-video-trident/trunk/PKGBUILD)
Deleted:
  xf86-video-trident/repos/extra-i686/PKGBUILD
  xf86-video-trident/repos/extra-i686/trident-1.3.4-git.patch
  xf86-video-trident/repos/extra-x86_64/PKGBUILD
  xf86-video-trident/repos/extra-x86_64/trident-1.3.4-git.patch

--+
 extra-i686/PKGBUILD  |   65 +---
 extra-i686/trident-1.3.4-git.patch   |  523 -
 extra-x86_64/PKGBUILD|   65 +---
 extra-x86_64/trident-1.3.4-git.patch |  523 -
 4 files changed, 62 insertions(+), 1114 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-24 10:03:23 UTC (rev 154197)
+++ extra-i686/PKGBUILD 2012-03-24 10:03:48 UTC (rev 154198)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-trident
-pkgver=1.3.4
-pkgrel=6
-pkgdesc=X.org Trident video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel=1.11.99.903' 'xf86dgaproto')
-conflicts=('xorg-server1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-trident-1.3.4-git.patch)
-sha1sums=('7c40f5c02bddf399862782b708941e79302318af'
-  'cba17aad6cf2f051d89e65ffe26242ed62ea4454')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/trident-1.3.4-git.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-trident/repos/extra-i686/PKGBUILD (from rev 154197, 
xf86-video-trident/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-24 10:03:48 UTC (rev 154198)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.5
+pkgrel=1
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.12.0' 'xf86dgaproto')
+conflicts=('xorg-server1.12.0')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('4bb3d091ab7788e1883d6d9e7e0c7ecbf9f57e5ef03d94a5082c2870dbbfc50b')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Deleted: extra-i686/trident-1.3.4-git.patch
===
--- extra-i686/trident-1.3.4-git.patch  2012-03-24 10:03:23 UTC (rev 154197)
+++ extra-i686/trident-1.3.4-git.patch  2012-03-24 10:03:48 UTC (rev 154198)
@@ -1,523 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index be54427..0fc2066 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -20,47 +20,47 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-trident],
--1.3.4,
-+[1.3.4],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--xf86-video-trident)
--
-+[xf86-video-trident])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by 
XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--  [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+  [m4_fatal([must install xorg-macros 1.8 or later before running 
autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include xorg-server.h])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+

[arch-commits] Commit in xf86-video-trident/repos (6 files)

2012-02-11 Thread andyrtr 
Date: Saturday, February 11, 2012 @ 06:56:00
  Author: andyrtr
Revision: 149886

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-trident/repos/staging-i686/
  xf86-video-trident/repos/staging-i686/PKGBUILD
(from rev 149885, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-i686/trident-1.3.4-git.patch
(from rev 149885, xf86-video-trident/trunk/trident-1.3.4-git.patch)
  xf86-video-trident/repos/staging-x86_64/
  xf86-video-trident/repos/staging-x86_64/PKGBUILD
(from rev 149885, xf86-video-trident/trunk/PKGBUILD)
  xf86-video-trident/repos/staging-x86_64/trident-1.3.4-git.patch
(from rev 149885, xf86-video-trident/trunk/trident-1.3.4-git.patch)

+
 staging-i686/PKGBUILD  |   34 ++
 staging-i686/trident-1.3.4-git.patch   |  523 +++
 staging-x86_64/PKGBUILD|   34 ++
 staging-x86_64/trident-1.3.4-git.patch |  523 +++
 4 files changed, 1114 insertions(+)

Copied: xf86-video-trident/repos/staging-i686/PKGBUILD (from rev 149885, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-02-11 11:56:00 UTC (rev 149886)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.4
+pkgrel=6
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.99.903' 'xf86dgaproto')
+conflicts=('xorg-server1.11.99.903')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+trident-1.3.4-git.patch)
+sha1sums=('7c40f5c02bddf399862782b708941e79302318af'
+  'cba17aad6cf2f051d89e65ffe26242ed62ea4454')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/trident-1.3.4-git.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-trident/repos/staging-i686/trident-1.3.4-git.patch (from rev 
149885, xf86-video-trident/trunk/trident-1.3.4-git.patch)
===
--- staging-i686/trident-1.3.4-git.patch(rev 0)
+++ staging-i686/trident-1.3.4-git.patch2012-02-11 11:56:00 UTC (rev 
149886)
@@ -0,0 +1,523 @@
+diff --git a/configure.ac b/configure.ac
+index be54427..0fc2066 100644
+--- a/configure.ac
 b/configure.ac
+@@ -20,47 +20,47 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-trident],
+-1.3.4,
++[1.3.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-xf86-video-trident)
+-
++[xf86-video-trident])
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-
+ AM_MAINTAINER_MODE
+ 
+-# Require xorg-macros: XORG_DEFAULT_OPTIONS
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by 
XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+-  [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
+-XORG_MACROS_VERSION(1.3)
++  [m4_fatal([must install xorg-macros 1.8 or later before running 
autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ 
+ AH_TOP([#include xorg-server.h])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir,
+-AC_HELP_STRING([--with-xorg-module-dir=DIR],
++AS_HELP_STRING([--with-xorg-module-dir=DIR],
+[Default xorg module directory 
[[default=$libdir/xorg/modules]]]),
+ [moduledir=$withval],
+ [moduledir=$libdir/xorg/modules])
+ 
+-# Checks for extensions
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+ 
+-# Checks for pkg-config packages
++# Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server = 1.0.99.901 xproto fontsproto 
$REQUIRED_MODULES])
+ PKG_CHECK_MODULES(XEXT, [xextproto = 7.0.99.1],
+