[packages/xorg-driver-video-r128] - fix building with xserver 1.19 - rel 3
baggins
baggins at pld-linux.org
Mon Nov 28 20:09:25 CET 2016
commit 26151888d911e829d6a320dfe7d9d762c20b9e25
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Nov 28 20:09:10 2016 +0100
- fix building with xserver 1.19
- rel 3
xorg-driver-video-r128.spec | 4 +++-
xserver-1.19.patch | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-r128.spec b/xorg-driver-video-r128.spec
index 8c9a65f..10c33ef 100644
--- a/xorg-driver-video-r128.spec
+++ b/xorg-driver-video-r128.spec
@@ -2,11 +2,12 @@ Summary: X.org video drivers for ATI Rage128 adapters
Summary(pl.UTF-8): Sterowniki obrazu X.org do kart graficznych ATI Rage128
Name: xorg-driver-video-r128
Version: 6.10.1
-Release: 2
+Release: 3
License: MIT
Group: X11/Applications
Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-%{version}.tar.bz2
# Source0-md5: 770c2342141874f8a81a95ecd1839746
+Patch0: xserver-1.19.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -50,6 +51,7 @@ Rage Fury AGP 32MB, XPERT 128 AGP 16MB i XPERT 99 AGP 8MB.
%prep
%setup -q -n xf86-video-r128-%{version}
+%patch0 -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-r128.git/commitdiff/26151888d911e829d6a320dfe7d9d762c20b9e25
More information about the pld-cvs-commit
mailing list