- xserver rebuild

[packages/VirtualBox.git] / VirtualBox-dri.patch

diff --git a/VirtualBox-dri.patch b/VirtualBox-dri.patch
index a707e0b65c883580cb363b7ee11d53408b721f20..bd237b99094612f05d79e4a6d67472f45ba9f9c7 100644 (file)
--- a/VirtualBox-dri.patch
+++ b/VirtualBox-dri.patch
@@ -1,16 +1,21 @@
---- VirtualBox-3.2.10_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c~    2010-10-08 22:09:04.000000000 +0200
-+++ VirtualBox-3.2.10_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c     2010-10-26 18:51:52.394244805 +0200
-@@ -37,10 +37,10 @@
- 
- //@todo this could be different...
- #ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/xorg/modules/dri:/usr/lib/xorg/modules/dri"
-+# define DRI_XORG_DRV_DIR "/usr/lib64/xorg/modules/drivers/"
+--- VirtualBox-4.3.0/src/VBox/Additions/common/crOpenGL/fakedri_drv.c~ 2011-06-30 18:33:33.000000000 +0200
++++ VirtualBox-4.3.0/src/VBox/Additions/common/crOpenGL/fakedri_drv.c  2011-07-19 21:58:45.900949411 +0200
+@@ -37,15 +37,15 @@
+ #  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
+ #  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
+ # else
+-#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
+-#  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
++#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/xorg/modules/dri:/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/x86_64-linux-gnu/dri"
++#  define DRI_XORG_DRV_DIR "/usr/lib64/xorg/modules/drivers/"
+ # endif
  #else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+ # ifdef RT_OS_FREEBSD
+ #  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
+ #  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
+ # else
+-#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
++#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/i386-linux-gnu/dri"
+ #  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+ # endif
  #endif
-