xserver-xorg-video-tdfx: Changes to 'debian-unstable'
ChangeLog | 16 ++++++++++++++++
configure.ac | 2 +-
debian/changelog | 8 ++++++++
debian/control | 6 ++----
4 files changed, 27 insertions(+), 5 deletions(-)
New commits:
commit deaa3fbb5cffa63a7da27ba609763c24a31640ec
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Jan 18 14:45:34 2017 +0100
Bump Standards-Version to 3.9.8.
diff --git a/debian/changelog b/debian/changelog
index 22f0550..ba77a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-tdfx (1:1.4.7-1) UNRELEASED; urgency=medium
* New upstream release.
* Move URL from description to Homepage field.
+ * Bump Standards-Version to 3.9.8.
-- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 18 Jan 2017 14:44:21 +0100
diff --git a/debian/control b/debian/control
index a510adf..c3143ca 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
libdrm-dev (>> 2.0) [!hurd-i386],
x11proto-xf86dri-dev,
quilt,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.8
Homepage: https://www.x.org
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
commit 18e28fa66e735cbcea68bd5d4880a65cc8de159c
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Jan 18 14:45:12 2017 +0100
Move URL from description to Homepage field.
diff --git a/debian/changelog b/debian/changelog
index 3915ca8..22f0550 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-tdfx (1:1.4.7-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Move URL from description to Homepage field.
-- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 18 Jan 2017 14:44:21 +0100
diff --git a/debian/control b/debian/control
index 90e386d..a510adf 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends:
x11proto-xf86dri-dev,
quilt,
Standards-Version: 3.9.3
+Homepage: https://www.x.org
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
@@ -36,7 +37,4 @@ Description: X.Org X server -- tdfx display driver
This package provides the driver for 3dfx Voodoo video cards and their
derivatives.
.
- More information about X.Org can be found at:
- <URL:https://www.X.org>
- .
This package is built from the X.org xf86-video-tdfx driver module.
commit 2dc0d57fb0b56d9e3ce41b652657b23efbd48d56
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Jan 18 14:44:27 2017 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 30897ce..e3e295d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+commit 4dd4a5da0697d33df0f456ccf224d5be945b7aab
+Author: Matt Turner <mattst88@gmail.com>
+Date: Tue Jan 17 14:48:21 2017 -0800
+
+ xf86-video-tdfx 1.4.7
+
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit b99390efcb55d7d4a68e8c595119c1af4426fc0b
+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>
+
commit 278042ff4c469f24ab7bc28e517e8a78e2821ddc
Author: Matt Turner <mattst88@gmail.com>
Date: Sun Feb 22 13:26:24 2015 -0800
diff --git a/debian/changelog b/debian/changelog
index 45a6cef..3915ca8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tdfx (1:1.4.7-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 18 Jan 2017 14:44:21 +0100
+
xserver-xorg-video-tdfx (1:1.4.6-2) unstable; urgency=medium
[ Andreas Boll ]
commit 4dd4a5da0697d33df0f456ccf224d5be945b7aab
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Jan 17 14:48:21 2017 -0800
xf86-video-tdfx 1.4.7
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/configure.ac b/configure.ac
index ead618e..798577e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-tdfx],
- [1.4.6],
+ [1.4.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-tdfx])
AC_CONFIG_SRCDIR([Makefile.am])
commit b99390efcb55d7d4a68e8c595119c1af4426fc0b
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>
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: