From 04987bf6cdd4849e73be01a8422e0690f29c2084 Mon Sep 17 00:00:00 2001
From: Jan Rękorajski
Date: Mon, 28 Nov 2016 20:20:40 +0100
Subject: - fix building with xserver 1.19 - rel 4


diff --git a/xorg-driver-video-savage.spec b/xorg-driver-video-savage.spec
index b0e4e93..3e9ddb2 100644
--- a/xorg-driver-video-savage.spec
+++ b/xorg-driver-video-savage.spec
@@ -2,11 +2,12 @@ Summary:	X.org video driver for S3 Savage family video chips
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla układów graficznych z rodziny S3 Savage
 Name:		xorg-driver-video-savage
 Version:	2.3.8
-Release:	3
+Release:	4
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-%{version}.tar.bz2
 # Source0-md5:	b29672072aacd5ea0d569235e9e25ae1
+Patch0:		xserver-1.19.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel
 BuildRequires:	autoconf >= 2.60
@@ -56,6 +57,7 @@ dualhead jest obsługiwany na układach MX, IX i SuperSavage.
 
 %prep
 %setup -q -n xf86-video-savage-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/xserver-1.19.patch b/xserver-1.19.patch
new file mode 100644
index 0000000..90c9e80
--- /dev/null
+++ b/xserver-1.19.patch
@@ -0,0 +1,22 @@
+--- xf86-video-tdfx-1.4.6/src/compat-api.h.orig	2013-02-07 08:56:21.000000000 +0100
++++ xf86-video-tdfx-1.4.6/src/compat-api.h	2016-11-28 20:18:27.981446211 +0100
+@@ -78,11 +78,19 @@
+ 
+ #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
++
++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
++#define WAKEUPHANDLER_ARGS arg, result
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+ 
+ #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
+ #define WAKEUPHANDLER_ARGS arg, result, read_mask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
-- 
cgit v0.10.2