commit xf86-video-savage for openSUSE:Factory

Hello community, here is the log from the commit of package xf86-video-savage for openSUSE:Factory checked in at 2016-12-02 16:42:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-savage (Old) and /work/SRC/openSUSE:Factory/.xf86-video-savage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-savage" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-savage/xf86-video-savage.changes 2015-11-26 17:01:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-savage.new/xf86-video-savage.changes 2016-12-02 16:42:55.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 30 16:25:26 UTC 2016 - sndirsch@suse.com + +- U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch + * Adapt Block/WakeupHandler signature for ABI 23 + +------------------------------------------------------------------- New: ---- U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-savage.spec ++++++ --- /var/tmp/diff_new_pack.PgPwor/_old 2016-12-02 16:42:56.000000000 +0100 +++ /var/tmp/diff_new_pack.PgPwor/_new 2016-12-02 16:42:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-savage # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 Patch2: u_Disable-tiling-on-SuperSavage-Novell-Bugzilla-805380.patch +Patch3: U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -55,6 +56,7 @@ %prep %setup -q %patch2 -p1 +%patch3 -p1 %build %configure ++++++ U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch ++++++

From de3e1803314820968502156703d5bfe3fab24972 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 19 Jul 2016 10:03:56 -0400 Subject: [PATCH] Adapt Block/WakeupHandler signature for ABI 23

Signed-off-by: Adam Jackson --- src/compat-api.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/compat-api.h b/src/compat-api.h index 98ba435..44daea4 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -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.6.6