Hello community,
here is the log from the commit of package xf86-video-trident for
openSUSE:Factory checked in at 2016-12-02 16:43:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-trident (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-trident.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-trident"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-trident/xf86-video-trident.changes
2015-04-02 16:03:26.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-video-trident.new/xf86-video-trident.changes
2016-12-02 16:43:11.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 30 16:47:19 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-trident.spec ++++++
--- /var/tmp/diff_new_pack.AiFJk0/_old 2016-12-02 16:43:12.000000000 +0100
+++ /var/tmp/diff_new_pack.AiFJk0/_new 2016-12-02 16:43:12.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xf86-video-trident
#
-# 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
@@ -24,6 +24,7 @@
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
+Patch0: U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
BuildRequires: pkg-config
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
@@ -73,6 +74,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure
++++++ U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch ++++++
>From b5f4d35327863a14224d2a63885cd8b3b83a1815 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 | 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
