Attachment 102646 Details for Bug 80848 – configure: check for core xcb (libxcb.so) and link libGL against it

[patch] configure: check for core xcb (libxcb.so) and link libGL against it

0001-configure-check-for-core-xcb-libxcb.so-and-link-libG.patch (text/plain), 2.18 KB, created by Emil Velikov on 2014-07-11 23:15:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emil Velikov

Created: 2014-07-11 23:15:13 UTC

Size: 2.18 KB

patch

obsolete

>From d3c6eddb061c9d431fdf2130923d20fdbe279091 Mon Sep 17 00:00:00 2001
>From: Emil Velikov <emil.l.velikov@gmail.com>
>Date: Fri, 11 Jul 2014 23:17:48 +0100
>Subject: [PATCH 1/3] configure: check for core xcb (libxcb.so) and link libGL
> against it.
>
>Make sure to check the presence of the module in order to pick the
>correct libs flag and before feeding them to the compiler/linker.
>
>Current libGL depends conditionally (when building with dri3) upon
>xcb 1.9.3 and unconditionally on ancient xcb functions -
>xcb_generate_id and xcb_request_check amongst others.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80848
>Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
>---
> configure.ac | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 48f5f81..53941d2 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -41,6 +41,7 @@ GLPROTO_REQUIRED=1.4.14
> LIBOMXIL_BELLAGIO_REQUIRED=0.0
> VDPAU_REQUIRED=0.4.1
> WAYLAND_REQUIRED=1.2.0
>+XCB_REQUIRED=1.9.3
> XCBDRI2_REQUIRED=1.8
> XCBGLX_REQUIRED=1.8.1
> XSHMFENCE_REQUIRED=1.1
>@@ -909,8 +910,9 @@ dnl
> case "x$enable_glx$enable_xlib_glx" in
> xyesyes)
>     # Xlib-based GLX
>-    PKG_CHECK_MODULES([XLIBGL], [x11 xext])
>-    GL_PC_REQ_PRIV="x11 xext"
>+    dri_modules="x11 xext xcb"
>+    PKG_CHECK_MODULES([XLIBGL], [$dri_modules])
>+    GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
>     X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS"
>     GL_LIB_DEPS="$XLIBGL_LIBS"
>     GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
>@@ -921,7 +923,7 @@ xyesno)
>     PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
> 
>     # find the DRI deps for libGL
>-    dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= $XCBGLX_REQUIRED"
>+    dri_modules="x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"
> 
>     if test x"$driglx_direct" = xyes; then
>         if test x"$dri_platform" = xdrm ; then
>@@ -942,6 +944,7 @@ xyesno)
>             fi
> 
>             if test x"$enable_dri3" = xyes; then
>+               PKG_CHECK_MODULES([TMPDRI3], [xcb >= $XCB_REQUIRED])
>                dri_modules="$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence >= $XSHMFENCE_REQUIRED"
>             fi
>         fi
>-- 
>2.0.0
>

Actions: View | Splinter Review

Attachments on bug 80848: 102646 | 103683 | 110039 | 110402

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.