diff --git a/VirtualBox-5.2.2-no-vboxvideo.patch b/VirtualBox-5.2.2-no-vboxvideo.patch deleted file mode 100644 index 60b721a..0000000 --- a/VirtualBox-5.2.2-no-vboxvideo.patch +++ /dev/null @@ -1,12 +0,0 @@ -Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7 ---- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2016-10-11 02:49:23.184986182 +0100 -+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100 -@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo - - ifdef VBOX_USE_SYSTEM_XORG_HEADERS - # Build using local X.Org headers. We assume X.Org Server 1.7 or later. -- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system -+ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) - SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) - vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_system_CFLAGS := \ diff --git a/VirtualBox-7.0.10-dxvk-native-gcc-13.2.patch b/VirtualBox-7.0.10-dxvk-native-gcc-13.2.patch new file mode 100644 index 0000000..6a83745 --- /dev/null +++ b/VirtualBox-7.0.10-dxvk-native-gcc-13.2.patch @@ -0,0 +1,10 @@ +--- VirtualBox-7.0.10/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h 2023-08-30 16:29:35.494545680 +0200 ++++ VirtualBox-7.0.10/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h.orig 2023-08-30 16:31:34.928905528 +0200 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + namespace dxvk::bit { + diff --git a/VirtualBox-7.0.10-no-vboxvideo.patch b/VirtualBox-7.0.10-no-vboxvideo.patch new file mode 100644 index 0000000..48896ab --- /dev/null +++ b/VirtualBox-7.0.10-no-vboxvideo.patch @@ -0,0 +1,11 @@ +--- VirtualBox-7.0.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2023-08-09 10:04:04.360879536 +0200 ++++ VirtualBox-7.0.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2023-08-09 10:04:10.779843512 +0200 +@@ -406,7 +406,7 @@ + + ifdef VBOX_USE_SYSTEM_XORG_HEADERS + # Build using local X.Org headers. We assume X.Org Server 1.7 or later. +- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system ++ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) + SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) + vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod + vboxvideo_drv_system_CFLAGS := \ diff --git a/VirtualBox.spec b/VirtualBox.spec index 4c7a7f8..11092d8 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -17,8 +17,8 @@ %endif Name: VirtualBox -Version: 7.0.6 -Release: 2mamba +Version: 7.0.10 +Release: 1mamba Summary: A general-purpose full virtualizer for x86 hardware Group: Graphical Desktop/Applications/Utilities Vendor: openmamba @@ -48,12 +48,13 @@ Patch5: VirtualBox-4.3.26-vdfuse.patch Patch6: VirtualBox-5.0.4-x86-upstream-buildfixes.patch Patch7: VirtualBox-5.1.22-build-gsoap.patch Patch8: VirtualBox-5.0.24-ogl-include-path.patch -Patch9: VirtualBox-5.2.2-no-vboxvideo.patch +Patch9: VirtualBox-7.0.10-no-vboxvideo.patch Patch10: VirtualBox-5.2.30-x86-conflicting_type_ptrdiff_t.patch Patch11: VirtualBox-6.0.14-vbox-cpuhotplug-build.patch Patch12: VirtualBox-6.1.10-vboxweb-gsoap.patch Patch13: VirtualBox-6.1.18-kernel-5.10.patch Patch14: VirtualBox-6.1.34-ffreestanding.patch +Patch15: VirtualBox-7.0.10-dxvk-native-gcc-13.2.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -69,12 +70,14 @@ BuildRequires: libdevmapper-devel BuildRequires: libgcc BuildRequires: libglib-devel BuildRequires: libglvnd-devel +BuildRequires: liblzf-devel BuildRequires: libopenssl-devel BuildRequires: libpam-devel BuildRequires: libpng-devel BuildRequires: libstdc++6-devel +BuildRequires: libtpms-devel BuildRequires: libvncserver-devel -BuildRequires: libvpx6-devel +BuildRequires: libvpx-devel BuildRequires: libxcb-devel BuildRequires: libxml2-devel BuildRequires: libz-devel @@ -83,17 +86,17 @@ BuildRequires: qt5-qttools-devel ## AUTOBUILDREQ-END BuildRequires: bin86 BuildRequires: acpica +%ifarch x86_64 +BuildRequires: glibc-multilib-devel +%endif +BuildRequires: gsoap-devel BuildRequires: libalsa-devel +BuildRequires: librtmp-devel BuildRequires: makeself BuildRequires: tetex-latex BuildRequires: latex-ucs BuildRequires: texlive-fonts -BuildRequires: gsoap-devel BuildRequires: java-sdk -BuildRequires: librtmp-devel -%ifarch x86_64 -BuildRequires: glibc-multilib-devel -%endif BuildRequires: java-openjdk8 # NOTE: as of 6.1.18 build is not compatibile with Java 11 #BuildRequires: java-environment @@ -178,15 +181,16 @@ X.org mouse driver for VirtualBox guest machine. %setup -q -a6 #% setup -q -D -T #:<< _EOF -%patch5 -p1 -%patch7 -p1 -%patch9 -p1 +%patch 5 -p1 +#%patch 7 -p1 +%patch 9 -p1 %ifarch %{ix86} -%patch10 -p1 +%patch 10 -p1 %endif #%patch12 -p1 #%patch13 -p1 #%patch14 -p1 -b .ffreestanding +%patch15 -p 1 %ifarch %{ix86} sed -i "s|VBOX_SUPPORTED_HOST_ARCHS := amd64|VBOX_SUPPORTED_HOST_ARCHS := x86|" Config.kmk @@ -544,7 +548,7 @@ KERNEL=/boot/vmlinuz-$KVER %{_libdir}/%{name}/VBox*.so %{_libdir}/%{name}/VMMR0.r0 %{_libdir}/%{name}/VMMR0.debug -#%{_libdir}/%{name}/iPxeBaseBin +%{_libdir}/%{name}/iPxeBaseBin %{_libdir}/VirtualBox/bldRTLdrCheckImports %{_libdir}/VirtualBox/VBox.png %{_libdir}/VirtualBox/VBoxAutostart @@ -595,7 +599,6 @@ KERNEL=/boot/vmlinuz-$KVER %{_libdir}/%{name}/libvboxjxpcom.so %endif %dir %{_libdir}/%{name}/nls -%{_libdir}/%{name}/nls/VirtualBox_*.qm %{_libdir}/%{name}/nls/*.qm %dir %{_libdir}/%{name}/scripts %{_libdir}/%{name}/scripts/* @@ -666,6 +669,9 @@ KERNEL=/boot/vmlinuz-$KVER %{_libdir}/%{name}/additions/VBoxGuestAdditions.iso %changelog +* Wed Aug 30 2023 Automatic Build System 7.0.10-1mamba +- automatic version update by autodist + * Fri Jan 27 2023 Silvan Calarco 7.0.6-2mamba - update vboxdrmclient.[path|service] with [Install] section to fix autostart at boot