Attachment 38273 Details for Bug 29460 – Fix build on GNU/Hurd (v2)

[patch] Fix build on GNU/Hurd (v2)

0006-Fix-build-on-GNU-Hurd.patch (text/plain), 2.55 KB, created by nobled on 2010-08-29 17:34:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nobled

Created: 2010-08-29 17:34:21 UTC

Size: 2.55 KB

patch

obsolete

>From c18d73beb94c4a15c35e15b224c0443b24f0ebee Mon Sep 17 00:00:00 2001
>From: Samuel Thibault <samuel.thibault@ens-lyon.org>
>Date: Mon, 30 Aug 2010 00:25:34 +0000
>Subject: [PATCH] Fix build on GNU/Hurd
>
>Only require libdrm if direct rendering is actually enabled.
>
>Based on the Debian patch file '05_hurd-ftbfs.diff' by Samuel Thibault.
>
>Changes:
>Still check for dri2proto and glproto headers on indirect-only builds.
>---
> configure.ac |   28 ++++++++++++++++++----------
> 1 files changed, 18 insertions(+), 10 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 0b60837..6c704df 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -561,6 +561,14 @@ else
>     enable_xcb=no
> fi
> 
>+dnl Direct rendering or just indirect rendering
>+AC_ARG_ENABLE([driglx-direct],
>+    [AS_HELP_STRING([--disable-driglx-direct],
>+        [enable direct rendering in GLX and EGL for DRI \
>+            @<:@default=enabled@:>@])],
>+    [driglx_direct="$enableval"],
>+    [driglx_direct="yes"])
>+
> dnl
> dnl libGL configuration per driver
> dnl
>@@ -594,12 +602,18 @@ dri)
>         AC_MSG_ERROR([Can't use static libraries for DRI drivers])
>     fi
> 
>-    # Check for libdrm
>-    PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
>     PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
>     PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
>-    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"
>-    DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
>+    GL_PC_REQ_PRIV="dri2proto >= $DRI2PROTO_REQUIRED \
>+        glproto >= $GLPROTO_REQUIRED"
>+
>+    DRI_PC_REQ_PRIV=""
>+    if test x"$driglx_direct" = xyes; then
>+        # Check for libdrm
>+        PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
>+        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED"
>+        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
>+    fi
> 
>     # find the DRI deps for libGL
>     if test "$x11_pkgconfig" = yes; then
>@@ -682,12 +696,6 @@ AC_ARG_WITH([dri-searchpath],
>     [DRI_DRIVER_SEARCH_DIR="$withval"],
>     [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
> AC_SUBST([DRI_DRIVER_SEARCH_DIR])
>-dnl Direct rendering or just indirect rendering
>-AC_ARG_ENABLE([driglx-direct],
>-    [AS_HELP_STRING([--disable-driglx-direct],
>-        [enable direct rendering in GLX and EGL for DRI @<:@default=enabled@:>@])],
>-    [driglx_direct="$enableval"],
>-    [driglx_direct="yes"])
> dnl Which drivers to build - default is chosen by platform
> AC_ARG_WITH([dri-drivers],
>     [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 29460: 37727 | 37728 | 37729 | 38273 | 38531

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.