xf86-video-intel: 3 commits - configure.ac src/backlight.c src/uxa/i965_video.c

[Chris Wilson]

 configure.ac         |    4 +++-
 src/backlight.c      |    2 +-
 src/uxa/i965_video.c |    1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 53e825d6cfe49a4db5588718ea910c46d656ecfa
Author: Patrick Welche <prlw1 at cam.ac.uk>
Date:   Mon Jan 26 12:25:42 2015 +0000

    configure.ac: pwd doesn't take an argument
    
    bash built-in doesn't give an error, but real pwd does, and the
    argument is unnecessary.
    
    Signed-off-by: Patrick Welche <prlw1 at cam.ac.uk>

diff --git a/configure.ac b/configure.ac
index 0ba56c1..3704722 100644
--- a/configure.ac
+++ b/configure.ac
@@ -847,7 +847,7 @@ AC_OUTPUT
 
 echo ""
 echo ""
-test -e `pwd $0`/README && cat `pwd $0`/README
+cat $srcdir/README
 
 accel_msg=""
 if test "x$SNA" != "xno"; then
commit 75fcda80580445be2030a83f3595a217c8982f8d
Author: Patrick Welche <prlw1 at cam.ac.uk>
Date:   Mon Jan 26 12:25:41 2015 +0000

    uxa: fix XVMC = no build
    
    Signed-off-by: Patrick Welche <prlw1 at cam.ac.uk>

diff --git a/src/uxa/i965_video.c b/src/uxa/i965_video.c
index 68e6fd3..438ab90 100644
--- a/src/uxa/i965_video.c
+++ b/src/uxa/i965_video.c
@@ -37,7 +37,6 @@
 #include "fourcc.h"
 
 #include "intel.h"
-#include "intel_xvmc.h"
 #include "intel_uxa.h"
 #include "i830_reg.h"
 #include "i965_reg.h"
commit ac90648ec7cdc9cc0514105f30a83df04ea1e1a5
Author: Patrick Welche <prlw1 at cam.ac.uk>
Date:   Mon Jan 26 12:25:40 2015 +0000

    backlight.c: test for features
    
    Signed-off-by: Patrick Welche <prlw1 at cam.ac.uk>

diff --git a/configure.ac b/configure.ac
index 314e638..0ba56c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -398,6 +398,8 @@ AC_ARG_ENABLE(sna,
 	      [SNA="$enableval"],
 	      [SNA=auto])
 
+AC_CHECK_HEADERS([dev/wscons/wsconsio.h])
+
 if test "x$SNA" != "xno"; then
 	AC_DEFINE(USE_SNA, 1, [Enable SNA support])
 	AC_CHECK_HEADERS([sys/sysinfo.h], AC_CHECK_MEMBERS([struct sysinfo.totalram], [], [], [[#include <sys/sysinfo.h>]]))
diff --git a/src/backlight.c b/src/backlight.c
index 9f23986..5d63b2c 100644
--- a/src/backlight.c
+++ b/src/backlight.c
@@ -84,7 +84,7 @@ void backlight_init(struct backlight *b)
 	b->has_power = 0;
 }
 
-#ifdef __OpenBSD__
+#ifdef HAVE_DEV_WSCONS_WSCONSIO_H
 
 #include <dev/wscons/wsconsio.h>
 #include <xf86Priv.h>