- fix building with xserver 1.19

- rel 4

diff --git a/xorg-driver-video-trident.spec b/xorg-driver-video-trident.spec
index 26318a4ba7d44c1a259e6e1ea2bcb0b955c90688..9053dcf0158b852a1daf21396bdda52deca3728b 100644 (file)
--- a/xorg-driver-video-trident.spec
+++ b/xorg-driver-video-trident.spec
@@ -2,11 +2,12 @@ Summary:      X.org video driver for Trident video adapters
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla kart graficznych Trident
 Name:          xorg-driver-video-trident
 Version:       1.3.7
-Release:       3
+Release:       4
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-%{version}.tar.bz2
 # Source0-md5: 04243bba246fe369c30a3b970f5b1c23
+Patch0:                xserver-1.19.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -56,6 +57,7 @@ PCI, AGP i ISA oparte na następujących układach:
 
 %prep
 %setup -q -n xf86-video-trident-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}

diff --git a/xserver-1.19.patch b/xserver-1.19.patch
new file mode 100644 (file)
index 0000000..a73ba2d
--- /dev/null
+++ b/xserver-1.19.patch
@@ -0,0 +1,16 @@
+--- xf86-video-chips-1.2.6/src/compat-api.h~   2015-09-26 18:28:01.000000000 +0200
++++ xf86-video-chips-1.2.6/src/compat-api.h    2016-11-28 09:12:37.337570460 +0100
+@@ -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