Hello community, here is the log from the commit of package xf86-video-nv for openSUSE:Factory checked in at 2016-12-06 14:22:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-nv (Old) and /work/SRC/openSUSE:Factory/.xf86-video-nv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-nv" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-nv/xf86-video-nv.changes 2013-12-11 17:45:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-nv.new/xf86-video-nv.changes 2016-12-06 14:22:39.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 30 15:25:14 UTC 2016 - [email protected] + +- 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-nv.spec ++++++ --- /var/tmp/diff_new_pack.Ids7Ur/_old 2016-12-06 14:22:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Ids7Ur/_new 2016-12-06 14:22:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-nv # -# Copyright (c) 2013 SUSE LINUX Products 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 @@ -28,6 +28,7 @@ Patch1: U_Remove-mibstore.h.patch Patch2: U_Include-xf86Modes.h-to-use-functions-from-hw-xfree86.patch Patch3: U_init-Initialize-VGA-IOBase-before-using-it.patch +Patch4: U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: libtool @@ -66,6 +67,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build autoreconf -fi ++++++ U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch ++++++ >From 42e260a7ab630fdfa4664f467dad25e7178ff809 Mon Sep 17 00:00:00 2001 From: Adam Jackson <[email protected]> Date: Tue, 19 Jul 2016 10:03:56 -0400 Subject: [PATCH] Adapt Block/WakeupHandler signature for ABI 23 Signed-off-by: Adam Jackson <[email protected]> --- src/compat-api.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/compat-api.h b/src/compat-api.h index 0a87cf5..62d9481 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
