xserver-xorg-video-tdfx: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/control | 6 +++---
debian/copyright | 2 +-
debian/watch | 2 +-
src/compat-api.h | 8 ++++++++
5 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit 80fd4ee386aaee96530d718d5afd6f48d4230514
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Nov 18 12:55:08 2016 +0100
Update a bunch of URLs in packaging to https.
diff --git a/debian/changelog b/debian/changelog
index 4fa427b..5422afb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-tdfx (1:1.4.6-2) UNRELEASED; urgency=medium
* Cherry-pick commit b99390e (Adapt Block/WakeupHandler signature for
ABI 23) from upstream master branch.
+ * Update a bunch of URLs in packaging to https.
-- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 18 Nov 2016 12:54:46 +0100
diff --git a/debian/control b/debian/control
index 3eecf5b..90e386d 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Build-Depends:
x11proto-xf86dri-dev,
quilt,
Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tdfx
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tdfx.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tdfx.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tdfx.git
Package: xserver-xorg-video-tdfx
Architecture: any
@@ -37,6 +37,6 @@ Description: X.Org X server -- tdfx display driver
derivatives.
.
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-tdfx driver module.
diff --git a/debian/copyright b/debian/copyright
index 3df5a99..b79103a 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 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
All Rights Reserved.
diff --git a/debian/watch b/debian/watch
index 4cd883c..f46459a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-tdfx
version=3
opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-tdfx-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-tdfx-(.*)\.tar\.gz
commit 1d58735e282305b293f9fc6082339df3e1cd3a5e
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Nov 18 12:54:51 2016 +0100
Document the cherry-pick in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 64952a0..4fa427b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-tdfx (1:1.4.6-2) UNRELEASED; urgency=medium
+
+ * Cherry-pick commit b99390e (Adapt Block/WakeupHandler signature for
+ ABI 23) from upstream master branch.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 18 Nov 2016 12:54:46 +0100
+
xserver-xorg-video-tdfx (1:1.4.6-1) unstable; urgency=medium
* Let uscan verify tarball signatures.
commit c12a96849a97a6b94d77af05159c0b2016fb40a0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 19 10:03:56 2016 -0400
Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit b99390efcb55d7d4a68e8c595119c1af4426fc0b)
diff --git a/src/compat-api.h b/src/compat-api.h
index 98ba435..44daea4 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
Reply to: