[packages/VirtualBox] - really use system xorg headers

baggins baggins at pld-linux.org
Sun Apr 7 13:50:04 CEST 2013


commit 48316170923841e029d24e072d384767f4ca1b2c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 7 13:20:35 2013 +0200

    - really use system xorg headers

 VirtualBox.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 5b460bd..280deb6 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -556,6 +556,7 @@ kmk %{?_smp_mflags} \
 	USER=%(id -un) \
 	VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_PLD \
 	XSERVER_VERSION="$XSERVER_VERSION" \
+	VBOX_USE_SYSTEM_XORG_HEADERS=1 \
 	TOOL_GCC3_CFLAGS="%{rpmcflags}" \
 	TOOL_GCC3_CXXFLAGS="%{rpmcxxflags}" \
 	VBOX_GCC_OPT="%{rpmcxxflags}" \
@@ -612,7 +613,7 @@ mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/VBox.png,%{_pixmapsdir}/virtualbox.png}
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop
 
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/vboxmouse_drv.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
+mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_system.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
 # xorg other driver versions
 rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxmouse_drv*.{o,so}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/9ef1a3ef5a900228796e3872cf32e65f143031bb



More information about the pld-cvs-commit mailing list