- fix building with xserver 1.19

- rel 4

diff --git a/xorg-driver-video-mga.spec b/xorg-driver-video-mga.spec
index 44b6b9f5b8db0819e044bbd90ab5ba5b9c8813a1..1782d8ab97bffe4fb5d5d93cbc3e0ad55e7d02ba 100644 (file)
--- a/xorg-driver-video-mga.spec
+++ b/xorg-driver-video-mga.spec
@@ -3,12 +3,13 @@ Summary(pl.UTF-8):    Sterownik obrazu X.org dla kart graficznych Matrox
 Name:          xorg-driver-video-mga
 # NOTE: 1.9.100 is older than 1.6.2
 Version:       1.6.4
-Release:       3
+Release:       4
 Epoch:         1
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-%{version}.tar.bz2
 # Source0-md5: cd3db8370caa3e607614ea4e74d4c350
+Patch0:                xserver-1.19.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel
 BuildRequires: autoconf >= 2.60
@@ -64,6 +65,7 @@ PCI i AGP oparte na następujących układach Matroksa:
 
 %prep
 %setup -q -n xf86-video-mga-%{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