Attachment 30758 Details for Bug 24766 – Additionally search in /usr/lib/dri/<host, e..g. i486-pc-linux.gnu>/ for DRI modules

[patch] Additionally search in /usr/lib/dri/<host, e..g. i486-pc-linux.gnu>/ for DRI modules

0001-multiarch-Add-extra-DRI-search-path.patch (text/plain), 1.58 KB, created by Chow Loong Jin on 2009-10-27 11:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chow Loong Jin

Created: 2009-10-27 11:40:04 UTC

Size: 1.58 KB

patch

obsolete

>From 720cbce62d5dfebe1a505f10505c884d8b2261f8 Mon Sep 17 00:00:00 2001
>From: Chow Loong Jin <hyperair@gmail.com>
>Date: Wed, 28 Oct 2009 02:24:18 +0800
>Subject: [PATCH] [multiarch] Add extra DRI search path
>
>Mesa uses the libdir obtained at compile-time for searching for loadable
>DRI modules. However, this causes issues on multiarch systems where the
>libraries are shifted to /usr/lib32 instead, while they are compiled
>with libdir=/usr/lib.
>
>This patch fixes that by adding an extra search path
>${libdir}/dri/$(host), which can then be symlinked to /usr/lib32/dri by
>distributions.
>---
> configs/autoconf.in |    2 +-
> configure.ac        |    1 +
> 2 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/configs/autoconf.in b/configs/autoconf.in
>index 83737e3..a88ded2 100644
>--- a/configs/autoconf.in
>+++ b/configs/autoconf.in
>@@ -124,7 +124,7 @@ INSTALL_INC_DIR = $(includedir)
> DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
> 
> # Where libGL will look for DRI hardware drivers
>-DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
>+DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR):$(DRI_DRIVER_INSTALL_DIR)/@HOST@
> 
> # Xorg driver install directory (for xorg state-tracker)
> XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@
>diff --git a/configure.ac b/configure.ac
>index 910c0b1..7c437ec 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -16,6 +16,7 @@ AC_INIT([Mesa],[mesa_version],
>     [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
> AC_CONFIG_AUX_DIR([bin])
> AC_CANONICAL_HOST
>+AC_SUBST([HOST], [$host])
> 
> dnl Versions for external dependencies
> LIBDRM_REQUIRED=2.4.15
>-- 
>1.6.3.3
>

Actions: View | Splinter Review

Attachments on bug 24766: 30758 | 30761 | 30786

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.