configure.ac | 2 +- src/compat-api.h | 5 +++++ src/r128_crtc.c | 6 ++++++ src/r128_driver.c | 4 ---- src/r128_output.c | 6 ++++++ 5 files changed, 18 insertions(+), 5 deletions(-)
New commits: commit b93b78f41154d24371acb1081c423351e8f370fd Author: Matt Turner <[email protected]> Date: Tue Jan 17 14:43:12 2017 -0800 xf86-video-r128 6.10.2 Signed-off-by: Matt Turner <[email protected]> diff --git a/configure.ac b/configure.ac index 9aaa3ea..c61d000 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-r128], - [6.10.1], + [6.10.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-r128]) AC_CONFIG_SRCDIR([Makefile.am]) commit 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5 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 commit a589dd6baf7fa26f8ea7008ba6bd533a5ba3e76e Author: Connor Behan <[email protected]> Date: Wed Apr 13 12:41:00 2016 -0400 Remove gatos advertisement There are many current working ways to use a TV tuner with Linux. This is not one of them. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=94915 Signed-off-by: Connor Behan <[email protected]> diff --git a/src/r128_driver.c b/src/r128_driver.c index 9a676d5..5695614 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -1435,10 +1435,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) if (info->MMIO) R128UnmapMMIO(pScrn); info->MMIO = NULL; - xf86DrvMsg(pScrn->scrnIndex, X_NOTICE, - "For information on using the multimedia capabilities\n\tof this" - " adapter, please see http://gatos.sf.net.\n";); - return TRUE; fail: commit 3328547c840664896c12d0fd2db8f63e3a398a62 Author: Kevin Brace <[email protected]> Date: Wed Mar 16 18:59:23 2016 -0700 xextproto 7.1 support update to the source code While the compilation script was updated, for some reason, the source code did not get the update. Signed-off-by: Kevin Brace <[email protected]> Reviewed-by: Connor Behan <[email protected]> diff --git a/src/r128_crtc.c b/src/r128_crtc.c index d62cc6a..ed77492 100644 --- a/src/r128_crtc.c +++ b/src/r128_crtc.c @@ -35,7 +35,13 @@ #include "xf86.h" #include "xf86Modes.h" + +#ifdef HAVE_XEXTPROTO_71 #include "X11/extensions/dpmsconst.h" +#else +#define DPMS_SERVER +#include "X11/extensions/dpms.h" +#endif #include "r128.h" #include "r128_probe.h" diff --git a/src/r128_output.c b/src/r128_output.c index a2c754b..73b4af2 100644 --- a/src/r128_output.c +++ b/src/r128_output.c @@ -35,7 +35,13 @@ #include "xf86.h" #include "xf86Modes.h" + +#ifdef HAVE_XEXTPROTO_71 #include "X11/extensions/dpmsconst.h" +#else +#define DPMS_SERVER +#include "X11/extensions/dpms.h" +#endif #include "r128.h" #include "r128_probe.h"
