From c7b59914e4e1d2d15c77b24ded4ab061f8969c3f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 28 Nov 2016 20:19:38 +0100 Subject: [PATCH] - fix building with xserver 1.19 - rel 4 --- xorg-driver-video-tdfx.spec | 4 +++- xserver-1.19.patch | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 xserver-1.19.patch diff --git a/xorg-driver-video-tdfx.spec b/xorg-driver-video-tdfx.spec index f4009b8..ef20351 100644 --- a/xorg-driver-video-tdfx.spec +++ b/xorg-driver-video-tdfx.spec @@ -2,11 +2,12 @@ Summary: X.org video driver for 3Dfx video adapters Summary(pl.UTF-8): Sterownik obrazu X.org dla kart graficznych 3Dfx Name: xorg-driver-video-tdfx Version: 1.4.6 -Release: 3 +Release: 4 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-%{version}.tar.bz2 # Source0-md5: 3ad54183fa339ef2ab10e2704ba95060 +Patch0: xserver-1.19.patch URL: http://xorg.freedesktop.org/ BuildRequires: Mesa-libGL-devel BuildRequires: autoconf >= 2.60 @@ -46,6 +47,7 @@ Voodoo Banshee, Voodoo3, Voodoo4 i Voodoo5. %prep %setup -q -n xf86-video-tdfx-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/xserver-1.19.patch b/xserver-1.19.patch new file mode 100644 index 0000000..90c9e80 --- /dev/null +++ b/xserver-1.19.patch @@ -0,0 +1,22 @@ +--- xf86-video-tdfx-1.4.6/src/compat-api.h.orig 2013-02-07 08:56:21.000000000 +0100 ++++ xf86-video-tdfx-1.4.6/src/compat-api.h 2016-11-28 20:18:27.981446211 +0100 +@@ -78,11 +78,19 @@ + + #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 ++ ++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result ++#define WAKEUPHANDLER_ARGS arg, result ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + + #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask + #define WAKEUPHANDLER_ARGS arg, result, read_mask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen -- 2.44.0