packages: VirtualBox/VirtualBox.spec, VirtualBox/VirtualBox-dri.patch (NEW)...

[arekm]

Author: arekm                        Date: Tue Oct 26 16:55:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; revert previous commit (was total crap) and fix dri paths properly

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.320 -> 1.321) , VirtualBox-dri.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.320 packages/VirtualBox/VirtualBox.spec:1.321
--- packages/VirtualBox/VirtualBox.spec:1.320	Tue Oct 26 18:00:29 2010
+++ packages/VirtualBox/VirtualBox.spec	Tue Oct 26 18:55:24 2010
@@ -28,7 +28,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		4
+%define		rel		5
 %define		pname		VirtualBox
 
 Summary:	VirtualBox OSE - x86 hardware virtualizer
@@ -58,6 +58,7 @@
 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}
@@ -411,6 +412,7 @@
 %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
@@ -501,9 +503,6 @@
 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
 
@@ -796,7 +795,6 @@
 %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}
@@ -837,6 +835,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.321  2010/10/26 16:55:24  arekm
+- rel 5; revert previous commit (was total crap) and fix dri paths properly
+
 Revision 1.320  2010/10/26 16:00:29  wolf
 - enable guest 3d acceleration (package build not tested)
 

================================================================
Index: packages/VirtualBox/VirtualBox-dri.patch
diff -u /dev/null packages/VirtualBox/VirtualBox-dri.patch:1.1
--- /dev/null	Tue Oct 26 18:55:29 2010
+++ packages/VirtualBox/VirtualBox-dri.patch	Tue Oct 26 18:55:24 2010
@@ -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
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.320&r2=1.321&f=u