xf86-video-r128: Branch 'master' - 4 commits

[GitLab Mirror]

 configure.ac          |    4 ++--
 man/r128.man          |    6 ------
 src/r128_exa_render.c |    2 ++
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 38216bdc81321a8bb70a4c7ce226194537cc63d6
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Oct 22 21:01:12 2018 -0700

    Version bumped to 6.12.0
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 59ab822..b1c6cc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-r128],
-        [6.11.102],
+        [6.12.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-r128])
 AC_CONFIG_SRCDIR([Makefile.am])
commit 0dc8f6d099e74a61a280e8cd8b7b93b229f95c7f
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Oct 22 20:58:43 2018 -0700

    Remove Dac6Bit option from man page
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/man/r128.man b/man/r128.man
index bd58e0d..a93157a 100644
--- a/man/r128.man
+++ b/man/r128.man
@@ -78,12 +78,6 @@ stable.  EXA is a newer acceleration architecture with better performance for
 the Render and Composite extensions.  The default is
 .B XAA.
 .TP
-.BI "Option \*qDac6Bit\*q \*q" boolean \*q
-Enables or disables the use of 6 bits per color component when in 8 bpp
-mode (emulates VGA mode).  By default, all 8 bits per color component
-are used.  The default is
-.B off.
-.TP
 .BI "Option \*qVideoKey\*q \*q" integer \*q
 This overrides the default pixel value for the YUV video overlay key.
 The default value is
commit 3c292d8f90eae03e6e6806a68a4f749bb39db9ba
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Oct 22 20:46:20 2018 -0700

    Fix for build failure when --disable-dri option is specified
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/r128_exa_render.c b/src/r128_exa_render.c
index 5f265e3..0d81a09 100644
--- a/src/r128_exa_render.c
+++ b/src/r128_exa_render.c
@@ -38,6 +38,7 @@
 #include "config.h"
 #endif
 
+#if defined(R128DRI) && defined(RENDER)
 #include "xf86.h"
 #include "exa.h"
 
@@ -742,3 +743,4 @@ R128CCEComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, int d
     ADVANCE_RING();
 }
 
+#endif
commit 9d62b878ce40d9b5f7887c63a4e2498a52253c36
Author: Helmut Grohne <helmut at subdivi.de>
Date:   Mon Oct 22 19:06:15 2018 -0700

    Another fix for cross build failure
    
    While commit 11b230b removed most usage of AC_CHECK_FILE, one more of
    it was left in the compilation build script. This will hopefully fix
    the cross build failure for good.
    
    Signed-off-by: Helmut Grohne <helmut at subdivi.de>

diff --git a/configure.ac b/configure.ac
index 04884f7..59ab822 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,7 +131,7 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
 AC_MSG_CHECKING([whether to enable EXA support])
 if test "x$EXA" = xyes; then
         AC_MSG_RESULT(yes)
-        AC_CHECK_FILE(${sdkdir}/exa.h, [have_exa_h="yes"], [have_exa_h="no"])
+        AS_IF([test -f "${sdkdir}/exa.h"], [have_exa_h="yes"], [have_exa_h="no"])
 else
         AC_MSG_RESULT(no)
 fi