From: Jan Rękorajski <baggins@pld-linux.org>
Date: Mon, 28 Nov 2016 08:23:54 +0000 (+0100)
Subject: - fix building with xserver 1.19
X-Git-Tag: auto/th/xorg-driver-video-nv-2.1.20-11
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a4b2ecf917915185eefc23ef220319c92c223fec;p=packages%2Fxorg-driver-video-nv.git

- fix building with xserver 1.19
- rel 11
---

diff --git a/xorg-driver-video-nv.spec b/xorg-driver-video-nv.spec
index cb83c34..d55f498 100644
--- a/xorg-driver-video-nv.spec
+++ b/xorg-driver-video-nv.spec
@@ -2,12 +2,13 @@ Summary:	X.org video driver for NVIDIA video adapters
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla kart graficznych NVIDIA
 Name:		xorg-driver-video-nv
 Version:	2.1.20
-Release:	10
+Release:	11
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-%{version}.tar.bz2
 # Source0-md5:	e263dd0cd149b5224e92baa5a227bb00
 Patch0:		build.patch
+Patch1:		xserver-1.19.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -77,6 +78,7 @@ zamknięte sterowniki firmy NVIDIA (tylko dla nowszych kart).
 %prep
 %setup -q -n xf86-video-nv-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/xserver-1.19.patch b/xserver-1.19.patch
new file mode 100644
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