← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/31-multiarch-dri-path.patch

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/31-multiarch-dri-path.patch
 
1
Description: Fix 3d guest acceleration with the multiarched mesa package.
 
2
Author: Felix Geyer <debfx-pkg@fobos.de>
 
3
 
 
4
diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
 
5
--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
 
6
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
 
7
@@ -37,10 +37,10 @@
 
8
 
 
9
 //@todo this could be different...
 
10
 #ifdef RT_ARCH_AMD64
 
11
-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri"
 
12
+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/x86_64-linux-gnu/dri:/usr/lib64/dri:/usr/lib/dri"
 
13
 # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
 
14
 #else
 
15
-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri"
 
16
+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/i386-linux-gnu/dri:/usr/lib/dri"
 
17
 # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
 
18
 #endif
 
19