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

[Connor Behan]

 configure.ac      |    8 ++------
 src/r128_accel.c  |    2 +-
 src/r128_crtc.c   |    1 +
 src/r128_output.c |    1 +
 4 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit bfff401440c5bb72fb1ce90c804f3a5623d733b0
Author: Connor Behan <connor.behan at gmail.com>
Date:   Mon Mar 2 16:15:16 2015 -0500

    Make it easier to find EXA
    
    As of commit e31564e1a21e73f4d20d6471da4fc7a9b63e4062, the xserver is
    more picky about the order in which headers are included. We need to
    account for this in order for the compile time exa.h check to succeed.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>

diff --git a/configure.ac b/configure.ac
index 3cc3113..7b461c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,12 +121,7 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
 AC_MSG_CHECKING([whether to enable EXA support])
 if test "x$EXA" = xyes; then
         AC_MSG_RESULT(yes)
-
-        SAVE_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-        AC_CHECK_HEADER(exa.h,
-                       [have_exa_h="yes"], [have_exa_h="no"])
-        CPPFLAGS="$SAVE_CPPFLAGS"
+        AC_CHECK_FILE(${sdkdir}/exa.h, [have_exa_h="yes"], [have_exa_h="no"])
 else
         AC_MSG_RESULT(no)
 fi
@@ -136,6 +131,7 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
 if test "x$have_exa_h" = xyes; then
         AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
         AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+#include "xorg-server.h"
 #include "exa.h"
 #if EXA_VERSION_MAJOR < 2
 #error OLD EXA!
commit e13dd1d338e4501c9d98c86c60806cc3d6801ea8
Author: Connor Behan <connor.behan at gmail.com>
Date:   Mon Mar 2 15:21:17 2015 -0500

    Include dpmsconst header
    
    Fixes the build on some systems. Thank-you to Andrew Randrianasulu for
    the patch.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>

diff --git a/src/r128_crtc.c b/src/r128_crtc.c
index 26d4414..d62cc6a 100644
--- a/src/r128_crtc.c
+++ b/src/r128_crtc.c
@@ -35,6 +35,7 @@
 
 #include "xf86.h"
 #include "xf86Modes.h"
+#include "X11/extensions/dpmsconst.h"
 
 #include "r128.h"
 #include "r128_probe.h"
diff --git a/src/r128_output.c b/src/r128_output.c
index 6c35e78..0160880 100644
--- a/src/r128_output.c
+++ b/src/r128_output.c
@@ -35,6 +35,7 @@
 
 #include "xf86.h"
 #include "xf86Modes.h"
+#include "X11/extensions/dpmsconst.h"
 
 #include "r128.h"
 #include "r128_probe.h"
commit 86533afa3dd9a3567330f157d03cd8188f89cc72
Author: Connor Behan <connor.behan at gmail.com>
Date:   Mon Mar 2 15:18:19 2015 -0500

    Typo fix
    
    This only affects XAA builds but still. Thank-you to Andrew
    Randrianasulu for the patch.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>

diff --git a/src/r128_accel.c b/src/r128_accel.c
index c88e8f9..7f70220 100644
--- a/src/r128_accel.c
+++ b/src/r128_accel.c
@@ -1851,7 +1851,7 @@ static void R128MMIOAccelInit(ScrnInfoPtr pScrn, XAAInfoRecPtr a)
 					  | LEFT_EDGE_CLIPPING_NEGATIVE_X
 					  | SCANLINE_PAD_DWORD;
 
-    if (xf86IsEntityShared(info->pEnt-index)) {
+    if (xf86IsEntityShared(info->pEnt->index)) {
         /* If there are more than one devices sharing this entity, we
          * have to assign this call back, otherwise the XAA will be
          * disabled.