commit 40da646f659df8ffa4f6ecdb632c829e9e43055b
Author: Jan Rękorajski <[email protected]>
Date: Mon Nov 28 20:02:06 2016 +0100
- fix building with xserver 1.19
- rel 4
xorg-driver-video-xgi.spec | 4 +++-
xserver-1.19.patch | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-xgi.spec b/xorg-driver-video-xgi.spec
index a0e012b..e25f207 100644
--- a/xorg-driver-video-xgi.spec
+++ b/xorg-driver-video-xgi.spec
@@ -2,12 +2,13 @@ Summary: X.org video drivers for XGI adapters
Summary(pl.UTF-8): Sterowniki obrazu X.org do kart graficznych XGI
Name: xorg-driver-video-xgi
Version: 1.6.1
-Release: 3
+Release: 4
License: MIT
Group: X11/Applications
Source0:
http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-%{version}.tar.bz2
# Source0-md5: 103a17936676318b4b09af94dbc420a9
Patch0: %{name}-build.patch
+Patch1: xserver-1.19.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -48,6 +49,7 @@ Sterowniki obrazu X.org do kart graficznych XGI:
%prep
%setup -q -n xf86-video-xgi-%{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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-xgi.git/commitdiff/40da646f659df8ffa4f6ecdb632c829e9e43055b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
