diff --git a/srcpkgs/virtualbox-ose/patches/18-system-xorg.patch b/srcpkgs/virtualbox-ose/patches/18-system-xorg.patch index 4a28b93b67..41be2c2361 100644 --- a/srcpkgs/virtualbox-ose/patches/18-system-xorg.patch +++ b/srcpkgs/virtualbox-ose/patches/18-system-xorg.patch @@ -47,7 +47,7 @@ diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefi SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk -+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110) ++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111) + XSERVER_VERSION := 17 +endif + diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index b28983a0fc..09ace434d2 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,8 +1,7 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -_vbox_distver=4.1.2 +_vbox_distver=4.1.4 version=${_vbox_distver} -revision=2 patch_args="-Np1" wrksrc="VirtualBox-${version}_OSE" distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" @@ -11,7 +10,7 @@ short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Juan RP " homepage="http://virtualbox.org" license="GPL-2, MPL-1.1, CDDL" -checksum=b030faa24d6bad805cc1105876fb04befc0a8acd154c8e7dc1b32f323bc576bc +checksum=aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb long_desc=" VirtualBox is a free x86 virtualization solution allowing a wide range of x86 operating systems such as Windows, DOS, BSD or Linux to run on a Linux system." diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template index 02b599a551..87e564d37e 100644 --- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template +++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template @@ -12,6 +12,7 @@ openrc_services="virtualbox-guest default true" Add_dependency run libgcc Add_dependency run glibc +Add_dependency run libstdc++ Add_dependency run libX11 Add_dependency run libXrandr Add_dependency run libXt @@ -34,16 +35,13 @@ do_install() install -m755 VBoxClient VBoxControl VBoxService ${DESTDIR}/usr/bin install -m755 mount.vboxsf ${DESTDIR}/sbin - install -m644 -D ${wrksrc}/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ - ${DESTDIR}/usr/share/X11/xorg.conf.d/50-vboxmouse.conf - install -m644 -D ${wrksrc}/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \ - ${DESTDIR}/lib/udev/rules.d/70-xorg-vboxmouse.rules - install -m755 -D ${wrksrc}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - ${DESTDIR}/etc/X11/Xsession.d/98vboxadd-xclient install -m755 -D ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ ${DESTDIR}/etc/xdg/autostart/vboxclient.desktop + + cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin install -D vboxmouse_drv.so \ ${DESTDIR}/usr/lib/xorg/modules/input/vboxmouse.so + cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions install -D vboxvideo_drv.so \ ${DESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so install -d ${DESTDIR}/usr/lib/xorg/modules/dri