From e19a02ee755c2ed1e42b8e712a9a1582539d22a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Tue, 26 Oct 2010 16:55:24 +0000
Subject: [PATCH] - rel 5; revert previous commit (was total crap) and fix dri
 paths properly

Changed files:
    VirtualBox-dri.patch -> 1.1
    VirtualBox.spec -> 1.321
---
 VirtualBox-dri.patch | 16 ++++++++++++++++
 VirtualBox.spec      |  8 +++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 VirtualBox-dri.patch

diff --git a/VirtualBox-dri.patch b/VirtualBox-dri.patch
new file mode 100644
index 0000000..a707e0b
--- /dev/null
+++ b/VirtualBox-dri.patch
@@ -0,0 +1,16 @@
+--- 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/"
+ #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/"
+ #endif
+ 
diff --git a/VirtualBox.spec b/VirtualBox.spec
index cb7f9fc..0db54d7 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -27,7 +27,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		4
+%define		rel		5
 %define		pname		VirtualBox
 
 Summary:	VirtualBox OSE - x86 hardware virtualizer
@@ -57,6 +57,7 @@ Patch2:		%{pname}-VBoxSysInfo.patch
 Patch3:		%{pname}-warning_workaround.patch
 Patch4:		%{pname}-vnc.patch
 Patch5:		%{pname}-noorigin.patch
+Patch6:		%{pname}-dri.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	rpmbuild(macros) >= 1.535
 %if %{with userspace}
@@ -410,6 +411,7 @@ Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik obsługi DRM.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
+%patch6 -p1
 
 %{__sed} -i -e 's,$VBOX_DOC_PATH,%{_docdir}/%{name}-%{version},' src/VBox/Installer/linux/virtualbox.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/linux/virtualbox.desktop
@@ -500,9 +502,6 @@ mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLfeedbackspu.
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so
 
-install -d $RPM_BUILD_ROOT/usr/lib/dri
-ln -s %{_libdir}/xorg/modules/dri/swrast_dri.so $RPM_BUILD_ROOT/usr/lib/dri/swrast_dri.so
-
 install -d $RPM_BUILD_ROOT/etc/udev/rules.d
 cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
 
@@ -795,7 +794,6 @@ fi
 %attr(755,root,root) %{_libdir}/VBoxOGLfeedbackspu.so
 %attr(755,root,root) %{_libdir}/VBoxOGLpackspu.so
 %attr(755,root,root) %{_libdir}/VBoxOGLpassthroughspu.so
-/usr/lib/dri
 %endif
 
 %if %{with kernel}
-- 
2.43.0