commit xf86-video-mga for openSUSE:Factory

Hello community, here is the log from the commit of package xf86-video-mga for openSUSE:Factory checked in at 2016-12-02 16:42:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-mga (Old) and /work/SRC/openSUSE:Factory/.xf86-video-mga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-mga" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-mga/xf86-video-mga.changes 2016-07-14 09:44:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-mga.new/xf86-video-mga.changes 2016-12-02 16:42:51.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 30 15:20:14 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-mga.spec ++++++ --- /var/tmp/diff_new_pack.yriY4p/_old 2016-12-02 16:42:52.000000000 +0100 +++ /var/tmp/diff_new_pack.yriY4p/_new 2016-12-02 16:42:52.000000000 +0100 @@ -29,6 +29,7 @@ Patch2: u_Fix-crash-when-EXA-accel-mode-is-enabled.patch Patch3: u_EXA-Fix-UploadToScreen.patch Patch4: u_shadow-Calulate-the-shadow-buffer-size-correctly.patch +Patch5: U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -72,6 +73,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %configure ++++++ U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch ++++++

From df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/compat-api.h b/src/compat-api.h index 6bc946f..89976e4 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -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.6.6