ChangeLog | 16 ++++++++++++++++ configure.ac | 2 +- debian/changelog | 8 ++++++++ debian/control | 6 ++---- 4 files changed, 27 insertions(+), 5 deletions(-)
New commits: commit 03fce85e9fb111a6d0123d10a2e5d242343adb86 Author: Andreas Boll <[email protected]> Date: Wed Jan 18 14:49:50 2017 +0100 Bump Standards-Version to 3.9.8. diff --git a/debian/changelog b/debian/changelog index 3bafb7f..7ebd0eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-trident (1:1.3.8-1) UNRELEASED; urgency=medium * New upstream release. * Move URL from description to Homepage field. + * Bump Standards-Version to 3.9.8. -- Andreas Boll <[email protected]> Wed, 18 Jan 2017 14:48:29 +0100 diff --git a/debian/control b/debian/control index edc3bae..18b5ace 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, -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-trident.git Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident.git commit b782e9303a477ede0b97370c3286d41339f5a476 Author: Andreas Boll <[email protected]> Date: Wed Jan 18 14:49:28 2017 +0100 Move URL from description to Homepage field. diff --git a/debian/changelog b/debian/changelog index 64f34a9..3bafb7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-trident (1:1.3.8-1) UNRELEASED; urgency=medium * New upstream release. + * Move URL from description to Homepage field. -- Andreas Boll <[email protected]> Wed, 18 Jan 2017 14:48:29 +0100 diff --git a/debian/control b/debian/control index 72c9257..edc3bae 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Build-Depends: x11proto-randr-dev, x11proto-render-dev, Standards-Version: 3.9.3 +Homepage: https://www.x.org 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 @@ -32,7 +33,4 @@ Description: X.Org X server -- Trident display driver This package provides the driver for Trident Blade/Image/ProVidia/TGUI/9xxx video cards. . - More information about X.Org can be found at: - <URL:https://www.X.org> - . This package is built from the X.org xf86-video-trident driver module. commit 3ae5cbb6f2c47fa451a0fbc588f0184f06e53d97 Author: Andreas Boll <[email protected]> Date: Wed Jan 18 14:48:35 2017 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 3af1266..70a1f54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +commit dadf45e8eb52ec8404ee596ee13984470b736fbd +Author: Matt Turner <[email protected]> +Date: Tue Jan 17 14:48:51 2017 -0800 + + xf86-video-trident 1.3.8 + + Signed-off-by: Matt Turner <[email protected]> + +commit b5f4d35327863a14224d2a63885cd8b3b83a1815 +Author: Adam Jackson <[email protected]> +Date: Tue Jul 19 10:03:56 2016 -0400 + + Adapt Block/WakeupHandler signature for ABI 23 + + Signed-off-by: Adam Jackson <[email protected]> + commit 64c02f307d7146641adf65e31bcaa2d1238479e7 Author: Matt Turner <[email protected]> Date: Mon Mar 30 10:06:15 2015 -0700 diff --git a/debian/changelog b/debian/changelog index 5efadfe..64f34a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-trident (1:1.3.8-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Andreas Boll <[email protected]> Wed, 18 Jan 2017 14:48:29 +0100 + xserver-xorg-video-trident (1:1.3.7-2) unstable; urgency=medium [ Andreas Boll ] commit dadf45e8eb52ec8404ee596ee13984470b736fbd Author: Matt Turner <[email protected]> Date: Tue Jan 17 14:48:51 2017 -0800 xf86-video-trident 1.3.8 Signed-off-by: Matt Turner <[email protected]> diff --git a/configure.ac b/configure.ac index 89fa22a..f07c86a 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-trident], - [1.3.7], + [1.3.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-trident]) AC_CONFIG_SRCDIR([Makefile.am]) commit b5f4d35327863a14224d2a63885cd8b3b83a1815 Author: Adam Jackson <[email protected]> Date: Tue Jul 19 10:03:56 2016 -0400 Adapt Block/WakeupHandler signature for ABI 23 Signed-off-by: Adam Jackson <[email protected]> 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
