diff --git a/srcpkgs/virtualbox-ose/patches/fix-aml.patch b/srcpkgs/virtualbox-ose/patches/fix-aml.patch new file mode 100644 index 0000000000..d22fe77bd5 --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/fix-aml.patch @@ -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 + diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index 9c004be7ee..f4d32e3440 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -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 " 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() {