From 7a9606209d7379774cc5754912e8045afb53dc4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 28 Nov 2016 20:04:55 +0100 Subject: [PATCH] - fix building with xserver 1.19 - rel 10 --- xorg-driver-video-sisusb.spec | 4 +++- xserver-1.19.patch | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 xserver-1.19.patch diff --git a/xorg-driver-video-sisusb.spec b/xorg-driver-video-sisusb.spec index 714182a..02b32ac 100644 --- a/xorg-driver-video-sisusb.spec +++ b/xorg-driver-video-sisusb.spec @@ -2,12 +2,13 @@ Summary: X.org video driver for SiS video chips connected via a Net2280-based US Summary(pl.UTF-8): Sterownik obrazu X.org dla układów SiS podłączonych poprzez przejściówkę USB Net2280 Name: xorg-driver-video-sisusb Version: 0.9.6 -Release: 9 +Release: 10 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-%{version}.tar.bz2 # Source0-md5: 8ebcd2bc5a87a3f1362fa76616a83e57 Patch0: mibstore.patch +Patch1: xserver-1.19.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -47,6 +48,7 @@ Uwaga: wymaga sterownika jądra Linuksa (załączonego w wersji Linuksa %prep %setup -q -n xf86-video-sisusb-%{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 -- 2.44.0