Update to xf86-video-trident 1.3.8

driver/xf86-video-trident/ChangeLog

@@ -1,3 +1,19 @@
+commit dadf45e8eb52ec8404ee596ee13984470b736fbd
+Author: Matt Turner <mattst88@gmail.com>
+Date:   Tue Jan 17 14:48:51 2017 -0800
+
+    xf86-video-trident 1.3.8
+    
+    Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit b5f4d35327863a14224d2a63885cd8b3b83a1815
+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 64c02f307d7146641adf65e31bcaa2d1238479e7
 Author: Matt Turner <mattst88@gmail.com>
 Date:   Mon Mar 30 10:06:15 2015 -0700

driver/xf86-video-trident/compile

@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify

driver/xf86-video-trident/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-video-trident 1.3.7.
+# Generated by GNU Autoconf 2.69 for xf86-video-trident 1.3.8.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xf86-video-trident'
 PACKAGE_TARNAME='xf86-video-trident'
-PACKAGE_VERSION='1.3.7'
-PACKAGE_STRING='xf86-video-trident 1.3.7'
+PACKAGE_VERSION='1.3.8'
+PACKAGE_STRING='xf86-video-trident 1.3.8'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-trident 1.3.7 to adapt to many kinds of systems.
+\`configure' configures xf86-video-trident 1.3.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1435,7 +1435,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xf86-video-trident 1.3.7:";;
+     short | recursive ) echo "Configuration of xf86-video-trident 1.3.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1567,7 +1567,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-trident configure 1.3.7
+xf86-video-trident configure 1.3.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1982,7 +1982,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-trident $as_me 1.3.7, which was
+It was created by xf86-video-trident $as_me 1.3.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2811,7 +2811,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-trident'
- VERSION='1.3.7'
+ VERSION='1.3.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18827,7 +18827,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xf86-video-trident $as_me 1.3.7, which was
+This file was extended by xf86-video-trident $as_me 1.3.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18893,7 +18893,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xf86-video-trident config.status 1.3.7
+xf86-video-trident config.status 1.3.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

driver/xf86-video-trident/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])

driver/xf86-video-trident/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