xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 configure.ac |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b955ddd0d41801e4ca0c30a70a5d0b27c3f366c8
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Mon Sep 16 10:58:22 2013 -0400

    glamor: require 0.5.1 or newer
    
    0.5.1 fixes a number of issues.
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/configure.ac b/configure.ac
index f25d5e8..0fe0991 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,7 @@ AC_ARG_ENABLE(glamor,
 AC_MSG_RESULT([$GLAMOR])
 AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno)
 if test "x$GLAMOR" != "xno"; then
-	PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.3.1])
+	PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.5.1])
 	PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl])
 	AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration])
 fi
commit 282587cd0709850e7bacb1d8307065d95dc2c97d
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Mon Sep 16 09:41:13 2013 -0400

    radeon: enable glamor by default (v4)
    
    It's required for newer asics, so enable it by
    default.
    
    v2: update the autoconf help.  Require --disable-glamor
    to build without glamor support.
    v3: default to yes rather than auto
    v4: fix help text
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/configure.ac b/configure.ac
index d1cf115..f25d5e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,10 +100,10 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
 
 AC_MSG_CHECKING([whether to include GLAMOR support])
 AC_ARG_ENABLE(glamor,
-	      AS_HELP_STRING([--enable-glamor],
-			     [Enable glamor, a new GL-based acceleration [default=no]]),
+	      AS_HELP_STRING([--disable-glamor],
+			     [Disable glamor, a new GL-based acceleration [default=enabled]]),
 	      [GLAMOR="$enableval"],
-	      [GLAMOR=no])
+	      [GLAMOR=yes])
 AC_MSG_RESULT([$GLAMOR])
 AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno)
 if test "x$GLAMOR" != "xno"; then