[packages/xorg-driver-video-siliconmotion] - fix building with xserver 1.19 - rel 4
baggins
baggins at pld-linux.org
Mon Nov 28 20:07:46 CET 2016
commit 0e0634aebe3a9466bc54d29a8ccfa9eacc1f0712
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Nov 28 20:07:26 2016 +0100
- fix building with xserver 1.19
- rel 4
xorg-driver-video-siliconmotion.spec | 4 +++-
xserver-1.19.patch | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-siliconmotion.spec b/xorg-driver-video-siliconmotion.spec
index 58f979b..bffe2ef 100644
--- a/xorg-driver-video-siliconmotion.spec
+++ b/xorg-driver-video-siliconmotion.spec
@@ -2,11 +2,12 @@ Summary: X.org video driver for Silicon Motion video chips
Summary(pl.UTF-8): Sterownik obrazu X.org dla układów graficznych Silicon Motion
Name: xorg-driver-video-siliconmotion
Version: 1.7.8
-Release: 3
+Release: 4
License: MIT
Group: X11/Applications
Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-%{version}.tar.bz2
# Source0-md5: 46846be22f9e68db941abca7cd9334d9
+Patch0: xserver-1.19.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -53,6 +54,7 @@ Obsługuje karty PCI i AGP oparte na następujących układach:
%prep
%setup -q -n xf86-video-siliconmotion-%{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-siliconmotion.git/commitdiff/0e0634aebe3a9466bc54d29a8ccfa9eacc1f0712
More information about the pld-cvs-commit
mailing list