snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

Merge pull request #14807 from abenson/virtualbox-ose 

virtualbox-ose: update to 5.2.12

Bump xserver-abi-video to 24 (xorg-server-1.20).
This commit is contained in:
Alessio Sergi 2018-06-02 20:35:31 +02:00 committed by GitHub
parent df73691abe bc9d2fa935
commit adeb060bfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
srcpkgs/virtualbox-ose/patches/fix-aml.patch Normal file
View File

@ -0,0 +1,37 @@
FTBFS Identified by Debian / FreeBSD; this is FreeBSD's fix.
https://svnweb.freebsd.org/ports/head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk?revision=469000&view=co
--- src/VBox/Devices/Makefile.kmk.orig 2018-04-13 16:36:12 UTC
+++ src/VBox/Devices/Makefile.kmk
@@ -828,7 +828,12 @@ if !defined(VBOX_ONLY_EXTPACKS) # Goes on almo
$$(VBoxDD_0_OUTDIR)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
$(call MSG_TOOL,iasl,VBoxDD,$<,$@)
+ $(QUIET)$(RM) -f $@ $@.tmp
$(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
+ $(QUIET)$(MV) -f $@ $@.tmp
+ $(QUIET)$(SED) -e "s/vboxaml_aml_code/AmlCode/g" \
+ --output $@ $@.tmp
+ $(QUIET)$(RM) -f $@.tmp
vboxaml.hex:: $$(VBoxDD_0_OUTDIR)/vboxaml.hex
@@ -838,6 +843,8 @@ if !defined(VBOX_ONLY_EXTPACKS) # Goes on almo
$(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
$(QUIET)$(MV) -f $@ $@.tmp
$(QUIET)$(SED) -e "s/AmlCode/AmlCodeSsdtStandard/g" \
+ -e "s/__VBOXSSDT-STANDARD_HEX__/__VBOXSSDT_STANDARD_HEX__/g" \
+ -e "s/vboxssdt-standard_aml_code/AmlCodeSsdtStandard/g" \
--output $@ $@.tmp
$(QUIET)$(RM) -f $@.tmp
@@ -853,6 +860,8 @@ if !defined(VBOX_ONLY_EXTPACKS) # Goes on almo
$(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $@.pre1
$(QUIET)$(MV) -f $@ $@.tmp
$(QUIET)$(SED) -e "s/AmlCode/AmlCodeSsdtCpuHotPlug/g" \
+ -e "s/__VBOXSSDT-CPUHOTPLUG_HEX__/__VBOXSSDT_CPUHOTPLUG_HEX__/g" \
+ -e "s/vboxssdt-cpuhotplug_aml_code/AmlCodeSsdtCpuHotPlug/g" \
--output $@ $@.tmp
$(QUIET)$(RM) -f $@.tmp $@.pre $@.pre1

22
srcpkgs/virtualbox-ose/template
View File

@ -1,25 +1,25 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
version=5.2.8
revision=2
version=5.2.12
revision=1
wrksrc="VirtualBox-${version%*a}"
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://virtualbox.org"
license="GPL-2, CDDL"
#changelog="https://www.virtualbox.org/wiki/Changelog"
license="GPL-2.0-only, CDDL-1.0"
distfiles="http://download.virtualbox.org/virtualbox/${version%*a}/VirtualBox-$version.tar.bz2"
checksum=ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8
checksum=da60028c56708522fd89c000e8984d2105d275a3fd105a0bc698fc49d18d3458
nopie=yes
lib32disabled=yes
only_for_archs="i686 x86_64"
hostmakedepends="perl pkg-config dev86 yasm acpica-utils qt5-tools"
makedepends="libressl-devel libcurl-devel libpng-devel libvpx-devel
alsa-lib-devel pulseaudio-devel SDL-devel qt5-devel qt5-x11extras-devel
libXcursor-devel libXinerama-devel libXcomposite-devel libIDL-devel
libglib-devel pam-devel python-devel libxslt-devel libcap-devel
xorg-server-devel device-mapper-devel docbook-xsl gsoap-devel"
hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools yasm"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel
libXinerama-devel libxslt-devel pam-devel python-devel qt5-x11extras-devel
SDL-devel xorg-server-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-multilib"
@ -142,7 +142,7 @@ virtualbox-ose-dkms_package() {
virtualbox-ose-guest_package() {
lib32disabled=yes
depends="virtualbox-ose-guest-dkms-${version}_${revision}"
conflicts="xserver-abi-video>23_1"
conflicts="xserver-abi-video>24_1"
short_desc+=" - guest utilities"
pkg_install() {