debian/changelog | 7 +++++++
debian/control | 6 +++---
debian/copyright | 2 +-
debian/watch | 2 +-
src/compat-api.h | 5 +++++
5 files changed, 17 insertions(+), 5 deletions(-)
New commits:
commit 9e7c93005aa8f3de7c0b62554ff557c3f30c4f33
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Nov 18 13:05:14 2016 +0100
Update a bunch of URLs in packaging to https.
diff --git a/debian/control b/debian/control
index de94001..72c9257 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends:
x11proto-randr-dev,
x11proto-render-dev,
Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident
-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git
+Vcs-Git:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident.git
+Vcs-Browser:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident.git
Package: xserver-xorg-video-trident
Architecture: any
@@ -33,6 +33,6 @@ Description: X.Org X server -- Trident display driver
video cards.
.
More information about X.Org can be found at:
- <URL:http://www.X.org>
+ <URL:https://www.X.org>
.
This package is built from the X.org xf86-video-trident driver module.
diff --git a/debian/copyright b/debian/copyright
index 95ee309..af02849 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
+https://xorg.freedesktop.org/releases/individual/driver/
Copyright 1997-2003 by Alan Hourihane, North Wales, UK.
diff --git a/debian/watch b/debian/watch
index 6490c83..6e02e51 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-trident
version=3
opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/driver/
xf86-video-trident-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/driver/
xf86-video-trident-(.*)\.tar\.gz
commit 6a82d8c8afd94af6f644f0f063e35ea5541b1dba
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Nov 18 13:05:02 2016 +0100
Document the cherry-pick in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 6dad22f..3931ac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-trident (1:1.3.7-2) UNRELEASED; urgency=medium
+
+ * Cherry-pick commit b5f4d35 (Adapt Block/WakeupHandler signature for
+ ABI 23) from upstream master branch.
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Fri, 18 Nov 2016 13:04:19 +0100
+
xserver-xorg-video-trident (1:1.3.7-1) unstable; urgency=medium
* Let uscan verify tarball signatures.
commit 5acaea8673ac278e49fe38100822a4eea13e88b4
Author: Adam Jackson <a...@redhat.com>
Date: Tue Jul 19 10:03:56 2016 -0400
Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <a...@redhat.com>
(cherry picked from commit b5f4d35327863a14224d2a63885cd8b3b83a1815)
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
