Hello community,

here is the log from the commit of package xf86-video-sis for openSUSE:Factory 
checked in at 2016-12-06 14:22:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-sis (Old)
 and      /work/SRC/openSUSE:Factory/.xf86-video-sis.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xf86-video-sis"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-sis/xf86-video-sis.changes    
2015-10-02 15:38:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-video-sis.new/xf86-video-sis.changes       
2016-12-06 14:22:58.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 30 16:34:20 UTC 2016 - sndir...@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-sis.spec ++++++
--- /var/tmp/diff_new_pack.u5WkYJ/_old  2016-12-06 14:22:59.000000000 +0100
+++ /var/tmp/diff_new_pack.u5WkYJ/_new  2016-12-06 14:22:59.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xf86-video-sis
 #
-# 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
@@ -26,6 +26,7 @@
 Source0:        
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
 Source1:        
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2.sig
 Source2:        %{name}.keyring
+Patch0:         U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontsproto)
@@ -57,6 +58,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure

++++++ U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch ++++++
>From 96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 Mon Sep 17 00:00:00 2001
From: Adam Jackson <a...@redhat.com>
Date: Tue, 19 Jul 2016 10:03:56 -0400
Subject: [PATCH] Adapt Block/WakeupHandler signature for ABI 23

Signed-off-by: Adam Jackson <a...@redhat.com>
---
 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




Reply via email to