[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg-devel
Subject:    Re: [PATCH] dri2: Unbreak DRI2 AIGLX
From:       "Jasper St. Pierre" <jstpierre () mecheye ! net>
Date:       2013-10-30 22:33:54
Message-ID: CAA0H+QQLvyBDAO8pBpYF6-xaUmRBJNrtahotBh9k_ZRg1dmQcw () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Should you change (default: auto) ?


On Wed, Oct 30, 2013 at 6:26 PM, Adam Jackson <ajax@redhat.com> wrote:

> DRI2 AIGLX was defaulting to 'auto', the tests for building the actual
> loader were checking for 'yes', whoops.  This ought to be a check for
> the appropriate DRI2 protocol bits, but this is good enough for an RC.
>
> Signed-off-by: Adam Jackson <ajax@redhat.com>
> ---
>  configure.ac | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index d29f170..0859252 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -612,7 +612,7 @@ AC_ARG_ENABLE(xdmcp,
>  AS_HELP_STRING([--disable-xdmcp], [Build XDMCP ext
>  AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1],
> [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval],
> [XDMAUTH=auto])
>  AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX
> extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
>  AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI
> extension (default: auto)]), [DRI=$enableval])
> -AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2
> extension (default: auto)]), [DRI2=$enableval], [DRI2=auto])
> +AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2
> extension (default: auto)]), [DRI2=$enableval], [DRI2=yes])
>  AC_ARG_ENABLE(xinerama,              AS_HELP_STRING([--disable-xinerama],
> [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval],
> [XINERAMA=yes])
>  AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode],
> [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval],
> [XF86VIDMODE=auto])
>  AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build
> X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
> @@ -1083,7 +1083,7 @@ fi
>  if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
>         AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
>  fi
> -AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test
> "x$AIGLX" = xyes)
> +AM_CONDITIONAL(AIGLX_DRI_LOADER, test "x$DRI2" = xyes && test "x$AIGLX" =
> xyes)
>
>  if test "x$GLX_USE_TLS" = xyes ; then
>         GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
> --
> 1.8.3.1
>
> _______________________________________________
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>



-- 
  Jasper

[Attachment #5 (text/html)]

<div dir="ltr">Should you change (default: auto) ?<br></div><div \
class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Oct 30, 2013 at 6:26 PM, \
Adam Jackson <span dir="ltr">&lt;<a href="mailto:ajax@redhat.com" \
target="_blank">ajax@redhat.com</a>&gt;</span> wrote:<br> <blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">DRI2 AIGLX was defaulting to &#39;auto&#39;, the tests for \
building the actual<br> loader were checking for &#39;yes&#39;, whoops.  This ought \
to be a check for<br> the appropriate DRI2 protocol bits, but this is good enough for \
an RC.<br> <br>
Signed-off-by: Adam Jackson &lt;<a \
                href="mailto:ajax@redhat.com">ajax@redhat.com</a>&gt;<br>
---<br>
 <a href="http://configure.ac" target="_blank">configure.ac</a> | 4 ++--<br>
 1 file changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a \
href="http://configure.ac" target="_blank">configure.ac</a><br> index \
                d29f170..0859252 100644<br>
--- a/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
+++ b/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
@@ -612,7 +612,7 @@ AC_ARG_ENABLE(xdmcp,          AS_HELP_STRING([--disable-xdmcp], \
[Build XDMCP ext<br>  AC_ARG_ENABLE(xdm-auth-1,     \
AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), \
[XDMAUTH=$enableval], [XDMAUTH=auto])<br>  AC_ARG_ENABLE(glx,            \
AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), \
[GLX=$enableval], [GLX=yes])<br>  AC_ARG_ENABLE(dri,            \
AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), \
                [DRI=$enableval])<br>
-AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2 extension \
(default: auto)]), [DRI2=$enableval], [DRI2=auto])<br> +AC_ARG_ENABLE(dri2,           \
AS_HELP_STRING([--enable-dri2], [Build DRI2 extension (default: auto)]), \
[DRI2=$enableval], [DRI2=yes])<br>  AC_ARG_ENABLE(xinerama,              \
AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), \
[XINERAMA=$enableval], [XINERAMA=yes])<br>  AC_ARG_ENABLE(xf86vidmode,    \
AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: \
auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto])<br>  AC_ARG_ENABLE(xace,       \
AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), \
[XACE=$enableval], [XACE=yes])<br> @@ -1083,7 +1083,7 @@ fi<br>
 if test &quot;x$AIGLX&quot; = xyes -a \( &quot;x$DRI2&quot; = xyes \); then<br>
        AC_DEFINE(AIGLX, 1, [Build AIGLX loader])<br>
 fi<br>
-AM_CONDITIONAL(AIGLX_DRI_LOADER, { test &quot;x$DRI2&quot; = xyes; } &amp;&amp; test \
&quot;x$AIGLX&quot; = xyes)<br> +AM_CONDITIONAL(AIGLX_DRI_LOADER, test \
&quot;x$DRI2&quot; = xyes &amp;&amp; test &quot;x$AIGLX&quot; = xyes)<br> <br>
 if test &quot;x$GLX_USE_TLS&quot; = xyes ; then<br>
        GLX_DEFINES=&quot;-DGLX_USE_TLS -DPTHREADS&quot;<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.3.1<br>
<br>
_______________________________________________<br>
<a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org \
                development<br>
Archives: <a href="http://lists.x.org/archives/xorg-devel" \
                target="_blank">http://lists.x.org/archives/xorg-devel</a><br>
Info: <a href="http://lists.x.org/mailman/listinfo/xorg-devel" \
target="_blank">http://lists.x.org/mailman/listinfo/xorg-devel</a><br> \
</font></span></blockquote></div><br><br clear="all"><br>-- <br>  Jasper<br> </div>



_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic