[arch-commits] Commit in xf86-video-tdfx/trunk (PKGBUILD git-fixes.patch)

[Laurent Carlier]

Date: Monday, November 21, 2016 @ 12:23:16
  Author: lcarlier
Revision: 281733

upgpkg: xf86-video-tdfx 1.4.6-1

xorg-server-1.19 rebuild

Modified:
  xf86-video-tdfx/trunk/PKGBUILD
  xf86-video-tdfx/trunk/git-fixes.patch

-+
 PKGBUILD|   21 +-
 git-fixes.patch |  430 ++
 2 files changed, 34 insertions(+), 417 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-21 12:14:49 UTC (rev 281732)
+++ PKGBUILD2016-11-21 12:23:16 UTC (rev 281733)
@@ -2,20 +2,23 @@
 # Maintainer: Jan de Groot 
 
 pkgname=xf86-video-tdfx
-pkgver=1.4.5
-pkgrel=7
+pkgver=1.4.6
+pkgrel=1
 pkgdesc="X.org tdfx video driver"
 arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/;
+url="https://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
 optdepends=('tdfx-dri: DRI1 support from community repo')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
-sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859'
-'8e63c17584d4e2afed2ce496de3270f0c99460eab2923dce123a072026542cc3')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+git-fixes.patch)
+sha256sums=('3a8a88867c40ad61f1c9a09ffd7ac64102fa821685855d50ce66c7603dcc6d37'
+'SKIP'
+'f0db3082cf55196492b34083005a9a57b6b532ef2d9cc6403f1b05e1a5424de0')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner 

 
 prepare() {
   cd ${pkgname}-${pkgver}

Modified: git-fixes.patch
===
--- git-fixes.patch 2016-11-21 12:14:49 UTC (rev 281732)
+++ git-fixes.patch 2016-11-21 12:23:16 UTC (rev 281733)
@@ -1,420 +1,34 @@
-From 10498d2730c651eb7a1890eb9e728269732e9dad Mon Sep 17 00:00:00 2001
+From b99390efcb55d7d4a68e8c595119c1af4426fc0b Mon Sep 17 00:00:00 2001
 From: Adam Jackson 
-Date: Tue, 25 Sep 2012 12:54:59 +
-Subject: Remove mibstore.h
+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/tdfx_driver.c b/src/tdfx_driver.c
-index ddd5431..412da07 100644
 a/src/tdfx_driver.c
-+++ b/src/tdfx_driver.c
-@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
- #include "compiler.h"
- 
--/* Drivers using the mi implementation of backing store need: */
--
--#include "mibstore.h"
--
- /* All drivers using the vgahw module need this */
- /* This driver needs to be modified to not use vgaHW for multihead operation 
*/
- #include "vgaHW.h"
-@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
- }
-   }
- 
--  miInitializeBackingStore(pScreen);
-   xf86SetBackingStore(pScreen);
-   xf86SetSilkenMouse(pScreen);
- 
---
-cgit v0.9.0.2-2-gbebe
-From 457bd576a4895f0d3a65e550dbe2470177bf650d Mon Sep 17 00:00:00 2001
-From: Guillem Jover 
-Date: Fri, 27 Sep 2013 18:52:01 +0200
-Subject: Define local PCI IDs instead of using xf86PciInfo.h
 
-The header file is deprecated and issues a warning now. Stop using
-it, and move the definitions to the local tree as recommended by the
-warning.
-
-Signed-off-by: Guillem Jover 
-Reviewed-by: Adam Jackson 
-
-diff --git a/src/tdfx.h b/src/tdfx.h
-index 7782473..7e3be81 100644
 a/src/tdfx.h
-+++ b/src/tdfx.h
-@@ -12,7 +12,6 @@
- #include 
- #include 
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 98ba435..44daea4 100644
+--- a/src/compat-api.h
 b/src/compat-api.h
+@@ -78,11 +78,19 @@
  
--#include "xf86PciInfo.h"
- #include "xf86Pci.h"
- #include "xf86DDC.h"
- #include "xf86xv.h"
-@@ -73,6 +72,17 @@
- (p)->memBase[region]
- #endif
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
  
-+#define PCI_VENDOR_3DFX   0x121A
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
 +
-+#define PCI_CHIP_VOODOO_GRAPHICS  0x0001
-+#define PCI_CHIP_VOODOO2  0x0002
-+#define PCI_CHIP_BANSHEE  0x0003
-+#define PCI_CHIP_VOODOO3  0x0005
-+#define PCI_CHIP_VOODOO5  0x0009
-+
-+#define PCI_CARD_VOODOO3_2000 0x0036
-+#define PCI_CARD_VOODOO3_3000 0x003A
-+
- struct _TDFXRec;
- typedef struct _TDFXRec *TDFXPtr;
++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, 

[arch-commits] Commit in xf86-video-tdfx/trunk (PKGBUILD git-fixes.patch)

[Laurent Carlier]

Date: Thursday, February 5, 2015 @ 22:42:58
  Author: lcarlier
Revision: 230864

upgpkg: xf86-video-tdfx 1.4.5-6

xorg-server 1.17 rebuild

Modified:
  xf86-video-tdfx/trunk/PKGBUILD
  xf86-video-tdfx/trunk/git-fixes.patch

-+
 PKGBUILD|8 -
 git-fixes.patch |  388 ++
 2 files changed, 392 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-05 21:36:28 UTC (rev 230863)
+++ PKGBUILD2015-02-05 21:42:58 UTC (rev 230864)
@@ -3,19 +3,19 @@
 
 pkgname=xf86-video-tdfx
 pkgver=1.4.5
-pkgrel=5
+pkgrel=6
 pkgdesc=X.org tdfx 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-server1.16' 'X-ABI-VIDEODRV_VERSION18' 
'X-ABI-VIDEODRV_VERSION=19')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION19' 
'X-ABI-VIDEODRV_VERSION=20')
 optdepends=('tdfx-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
 sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859'
-'a79d50f619e6976b90a73f1a9842390e1b3fa37e1ce519bfbb178bd3161af9b5')
+'8e63c17584d4e2afed2ce496de3270f0c99460eab2923dce123a072026542cc3')
 
 prepare() {
   cd ${pkgname}-${pkgver}

Modified: git-fixes.patch
===
--- git-fixes.patch 2015-02-05 21:36:28 UTC (rev 230863)
+++ git-fixes.patch 2015-02-05 21:42:58 UTC (rev 230864)
@@ -30,3 +30,391 @@
  
 --
 cgit v0.9.0.2-2-gbebe
+From 457bd576a4895f0d3a65e550dbe2470177bf650d Mon Sep 17 00:00:00 2001
+From: Guillem Jover guil...@hadrons.org
+Date: Fri, 27 Sep 2013 18:52:01 +0200
+Subject: Define local PCI IDs instead of using xf86PciInfo.h
+
+The header file is deprecated and issues a warning now. Stop using
+it, and move the definitions to the local tree as recommended by the
+warning.
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+Reviewed-by: Adam Jackson a...@redhat.com
+
+diff --git a/src/tdfx.h b/src/tdfx.h
+index 7782473..7e3be81 100644
+--- a/src/tdfx.h
 b/src/tdfx.h
+@@ -12,7 +12,6 @@
+ #include string.h
+ #include stdio.h
+ 
+-#include xf86PciInfo.h
+ #include xf86Pci.h
+ #include xf86DDC.h
+ #include xf86xv.h
+@@ -73,6 +72,17 @@
+ (p)-memBase[region]
+ #endif
+ 
++#define PCI_VENDOR_3DFX   0x121A
++
++#define PCI_CHIP_VOODOO_GRAPHICS  0x0001
++#define PCI_CHIP_VOODOO2  0x0002
++#define PCI_CHIP_BANSHEE  0x0003
++#define PCI_CHIP_VOODOO3  0x0005
++#define PCI_CHIP_VOODOO5  0x0009
++
++#define PCI_CARD_VOODOO3_2000 0x0036
++#define PCI_CARD_VOODOO3_3000 0x003A
++
+ struct _TDFXRec;
+ typedef struct _TDFXRec *TDFXPtr;
+ 
+diff --git a/src/tdfx_accel.c b/src/tdfx_accel.c
+index 65933b4..e62e193 100644
+--- a/src/tdfx_accel.c
 b/src/tdfx_accel.c
+@@ -11,9 +11,6 @@
+ /* Drivers that need to access the PCI config space directly need this */
+ #include xf86Pci.h
+ 
+-/* Drivers for PCI hardware need this */
+-#include xf86PciInfo.h
+-
+ /* Drivers that use XAA need this */
+ #ifdef HAVE_XAA_H
+ #include xaalocal.h
+diff --git a/src/tdfx_dri.c b/src/tdfx_dri.c
+index 76064c3..87ec0e8 100644
+--- a/src/tdfx_dri.c
 b/src/tdfx_dri.c
+@@ -5,7 +5,6 @@
+ 
+ #include xf86.h
+ #include xf86_OSproc.h
+-#include xf86PciInfo.h
+ #include xf86Pci.h
+ #include fb.h
+ #include miline.h
+-- 
+cgit v0.10.2
+From 646137de571a9df950d3a3edb454803268fd5f98 Mon Sep 17 00:00:00 2001
+From: Guillem Jover guil...@hadrons.org
+Date: Fri, 27 Sep 2013 19:06:31 +0200
+Subject: Rename XSERVER_PCIACCESS to XSERVER_LIBPCIACCESS
+
+Using the wrong macro name means that the code uses an obsolete typedef
+that issues warnings.
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+Reviewed-by: Adam Jackson a...@redhat.com
+
+diff --git a/src/tdfx.h b/src/tdfx.h
+index 7e3be81..d8a72db 100644
+--- a/src/tdfx.h
 b/src/tdfx.h
+@@ -226,7 +226,7 @@ typedef struct _TDFXRec {
+   unsigned long MMIOAddr[MAXCHIPS];
+   EntityInfoPtr pEnt;
+   int numChips;
+-#ifndef XSERVER_PCIACCESS
++#ifndef XSERVER_LIBPCIACCESS
+   PCITAG PciTag[MAXCHIPS];
+ #endif
+   Bool Primary;
+-- 
+cgit v0.10.2
+From 774461a4ac92c39c3b3ec975a887540dfa791eae Mon Sep 17 00:00:00 2001
+From: Guillem Jover guil...@hadrons.org
+Date: Fri, 27 Sep 2013 19:20:11 +0200
+Subject: Use new pci_device_(un)map_range functions instead of deprecated ones
+
+Signed-off-by: Guillem Jover guil...@hadrons.org
+Reviewed-by: Adam Jackson a...@redhat.com
+
+diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
+index 412da07..6bc123b 100644
+--- a/src/tdfx_driver.c
 b/src/tdfx_driver.c
+@@ -1253,11 

[arch-commits] Commit in xf86-video-tdfx/trunk (PKGBUILD git-fixes.patch)

[Andreas Radke]

Date: Saturday, March 9, 2013 @ 18:35:47
  Author: andyrtr
Revision: 179755

upgpkg: xf86-video-tdfx 1.4.5-3

rebuild for new X-ABI-VIDEODRV_VERSION=14; add a git fix

Added:
  xf86-video-tdfx/trunk/git-fixes.patch
Modified:
  xf86-video-tdfx/trunk/PKGBUILD

-+
 PKGBUILD|   12 +++-
 git-fixes.patch |   32 
 2 files changed, 39 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-09 17:31:35 UTC (rev 179754)
+++ PKGBUILD2013-03-09 17:35:47 UTC (rev 179755)
@@ -3,22 +3,24 @@
 
 pkgname=xf86-video-tdfx
 pkgver=1.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc=X.org tdfx video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 
'scrnsaverproto')
-conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 
'scrnsaverproto')
+conflicts=('xorg-server1.14.0' 'X-ABI-VIDEODRV_VERSION14' 
'X-ABI-VIDEODRV_VERSION=15')
 optdepends=('tdfx-dri: DRI1 support from community repo')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
+sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859'
+'a79d50f619e6976b90a73f1a9842390e1b3fa37e1ce519bfbb178bd3161af9b5')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2013-03-09 17:35:47 UTC (rev 179755)
@@ -0,0 +1,32 @@
+From 10498d2730c651eb7a1890eb9e728269732e9dad Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:54:59 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
+index ddd5431..412da07 100644
+--- a/src/tdfx_driver.c
 b/src/tdfx_driver.c
+@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include compiler.h
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include mibstore.h
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation 
*/
+ #include vgaHW.h
+@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
+ }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe