virualbox:ver.bump

This commit is contained in:
Rmys
2018-05-12 13:13:20 +03:00
parent c8b5290967
commit 9e7644dadf
4 changed files with 54 additions and 12 deletions
@@ -1,19 +1,18 @@
diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
index 92b4ffc..1a1c467 100644
--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
@@ -56,24 +56,8 @@ typedef enum {
diff -Nuar a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2018-05-09 19:32:17.000000000 +0300
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2018-05-11 23:24:22.415626074 +0300
@@ -57,23 +57,8 @@
//#define DEBUG_DRI_CALLS
-/// @todo this could be different...
/// @todo this could be different...
-#ifdef RT_ARCH_AMD64
-# 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/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/lib/xorg/modules/dri"
# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# endif
-#else
-# ifdef RT_OS_FREEBSD
@@ -21,8 +20,7 @@ index 92b4ffc..1a1c467 100644
-# 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"
# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# endif
-#endif