Merge remote-tracking branch 'x/master'

* x/master:
  virtualbox-ose: update to 4.1.6.
This commit is contained in:
davehome 2011-11-04 18:08:26 -06:00
commit 127e761058
2 changed files with 4 additions and 7 deletions

View file

@ -1,8 +1,7 @@
# Template file for 'virtualbox-ose' # Template file for 'virtualbox-ose'
pkgname=virtualbox-ose pkgname=virtualbox-ose
_vbox_distver=4.1.4 _vbox_distver=4.1.6
version=${_vbox_distver} version=${_vbox_distver}
revision=3
patch_args="-Np1" patch_args="-Np1"
wrksrc="VirtualBox-${version}_OSE" wrksrc="VirtualBox-${version}_OSE"
distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
@ -10,7 +9,7 @@ short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://virtualbox.org" homepage="http://virtualbox.org"
license="GPL-2, MPL-1.1, CDDL" license="GPL-2, MPL-1.1, CDDL"
checksum=aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb checksum=7acbb75f8314ea56601db36ac8a52b4aa6eabae65a3d6e95e66f6450883d8818
long_desc=" long_desc="
VirtualBox is a free x86 virtualization solution allowing a wide range of x86 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." operating systems such as Windows, DOS, BSD or Linux to run on a Linux system."

View file

@ -8,7 +8,6 @@ long_desc="${long_desc}
They provide closer integration and allow to share data through shared folders They provide closer integration and allow to share data through shared folders
between the host system and the virtual machine." between the host system and the virtual machine."
revision=3
systemd_services="virtualbox-guest.service" systemd_services="virtualbox-guest.service"
Add_dependency run libgcc Add_dependency run libgcc
@ -22,7 +21,6 @@ Add_dependency run libXmu
Add_dependency run libXcomposite Add_dependency run libXcomposite
Add_dependency run libXdamage Add_dependency run libXdamage
Add_dependency run libXfixes Add_dependency run libXfixes
Add_dependency run libGL
Add_dependency run pam Add_dependency run pam
Add_dependency run virtualbox-ose-guest-dkms ">=${version}" Add_dependency run virtualbox-ose-guest-dkms ">=${version}"
@ -36,7 +34,7 @@ do_install()
install -m755 VBoxClient VBoxControl VBoxService ${DESTDIR}/usr/bin install -m755 VBoxClient VBoxControl VBoxService ${DESTDIR}/usr/bin
install -m755 mount.vboxsf ${DESTDIR}/sbin install -m755 mount.vboxsf ${DESTDIR}/sbin
install -m755 -D ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ install -Dm755 ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
${DESTDIR}/etc/xdg/autostart/vboxclient.desktop ${DESTDIR}/etc/xdg/autostart/vboxclient.desktop
cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
@ -50,7 +48,7 @@ do_install()
ln -sf /usr/lib/VBoxOGL.so \ ln -sf /usr/lib/VBoxOGL.so \
${DESTDIR}/usr/lib/xorg/modules/dri/vboxvideo_dri.so ${DESTDIR}/usr/lib/xorg/modules/dri/vboxvideo_dri.so
cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
install -m755 -D pam_vbox.so ${DESTDIR}/lib/security/pam_vbox.so install -Dm755 pam_vbox.so ${DESTDIR}/lib/security/pam_vbox.so
vinstall ${FILESDIR}/virtualbox-guest.service 644 lib/systemd/system vinstall ${FILESDIR}/virtualbox-guest.service 644 lib/systemd/system
} }