packages: VirtualBox/VirtualBox.spec - install vboxvideo_dri.so and it's de...

[glen]

Author: glen                         Date: Thu Jan 28 16:24:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install vboxvideo_dri.so and it's deps, however still fails for me

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.256 -> 1.257) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.256 packages/VirtualBox/VirtualBox.spec:1.257
--- packages/VirtualBox/VirtualBox.spec:1.256	Thu Jan 28 17:06:33 2010
+++ packages/VirtualBox/VirtualBox.spec	Thu Jan 28 17:24:01 2010
@@ -121,7 +121,7 @@
 %else
 %define		vbox_platform	linux.x86
 %endif
-%define		outdir		out/%{box_platform}/release/bin
+%define		outdir		out/%{vbox_platform}/release/bin
 %define		_sbindir	/sbin
 
 %description
@@ -427,12 +427,22 @@
 cp -a %{outdir}/components $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 cp -a %{outdir}/nls/* $RPM_BUILD_ROOT%{_libdir}/VirtualBox/nls
 
-install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
+install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,dri,input}
 
 install -p %{outdir}/additions/vboxmouse_drv_17.so	\
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
 install -p %{outdir}/additions/vboxvideo_drv_17.so	\
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+install -p %{outdir}/additions/VBoxOGL.so \
+	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/vboxvideo_dri.so
+# XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath?
+install -p \
+	%{outdir}/additions/VBoxOGLcrutil.so \
+	%{outdir}/additions/VBoxOGLpackspu.so \
+	%{outdir}/additions/VBoxOGLerrorspu.so \
+	%{outdir}/additions/VBoxOGLfeedbackspu.so \
+	%{outdir}/additions/VBoxOGLpassthroughspu.so \
+	$RPM_BUILD_ROOT%{_libdir}
 
 cp -a %{outdir}/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
 cp -a %{outdir}/virtualbox.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
@@ -676,6 +686,13 @@
 %files -n xorg-driver-video-vboxvideo
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/vboxvideo_dri.so
+# vboxvideo_dri.so deps
+%attr(755,root,root) %{_libdir}/VBoxOGLcrutil.so
+%attr(755,root,root) %{_libdir}/VBoxOGLerrorspu.so
+%attr(755,root,root) %{_libdir}/VBoxOGLfeedbackspu.so
+%attr(755,root,root) %{_libdir}/VBoxOGLpackspu.so
+%attr(755,root,root) %{_libdir}/VBoxOGLpassthroughspu.so
 %endif
 
 %if %{with kernel}
@@ -716,6 +733,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.257  2010/01/28 16:24:01  glen
+- install vboxvideo_dri.so and it's deps, however still fails for me
+
 Revision 1.256  2010/01/28 16:06:33  glen
 - simplify outdir macro
 
================================================================

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