<html> <head> <base href="https://bugs.freedesktop.org/" /> </head> <body> <div> <a class="bz_bug_link bz_status_NEW " title="NEW - Multiple conflicting libGL libraries installed" href="https://bugs.freedesktop.org/show_bug.cgi?id=94086#c7">Comment # 7</a> on <a class="bz_bug_link bz_status_NEW " title="NEW - Multiple conflicting libGL libraries installed" href="https://bugs.freedesktop.org/show_bug.cgi?id=94086">bug 94086</a> from <a class="email" href="mailto:emil.l.velikov@gmail.com" title="Emil Velikov <emil.l.velikov@gmail.com>"> Emil Velikov</a> <pre>> --- a/configure.ac > +++ b/configure.ac > @@ -930,10 +930,9 @@ AC_ARG_ENABLE([xlib-glx], > [make GLX library Xlib-based instead of DRI-based @<:@default=disabled@:>@])], > [enable_xlib_glx="$enableval"], > [enable_xlib_glx=no]) >- > AC_ARG_ENABLE([gallium-tests], > [AS_HELP_STRING([--enable-gallium-tests], >- [Enable optional Gallium tests) @<:@default=disabled@:>@])], >+ [Enable optional Gallium tests @<:@default=disabled@:>@])], Please, split this to a separate patch. >@@ -957,6 +956,17 @@ case "$with_gallium_drivers" in > no) with_gallium_drivers='' ;; > esac > >+if test -n "$with_gallium_drivers" -a "x$enable_glx$enable_xlib_glx" = xyesyes; then >+ GALLIUM_XLIB_GLX_DEFAULT="yes" >+else >+ GALLIUM_XLIB_GLX_DEFAULT="no" >+fi >+AC_ARG_ENABLE([gallium-xlib-glx], >+ [AS_HELP_STRING([--enable-gallium-xlib-glx], >+ [enable Gallium implementation of the Xlib-based GLX library @<:@default=enabled if using gallium and xlib-glx@:>@])], >+ [enable_gallium_xlib_glx="$enableval"], >+ [enable_gallium_xlib_glx="$GALLIUM_XLIB_GLX_DEFAULT"]) >+ I'd keep it disabled by default. Similar to its classic counterpart. > if test "x$enable_opengl" = xno -a \ > "x$enable_gles1" = xno -a \ > "x$enable_gles2" = xno -a \ >@@ -1000,6 +1010,15 @@ fi > if test "x$enable_opengl$enable_xlib_glx" = xnoyes; then > AC_MSG_ERROR([Xlib-GLX cannot be built without OpenGL]) > fi >+if test -z "$with_gallium_drivers" -a \ >+ "x$enable_gallium_xlib_glx" = xyes; then >+ AC_MSG_ERROR([Gallium Xlib-GLX cannot be built without Gallium]) Strictly speaking one should be able to build it without explicitly requiring any gallium drivers. Although that can happen once we fix a few bugs. >+fi >+if test "x$enable_xlib_glx$enable_gallium_xlib_glx" = xnoyes; then wrong check - should be xyesyes >+ AC_MSG_ERROR([Gallium Xlib-GLX cannot be built without Xlib-GLX]) and here "classic and gallium Xlib-GLX cannot be built together" The remaining places that check enable_xlib_glx should be updated (or just nuked with preparatory patch) to attribute the gallium one as well. The check around NEED_WINSYS_XLIB=foo should be the gallium one. >@@ -2604,11 +2623,14 @@ if test "x$enable_dri" != xno; then > echo " DRI driver dir: $DRI_DRIVER_INSTALL_DIR" > fi > >-case "x$enable_glx$enable_xlib_glx" in >-xyesyes) >+case "x$enable_glx$enable_xlib_glx$enable_gallium_xlib_glx" in >+xyesyesyes) >+ echo " GLX: Xlib-based (Gallium)" >+ ;; >+xyesyesno) > echo " GLX: Xlib-based" > ;; >-xyesno) >+xyesno*) With the above suggestions this can only be xyesnono. > echo " GLX: DRI-based" > ;; > *) >diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am >index 086e170..c4dc224 100644 >--- a/src/gallium/Makefile.am >+++ b/src/gallium/Makefile.am >@@ -141,8 +141,10 @@ SUBDIRS += state_trackers/dri targets/dri > endif > > if HAVE_X11_DRIVER Drop this conditional. >+if HAVE_GALLIUM_X11_DRIVER > SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib > endif >+endif > > if HAVE_ST_OMX > SUBDIRS += state_trackers/omx targets/omx >diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am >index 3903818..7abc7b0 100644 >--- a/src/mesa/Makefile.am >+++ b/src/mesa/Makefile.am >@@ -22,8 +22,10 @@ > SUBDIRS = . main/tests > > if HAVE_X11_DRIVER >+if !HAVE_GALLIUM_X11_DRIVER You don't need the extra conditional here. Thanks for bringing this topic and working on the patch. I can realise it's not the easiest/prettiest of things ;-)</pre> </div> <hr> You are receiving this mail because: <ul> <li>You are the QA Contact for the bug.</li> <li>You are the assignee for the bug.</li> </ul> </body> </html>