commit 546c905035d91c32e65c421351819fb16c1b19bb Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Nov 1 22:26:25 2022 +0000 Update to 7.0.2 - Drop python2 support - Based on Mageia and after on Debian packages - Drop VirtualBox-6.0.10-convert-map-python3.patch and vb-6.1.16-modal-dialog-parent.patch - Refresh default-to-Fedora, noupdate.patch, xclient.patch, build-xpcom18a4-with-c++17.patch and python3.11.patch - Replace fixes_for_Qt5.11to15.patch with remove-duplicated-define.patch, update-Mageia-support.patch and fix-missing-includes-with-qt-5.15.patch - Add ExtPacks-VBoxDTrace-no-publisher-in-version.patch from Mageia - Add partial system-libs.patch and fix-build.patch from Debian (libvorbis and libogg system support) - Add build conditionals for system_libtpms and dxvk-native - Add VirtualBox-5.1.0-lib64-VBox.sh.patch and finally drop /etc/vbox as upstream did in 5.1.0 - Add BR: nasm (to fix nasm: not found message) VirtualBox-5.1.0-lib64-VBox.sh.patch | 14 ++ VirtualBox-5.1.0-revert-VBox.sh.patch | 55 ----- VirtualBox-6.0.0-default-to-Fedora.patch | 37 ---- VirtualBox-6.0.0-noupdate.patch | 11 - VirtualBox-6.0.10-convert-map-python3.patch | 9 - VirtualBox-6.0.10-remove-duplicated-define.patch | 29 +++ ...-6.1.14-fix-missing-includes-with-qt-5.15.patch | 22 ++ VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch | 9 +- VirtualBox-6.1.36-add-Mageia-support.patch | 238 --------------------- VirtualBox-6.1.4-gcc10.patch | 27 +-- ...tPacks-VBoxDTrace-no-publisher-in-version.patch | 42 ++++ VirtualBox-7.0.2-default-to-Fedora.patch | 47 ++++ VirtualBox-7.0.2-noupdate.patch | 9 + VirtualBox-7.0.2-update-Mageia-support.patch | 187 ++++++++++++++++ ...atch => VirtualBox-7.0.2-xclient-cleanups.patch | 18 +- VirtualBox-python3.11.patch | 58 ++--- VirtualBox.spec | 204 ++++++++++-------- fix-build.patch | 21 ++ fixes_for_Qt5.11to15.patch | 65 ------ sources | 4 +- system-libs_cutted.patch | 121 +++++++++++ update_vbox.sh | 6 +- vb-6.1.16-modal-dialog-parent.patch | 145 ------------- 23 files changed, 641 insertions(+), 737 deletions(-) --- diff --git a/VirtualBox-5.1.0-lib64-VBox.sh.patch b/VirtualBox-5.1.0-lib64-VBox.sh.patch new file mode 100644 index 0000000..bd609a9 --- /dev/null +++ b/VirtualBox-5.1.0-lib64-VBox.sh.patch @@ -0,0 +1,14 @@ +--- VirtualBox-7.0.2/src/VBox/Installer/linux/VBox.sh.revert-VBox.sh 2022-10-31 22:37:48.783785457 +0000 ++++ VirtualBox-7.0.2/src/VBox/Installer/linux/VBox.sh 2022-11-01 14:24:29.579809075 +0000 +@@ -51,7 +51,10 @@ MY_DIR="${TARGET%/[!/]*}" + # done + # ) + +-if test -f /usr/lib/virtualbox/VirtualBox && ++if test -f /usr/lib64/virtualbox/VirtualBox && ++ test -x /usr/lib64/virtualbox/VirtualBox; then ++ INSTALL_DIR=/usr/lib64/virtualbox ++elif test -f /usr/lib/virtualbox/VirtualBox && + test -x /usr/lib/virtualbox/VirtualBox; then + INSTALL_DIR=/usr/lib/virtualbox + elif test -f "${MY_DIR}/VirtualBox" && test -x "${MY_DIR}/VirtualBox"; then diff --git a/VirtualBox-6.0.10-remove-duplicated-define.patch b/VirtualBox-6.0.10-remove-duplicated-define.patch new file mode 100644 index 0000000..6e2f0ba --- /dev/null +++ b/VirtualBox-6.0.10-remove-duplicated-define.patch @@ -0,0 +1,29 @@ + +Already defined in Mga8+: + +/home/iurt/rpmbuild/BUILD/VirtualBox-6.0.10/include/VBox/VBoxGL2D.h:116:19: error: conflicting declaration 'typedef ptrdiff_t GLsizeiptr' + typedef ptrdiff_t GLsizeiptr; + ^~~~~~~~~~ +In file included from /usr/lib/qt5/include/QtGui/qopengl.h:146, + from /usr/lib/qt5/include/QtOpenGL/qgl.h:45, + from /usr/lib/qt5/include/QtOpenGL/QGLWidget:1, + from /home/iurt/rpmbuild/BUILD/VirtualBox-6.0.10/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp:22: +/usr/lib/qt5/include/QtGui/qopenglext.h:475:30: note: previous declaration as 'typedef long int GLsizeiptr' + typedef signed long int GLsizeiptr; + +diff -Nurp VirtualBox-6.0.10.orig/include/VBox/VBoxGL2D.h VirtualBox-6.0.10/include/VBox/VBoxGL2D.h +--- VirtualBox-6.0.10.orig/include/VBox/VBoxGL2D.h 2019-07-12 11:28:22.000000000 +0300 ++++ VirtualBox-6.0.10/include/VBox/VBoxGL2D.h 2019-07-20 21:13:31.481755822 +0300 +@@ -110,12 +110,6 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN + typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM3I)(GLint location, GLint v0, GLint v1, GLint v2); + typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM4I)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); + +-/* GL_ARB_pixel_buffer_object*/ +-#ifndef Q_WS_MAC +-/* apears to be defined on mac */ +-typedef ptrdiff_t GLsizeiptr; +-#endif +- + #ifndef GL_READ_ONLY + # define GL_READ_ONLY 0x88B8 + #endif diff --git a/VirtualBox-6.1.14-fix-missing-includes-with-qt-5.15.patch b/VirtualBox-6.1.14-fix-missing-includes-with-qt-5.15.patch new file mode 100644 index 0000000..f1dc737 --- /dev/null +++ b/VirtualBox-6.1.14-fix-missing-includes-with-qt-5.15.patch @@ -0,0 +1,22 @@ +diff -up VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp.qt515 VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +--- VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp.qt515 2020-09-04 09:38:30.000000000 +0200 ++++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-09-05 19:41:54.423116616 +0200 +@@ -18,6 +18,7 @@ + /* Qt includes: */ + #include <QApplication> + #include <QLabel> ++#include <QPainterPath> + #include <QPaintEvent> + #include <QStyle> + #include <QVBoxLayout> +diff -up VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h.qt515 VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +--- VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h.qt515 2020-09-04 09:38:30.000000000 +0200 ++++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-09-05 19:41:54.423116616 +0200 +@@ -37,7 +37,6 @@ class QIcon; + class QLabel; + class QMouseEvent; + class QObject; +-class QPainterPath; + class QPaintEvent; + class QResizeEvent; + class QString; diff --git a/VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch b/VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch index 6889b22..6534e14 100644 --- a/VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch +++ b/VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch @@ -1,7 +1,6 @@ -diff -up VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk.orig VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk ---- VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk.orig 2022-03-23 00:47:29.000000000 +0100 -+++ VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk 2022-06-26 14:06:50.563730173 +0200 -@@ -37,7 +37,7 @@ TEMPLATE_XPCOM_ASFLAGS = $(N +--- ./src/libs/xpcom18a4/Config.kmk.orig 2022-10-19 19:34:20.000000000 +0100 ++++ ./src/libs/xpcom18a4/Config.kmk 2022-10-30 04:30:34.318046234 +0000 +@@ -47,7 +47,7 @@ TEMPLATE_XPCOM_ASFLAGS = $(N TEMPLATE_XPCOM_ASFLAGS.x86 = -m32 TEMPLATE_XPCOM_ASFLAGS.amd64 = -m64 TEMPLATE_XPCOM_ASDEFS = $(NO_SUCH_VARIABLE) @@ -9,4 +8,4 @@ diff -up VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk.orig VirtualBox-6.1.34/ +TEMPLATE_XPCOM_CXXFLAGS = -g -pipe -ansi -Wall -Wno-unused -Wno-non-virtual-dtor -std=gnu++17 \ $(VBOX_GCC_Wno-invalid-offsetof) -Wno-sign-compare -Wno-unused -Wno-ctor-dtor-privacy \ $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \ - $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-delete-non-virtual-dtor) + $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-delete-non-virtual-dtor) \ diff --git a/VirtualBox-6.1.4-gcc10.patch b/VirtualBox-6.1.4-gcc10.patch index 65d03da..a5812b2 100644 --- a/VirtualBox-6.1.4-gcc10.patch +++ b/VirtualBox-6.1.4-gcc10.patch @@ -1,4 +1,3 @@ -Patch 1: Fix Detection of GCC10 (is >= 4.4 ) Patch 2: Fix /builddir/build/BUILD/VirtualBox-6.1.4/src/VBox/Debugger/DBGCDumpImage.cpp: In function 'const char* dbgcMachoCpuType(uint32_t, uint32_t)': @@ -9,32 +8,14 @@ Patch 2: Fix 471 | case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; | ^~~~~~~~~~~~ ---- ./Makefile.kmk.orig 2020-02-20 03:40:14.049126175 +0000 -+++ ./Makefile.kmk 2020-02-20 03:40:41.843981024 +0000 -@@ -188,15 +188,6 @@ ifeq ($(KBUILD_TARGET),darwin) - "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,(a)rpath)/$(qtmod).framework/Versions/5/$(qtmod)&quot; ) ) \ - "$(2)",) # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES. - else # win x11 -- if1of ($(KBUILD_TARGET), linux solaris) -- ifndef VBOX_ONLY_BUILD -- ifneq ($(VBOX_GCC_VERSION_CXX),) -- ifeq ($(int-ge $(VBOX_GCC_VERSION_CXX),40400),) -- $(error gcc >= 4.4 required when compiling against Qt5!) -- endif -- endif -- endif -- endif - if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD) - include $(KBUILD_PATH)/units/qt5.kmk - ifeq ($(KBUILD_TARGET),win) ---- VirtualBox-6.1.10.orig/src/VBox/Debugger/DBGCDumpImage.cpp -+++ VirtualBox-6.1.10/src/VBox/Debugger/DBGCDumpImage.cpp -@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3 +--- VirtualBox-6.1.6/src/VBox/Debugger/DBGCDumpImage.cpp.orig 2020-04-09 20:37:26.000000000 +0300 ++++ VirtualBox-6.1.6/src/VBox/Debugger/DBGCDumpImage.cpp 2020-05-08 01:32:01.400447560 +0300 +@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(uint { switch (iType) { - case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; -+ default: return "CPU_TYPE_ANY"; ++ default: return "CPU_TYPE_ANY"; case CPU_TYPE_VAX: return "VAX"; case CPU_TYPE_MC680x0: return "MC680x0"; case CPU_TYPE_X86: return "X86"; diff --git a/VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch b/VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch new file mode 100644 index 0000000..c77c558 --- /dev/null +++ b/VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch @@ -0,0 +1,42 @@ + +As reported in: +https://bugs.mageia.org/show_bug.cgi?id=27936 + +adding Mageia version branding, breaks loading the VBoxDtrace extension with the error: + +Failed to load +'/usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack.xml': +Invalid version string: 6.1.16_Mageia + +Fix it up by using the _NO_PUB variant when generating the xml. + +Signed-off-by: Thomas Backlund <tmb(a)mageia.org&gt; + +--- + Config.kmk | 1 + + src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff -Nurp VirtualBox-7.0.2.orig/Config.kmk VirtualBox-7.0.2/Config.kmk +--- VirtualBox-7.0.2.orig/Config.kmk 2022-10-19 21:17:13.000000000 +0300 ++++ VirtualBox-7.0.2/Config.kmk 2022-10-22 15:12:37.178853337 +0300 +@@ -3798,6 +3798,7 @@ VBOX_EDIT_VERSION_CMD_FN = $(SED) \ + -e 's+@VBOX_VERSION_MINOR@+$(VBOX_VERSION_MINOR)+g' \ + -e 's+@VBOX_VERSION_BUILD@+$(VBOX_VERSION_BUILD)+g' \ + -e 's+@VBOX_VERSION_STRING@+$(VBOX_VERSION_STRING)+g' \ ++ -e 's/@VBOX_VERSION_STRING_NO_PUB@/$(VBOX_VERSION_STRING_NO_PUB)/g' \ + -e 's+@VBOX_SVN_REV@+$(VBOX_SVN_REV)+g' \ + -e 's+@VBOX_VENDOR@+$(VBOX_VENDOR)+g' \ + -e 's+@VBOX_VENDOR_SHORT@+$(VBOX_VENDOR_SHORT)+g' \ +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml +--- VirtualBox-7.0.2.orig/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml 2022-10-19 21:27:27.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml 2022-10-22 15:10:10.042857721 +0300 +@@ -2,7 +2,7 @@ + <VirtualBoxExtensionPack xmlns="http://www.virtualbox.org/VirtualBoxExtensionPack" version="1.0"> + <Name>Oracle VBoxDTrace Extension Pack</Name> + <Description>Experimental and unsupported extension pack providing DTrace features to VirtualBox.</Description> +- <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING@</Version> ++ <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING_NO_PUB@</Version> + <MainModule>VBoxDTraceMain</MainModule> + </VirtualBoxExtensionPack> + diff --git a/VirtualBox-7.0.2-default-to-Fedora.patch b/VirtualBox-7.0.2-default-to-Fedora.patch new file mode 100644 index 0000000..8159e4d --- /dev/null +++ b/VirtualBox-7.0.2-default-to-Fedora.patch @@ -0,0 +1,47 @@ +Default to Linux and Fedora. + +Signed-off-by: Thomas Backlund <tmb(a)Fedora.org&gt; + +--- + src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp +--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp 2022-10-19 21:28:39.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp 2022-10-22 13:32:01.577033153 +0300 +@@ -397,15 +397,15 @@ void UINameAndSystemEditor::sltFamilyCha + if (iIndexWin10 != -1) + m_pComboType->setCurrentIndex(iIndexWin10); + } +- /* Or select Oracle Linux item for Linux family as default: */ ++ /* Or select Fedora Linux item for Linux family as default: */ + else if (m_strFamilyId == "Linux") + { +- QString strDefaultID = "Oracle"; ++ QString strDefaultID = "Fedora"; + if (ARCH_BITS == 64) + strDefaultID += "_64"; +- const int iIndexUbuntu = m_pComboType->findData(strDefaultID, TypeID); +- if (iIndexUbuntu != -1) +- m_pComboType->setCurrentIndex(iIndexUbuntu); ++ const int iIndexFedora = m_pComboType->findData(strDefaultID, TypeID); ++ if (iIndexFedora != -1) ++ m_pComboType->setCurrentIndex(iIndexFedora); + } + /* Else simply select the first one present: */ + else +@@ -665,6 +665,10 @@ void UINameAndSystemEditor::prepareFamil + + /* Choose the 1st item to be the current: */ + m_pComboFamily->setCurrentIndex(0); ++ /* Default to Linux */ ++ const int liIndex = m_pComboFamily->findData("Linux", TypeID); ++ if (liIndex != -1) ++ m_pComboFamily->setCurrentIndex(liIndex); + /* And update the linked widgets accordingly: */ + sltFamilyChanged(m_pComboFamily->currentIndex()); + } + +Default to Linux and Fedora. + + diff --git a/VirtualBox-7.0.2-noupdate.patch b/VirtualBox-7.0.2-noupdate.patch new file mode 100644 index 0000000..d0505ef --- /dev/null +++ b/VirtualBox-7.0.2-noupdate.patch @@ -0,0 +1,9 @@ +--- VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateDefs.cpp.noupdates 2022-10-19 19:28:35.000000000 +0100 ++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateDefs.cpp 2022-11-01 19:26:21.790765337 +0000 +@@ -400,5 +400,5 @@ UpdatePeriodType VBoxUpdateData::gatherS + enmType = (UpdatePeriodType)(enmType + 1); + } + +- return UpdatePeriodType_1Month; ++ return UpdatePeriodType_Never; + } diff --git a/VirtualBox-7.0.2-update-Mageia-support.patch b/VirtualBox-7.0.2-update-Mageia-support.patch new file mode 100644 index 0000000..ab37994 --- /dev/null +++ b/VirtualBox-7.0.2-update-Mageia-support.patch @@ -0,0 +1,187 @@ + +Mageia support is partly added upstream beginning with 7.0 branch. + +This patch adds the missing bits to extend / improve the integration. + +Signed-off-by: Thomas Backlund <tmb(a)mageia.org&gt; + +--- + src/VBox/Additions/linux/installer/vboxadd-x11.sh | 6 ++++++ + src/VBox/Frontends/VirtualBox/VirtualBox2.qrc | 2 ++ + src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc | 2 ++ + src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc | 2 ++ + src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc | 2 ++ + src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp | 4 ++-- + src/VBox/Installer/linux/VBoxSysInfo.sh | 5 +++++ + src/VBox/Installer/linux/distributions_rpm | 15 +++++++++++++++ + src/VBox/Main/src-server/ApplianceImpl.cpp | 2 ++ + src/VBox/Main/src-server/UnattendedImpl.cpp | 6 ++++++ + src/VBox/Main/xml/Settings.cpp | 1 + + 11 files changed, 45 insertions(+), 2 deletions(-) + +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-7.0.2/src/VBox/Additions/linux/installer/vboxadd-x11.sh +--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2022-10-19 21:20:43.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2022-10-22 12:34:07.913136643 +0300 +@@ -104,8 +104,14 @@ install_x11_startup_app() { + x11_autostart="/etc/xdg/autostart" + kde_autostart="/usr/share/autostart" + redhat_dir=/etc/X11/Xsession.d ++ mageia_dir=/etc/X11/xinit.d + mandriva_dir=/etc/X11/xinit.d + debian_dir=/etc/X11/xinit/xinitrc.d ++ if [ -d "$mageia_dir" -a -w "$mageia_dir" -a -x "$mageia_dir" ] ++ then ++ install -m 0644 $app_src "$mageia_dir/$app_dest" ++ found=1 ++ fi + if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ] + then + install -m 0644 $app_src "$mandriva_dir/$app_dest" +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp +--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2022-10-19 21:28:31.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2022-10-22 12:44:34.937117962 +0300 +@@ -416,8 +416,8 @@ UIIconPoolGeneral::UIIconPoolGeneral() + m_guestOSTypeIconNames.insert("OpenMandriva_Lx_64", ":/os_mandriva_64.png"); + m_guestOSTypeIconNames.insert("PCLinuxOS", ":/os_mandriva.png"); + m_guestOSTypeIconNames.insert("PCLinuxOS_64", ":/os_mandriva_64.png"); +- m_guestOSTypeIconNames.insert("Mageia", ":/os_mandriva.png"); +- m_guestOSTypeIconNames.insert("Mageia_64", ":/os_mandriva_64.png"); ++ m_guestOSTypeIconNames.insert("Mageia", ":/os_mageia.png"); ++ m_guestOSTypeIconNames.insert("Mageia_64", ":/os_mageia_64.png"); + m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png"); + m_guestOSTypeIconNames.insert("RedHat_64", ":/os_redhat_64.png"); + m_guestOSTypeIconNames.insert("RedHat3", ":/os_redhat.png"); +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2022-10-19 21:28:04.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2022-10-22 12:39:06.604127744 +0300 +@@ -92,6 +92,8 @@ + <file alias="os_linux.png">images/os_linux.png</file> + <file alias="os_macosx_64.png">images/os_macosx_64.png</file> + <file alias="os_macosx.png">images/os_macosx.png</file> ++ <file alias="os_mageia_64.png">images/os_mageia_64.png</file> ++ <file alias="os_mageia.png">images/os_mageia.png</file> + <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> + <file alias="os_mandriva.png">images/os_mandriva.png</file> + <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file> +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc +--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2022-10-19 21:28:04.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2022-10-22 12:37:55.554129861 +0300 +@@ -103,6 +103,8 @@ + <file alias="os_linux_x2.png">images/x2/os_linux_x2.png</file> + <file alias="os_macosx_64_x2.png">images/x2/os_macosx_64_x2.png</file> + <file alias="os_macosx_x2.png">images/x2/os_macosx_x2.png</file> ++ <file alias="os_mageia_64_x2.png">images/x2/os_mageia_64_x2.png</file> ++ <file alias="os_mageia_x2.png">images/x2/os_mageia_x2.png</file> + <file alias="os_mandriva_64_x2.png">images/x2/os_mandriva_64_x2.png</file> + <file alias="os_mandriva_x2.png">images/x2/os_mandriva_x2.png</file> + <file alias="os_netbsd_64_x2.png">images/x2/os_netbsd_64_x2.png</file> +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc +--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2022-10-19 21:28:04.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2022-10-22 12:38:02.478129654 +0300 +@@ -103,6 +103,8 @@ + <file alias="os_linux_x3.png">images/x3/os_linux_x3.png</file> + <file alias="os_macosx_64_x3.png">images/x3/os_macosx_64_x3.png</file> + <file alias="os_macosx_x3.png">images/x3/os_macosx_x3.png</file> ++ <file alias="os_mageia_64_x3.png">images/x3/os_mageia_64_x3.png</file> ++ <file alias="os_mageia_x3.png">images/x3/os_mageia_x3.png</file> + <file alias="os_mandriva_64_x3.png">images/x3/os_mandriva_64_x3.png</file> + <file alias="os_mandriva_x3.png">images/x3/os_mandriva_x3.png</file> + <file alias="os_netbsd_64_x3.png">images/x3/os_netbsd_64_x3.png</file> +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc +--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2022-10-19 21:28:04.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2022-10-22 12:38:08.986129460 +0300 +@@ -103,6 +103,8 @@ + <file alias="os_linux_x4.png">images/x4/os_linux_x4.png</file> + <file alias="os_macosx_64_x4.png">images/x4/os_macosx_64_x4.png</file> + <file alias="os_macosx_x4.png">images/x4/os_macosx_x4.png</file> ++ <file alias="os_mageia_64_x4.png">images/x4/os_mageia_64_x4.png</file> ++ <file alias="os_mageia_x4.png">images/x4/os_mageia_x4.png</file> + <file alias="os_mandriva_64_x4.png">images/x4/os_mandriva_64_x4.png</file> + <file alias="os_mandriva_x4.png">images/x4/os_mandriva_x4.png</file> + <file alias="os_netbsd_64_x4.png">images/x4/os_netbsd_64_x4.png</file> +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-7.0.2/src/VBox/Installer/linux/distributions_rpm +--- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/distributions_rpm 2022-10-19 21:28:54.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Installer/linux/distributions_rpm 2022-10-22 12:48:25.951111079 +0300 +@@ -8,6 +8,21 @@ openSUSE114 = OPENSUSE_11_4 + openSUSE113 = OPENSUSE_11_3 + sles11.0 = SLES_11_0 + sles10.1 = SLES_10_1 ++mga15 = MAGEIA_15 ++mga14 = MAGEIA_14 ++mga13 = MAGEIA_13 ++mga12 = MAGEIA_12 ++mga11 = MAGEIA_11 ++mga10 = MAGEIA_10 ++mga9 = MAGEIA_9 ++mga8 = MAGEIA_8 ++mga7 = MAGEIA_7 ++mga6 = MAGEIA_6 ++mga5 = MAGEIA_5 ++mga4 = MAGEIA_4 ++mga3 = MAGEIA_3 ++mga2 = MAGEIA_2 ++mga1 = MAGEIA_1 + mdv2011.0 = MANDRIVA_2011_0 + fedora36 = FEDORA_36 + fedora35 = FEDORA_35 +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-7.0.2/src/VBox/Installer/linux/VBoxSysInfo.sh +--- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2022-10-19 21:28:54.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Installer/linux/VBoxSysInfo.sh 2022-10-22 12:48:15.439111393 +0300 +@@ -54,6 +54,11 @@ get_linux_info () { + # Debian-based system + release=`cat /etc/debian_version` + print_linux_info "Debian" $release ++ elif [ -r /etc/mageia-release ] ++ then ++ # Mageia-based system ++ release=`cat /etc/mageia-release | sed -e 's/[A-Za-z ]* release //'` ++ print_linux_info "Mageia" $release + elif [ -r /etc/mandriva-release ] + then + # Mandriva-based system +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-7.0.2/src/VBox/Main/src-server/ApplianceImpl.cpp +--- VirtualBox-7.0.2.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2022-10-19 21:29:03.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Main/src-server/ApplianceImpl.cpp 2022-10-22 12:57:29.027094900 +0300 +@@ -316,6 +316,7 @@ static const osTypePattern g_aOsTypesPat + {"SUSE", VBOXOSTYPE_OpenSUSE}, + {"Novell", VBOXOSTYPE_OpenSUSE}, + {"Red Hat", VBOXOSTYPE_RedHat}, ++ {"Mageia", VBOXOSTYPE_Mageia}, + {"Mandriva", VBOXOSTYPE_Mandriva}, + {"Ubuntu", VBOXOSTYPE_Ubuntu}, + {"Debian", VBOXOSTYPE_Debian}, +@@ -352,6 +353,7 @@ static const osTypePattern g_aOsTypesPat + {"SUSE", VBOXOSTYPE_OpenSUSE_x64}, + {"Novell", VBOXOSTYPE_OpenSUSE_x64}, + {"Red Hat", VBOXOSTYPE_RedHat_x64}, ++ {"Mageia", VBOXOSTYPE_Mageia_x64}, + {"Mandriva", VBOXOSTYPE_Mandriva_x64}, + {"Ubuntu", VBOXOSTYPE_Ubuntu_x64}, + {"Debian", VBOXOSTYPE_Debian_x64}, +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Main/src-server/UnattendedImpl.cpp VirtualBox-7.0.2/src/VBox/Main/src-server/UnattendedImpl.cpp +--- VirtualBox-7.0.2.orig/src/VBox/Main/src-server/UnattendedImpl.cpp 2022-10-19 21:29:04.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Main/src-server/UnattendedImpl.cpp 2022-10-22 13:03:28.835084180 +0300 +@@ -1394,6 +1394,12 @@ static bool detectLinuxDistroName(const + *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_ArchitectureMask) | VBOXOSTYPE_Oracle); + pszOsAndVersion = RTStrStripL(pszOsAndVersion + 6); + } ++ else if ( RTStrNICmp(pszOsAndVersion, RT_STR_TUPLE("Mageia")) == 0 ++ && !RT_C_IS_ALNUM(pszOsAndVersion[6])) ++ { ++ *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_ArchitectureMask) | VBOXOSTYPE_Mageia); ++ pszOsAndVersion = RTStrStripL(pszOsAndVersion + 6); ++ } + else if ( RTStrNICmp(pszOsAndVersion, RT_STR_TUPLE("CentOS")) == 0 + && !RT_C_IS_ALNUM(pszOsAndVersion[6])) + { +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Main/xml/Settings.cpp VirtualBox-7.0.2/src/VBox/Main/xml/Settings.cpp +--- VirtualBox-7.0.2.orig/src/VBox/Main/xml/Settings.cpp 2022-10-19 21:29:07.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Main/xml/Settings.cpp 2022-10-22 13:04:47.873081825 +0300 +@@ -6579,6 +6579,7 @@ const struct { + { "opensuse", "OpenSUSE" }, + { "fedoracore", "Fedora" }, + { "gentoo", "Gentoo" }, ++ { "mageia", "Mageia" }, + { "mandriva", "Mandriva" }, + { "redhat", "RedHat" }, + { "ubuntu", "Ubuntu" }, diff --git a/VirtualBox-5.2.10-xclient.patch b/VirtualBox-7.0.2-xclient-cleanups.patch similarity index 53% rename from VirtualBox-5.2.10-xclient.patch rename to VirtualBox-7.0.2-xclient-cleanups.patch index 308a8ee..84635ef 100644 --- a/VirtualBox-5.2.10-xclient.patch +++ b/VirtualBox-7.0.2-xclient-cleanups.patch @@ -1,6 +1,15 @@ ---- ./src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2020-06-06 06:20:12.079227656 +0100 -+++ ./src/VBox/Additions/x11/Installer/98vboxadd-xclient 2020-06-06 06:26:55.886940895 +0100 -@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do +# Do not show an error dialog when not running under vbox +# Do not start VBoxClient --vmsvga, we run VBoxClient --vmsvga as +# a systemd service, this works with both Wayland and Xorg based sessions + +--- + src/VBox/Additions/x11/Installer/98vboxadd-xclient | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient VirtualBox-7.0.2/src/VBox/Additions/x11/Installer/98vboxadd-xclient +--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2022-10-19 21:20:45.000000000 +0300 ++++ VirtualBox-7.0.2/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2022-10-22 12:05:28.770187860 +0300 +@@ -31,18 +31,11 @@ for i in $HOME/.vboxclient-*.pid; do test -w $i || rm -f $i done @@ -20,5 +29,6 @@ /usr/bin/VBoxClient --checkhostversion /usr/bin/VBoxClient --seamless /usr/bin/VBoxClient --draganddrop -- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled +- /usr/bin/VBoxClient --vmsvga-session # In case VMSVGA emulation is enabled fi + diff --git a/VirtualBox-python3.11.patch b/VirtualBox-python3.11.patch index e732999..ac0077f 100644 --- a/VirtualBox-python3.11.patch +++ b/VirtualBox-python3.11.patch @@ -9,18 +9,6 @@ for p in $PYTHONDIR; do for d in $SUPPYTHONLIBS; do for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do -diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/gen_python_deps.py VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/gen_python_deps.py ---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/gen_python_deps.py 2022-07-19 22:01:39.000000000 +0100 -+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/gen_python_deps.py 2022-07-25 14:00:04.027778063 +0100 -@@ -16,7 +16,7 @@ from __future__ import print_function - import os,sys - from distutils.version import StrictVersion - --versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m" ] -+versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m", "3.11", "3.11m"] - prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] - known = {} - diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk --- VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-19 22:01:39.000000000 +0100 +++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-25 14:00:03.971778289 +0100 @@ -86,13 +74,21 @@ diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk VirtualBox-6. ifdef VBOX_PYTHONDEF_INC # -diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/module/_xpcom.cpp VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/module/_xpcom.cpp ---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-07-19 22:01:40.000000000 +0100 -+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-07-25 14:00:04.134777632 +0100 +@@ -744,7 +790,7 @@ endif + # TODO: ASSUMING that we don't need a different headers for pymalloc + # ('m' builds < 3.8) and CRT malloc. + # +-VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 34 33 \ ++VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311 34 33 \ + ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,))) + ifneq ($(VBOX_PYTHON_LIMITED_API_VER),) + DLLS += VBoxPython3 +--- ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp.orig 2022-10-30 04:19:33.834495672 +0000 ++++ ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-10-30 04:24:11.895463023 +0000 @@ -84,7 +84,11 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter # define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX) # endif - # ifdef VBOX_PYXPCOM_VERSIONED + # if defined(VBOX_PYXPCOM_VERSIONED) && !defined(VBOX_PYXPCOM_MAJOR_VERSIONED) -# if PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000 +# if PY_VERSION_HEX >= 0x030b0000 && PY_VERSION_HEX < 0x030c0000 +# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_11") @@ -102,33 +98,3 @@ diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/module/_xpcom.cpp Virt # define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_10") # define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_10) -diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h ---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h 2022-07-19 22:01:40.000000000 +0100 -+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h 2022-07-25 14:00:23.316663783 +0100 -@@ -137,14 +137,6 @@ inline PyObject *PyBool_FromLong(long ok - # define PyInt_Check(o) PyLong_Check(o) - # define PyInt_AsLong(o) PyLong_AsLong(o) - # define PyNumber_Int(o) PyNumber_Long(o) --# if PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */ --# ifndef PyUnicode_AsUTF8 --# define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o) --# endif --# ifndef PyUnicode_AsUTF8AndSize --# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) --# endif --# endif - typedef struct PyMethodChain - { - PyMethodDef *methods; -diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/VariantUtils.cpp VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp ---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/VariantUtils.cpp 2022-07-19 22:01:40.000000000 +0100 -+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp 2022-03-22 23:47:49.000000000 +0000 -@@ -628,7 +628,7 @@ static PyObject *UnpackSingleArray(Py_ns - #if PY_MAJOR_VERSION <= 2 - return PyString_FromStringAndSize( (char *)array_ptr, sequence_size ); - #else -- return PyBytes_FromStringAndSize( (char *)array_ptr, sequence_size ); -+ return PyUnicode_FromStringAndSize( (char *)array_ptr, sequence_size ); - #endif - - PRUint32 array_element_size = GetArrayElementSize(array_type); diff --git a/VirtualBox.spec b/VirtualBox.spec index 0ff93fd..d5f962e 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -1,5 +1,3 @@ -%global __provides_exclude_from %{_libdir}/VBoxGuestAdditions - # Standard compiler flags, without: # -Wall -- VirtualBox takes care of reasonable warnings very well # -m32, -m64 -- 32bit code is built besides 64bit on x86_64 @@ -32,13 +30,22 @@ %bcond_without guest_additions %endif -# Since version 6.1.28, VBox should not have the python2 dependency -%bcond_with python2 +%if 0%{?fedora} + %bcond_without system_libtpms +%else + %bcond_with system_libtpms +%endif + +%if 0%{?fedora} || 0%{?rhel} > 8 + %bcond_without dxvk_native +%else + %bcond_with dxvk_native +%endif %bcond_without python3 Name: VirtualBox -Version: 6.1.40 +Version: 7.0.2 Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -69,28 +76,28 @@ Source25: os_mageia_64_x3.png Source26: os_mageia_x4.png Source27: os_mageia_64_x4.png -Patch1: VirtualBox-6.0.0-noupdate.patch +Patch1: VirtualBox-7.0.2-noupdate.patch Patch2: VirtualBox-6.1.0-strings.patch -Patch3: VirtualBox-6.0.0-default-to-Fedora.patch +Patch3: VirtualBox-7.0.2-default-to-Fedora.patch +Patch4: VirtualBox-5.1.0-lib64-VBox.sh.patch #Patch27: VirtualBox-gcc.patch #to revert on EL7 Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch +#from Debian +Patch30: system-libs_cutted.patch +Patch31: fix-build.patch # from ArchLinux Patch40: 007-python2-path.patch # from Mageia -Patch50: VirtualBox-6.1.36-add-Mageia-support.patch -Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch -Patch52: VirtualBox-6.0.10-convert-map-python3.patch +Patch50: VirtualBox-7.0.2-update-Mageia-support.patch +Patch52: VirtualBox-6.1.14-fix-missing-includes-with-qt-5.15.patch +Patch53: VirtualBox-6.0.10-remove-duplicated-define.patch +Patch54: VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch # from Fedora -# Do not show an error dialog when not running under vbox -# Do not start VBoxClient --vmsvga, we run VBoxClient --vmsvga as -# a systemd service, this works with both Wayland and Xorg based sessions -Patch60: VirtualBox-5.2.10-xclient.patch +Patch60: VirtualBox-7.0.2-xclient-cleanups.patch # from OpenSuse -Patch70: vbox-python-selection.patch -Patch71: fixes_for_Qt5.11to15.patch +#Patch70: vbox-python-selection.patch Patch72: virtualbox-snpritnf-buffer-overflow.patch -Patch73: vb-6.1.16-modal-dialog-parent.patch Patch80: VirtualBox-6.1.4-gcc10.patch Patch88: VirtualBox-lzf.patch @@ -106,21 +113,25 @@ BuildRequires: libcurl-devel BuildRequires: iasl BuildRequires: libxslt-devel BuildRequires: libIDL-devel +BuildRequires: nasm BuildRequires: yasm BuildRequires: alsa-lib-devel BuildRequires: opus-devel BuildRequires: pulseaudio-libs-devel -%if %{with python2} -BuildRequires: python2-devel -%endif %if %{with python3} BuildRequires: python%{python3_pkgversion}-devel %endif BuildRequires: desktop-file-utils BuildRequires: libcap-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: qt5-linguist +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Help) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Xml) + %if %{with webservice} BuildRequires: gsoap-devel %endif @@ -181,6 +192,15 @@ BuildRequires: mesa-libGLU-devel %if %{with vnc} BuildRequires: libvncserver-devel %endif +%if %{with system_libtpms} +BuildRequires: pkgconfig(libtpms) +%endif +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(vorbis) +%if %{with dxvk_native} +BuildRequires: glslang +#BuildRequires: dxvk-native-devel +%endif %{?systemd_requires} BuildRequires: systemd @@ -205,9 +225,6 @@ Group: Development/Tools Requires: %{name}-kmod = %{version} Requires: hicolor-icon-theme Provides: %{name}-kmod-common = %{version}-%{release} -%if ! %{with python2} -Obsoletes: python2-%{name}%{?isa} < %{version}-%{release} -%endif %if ! %{with python3} Obsoletes: python%{python3_pkgversion}-%{name}%{?isa} < %{version}-%{release} %endif @@ -229,9 +246,6 @@ webservice GUI part for %{name}. Summary: %{name} SDK Group: Development/Libraries Requires: %{name}-server%{?isa} = %{version}-%{release} -%if %{with python2} -Requires: python2-%{name}%{?isa} = %{version}-%{release} -%endif %if %{with python3} Requires: python%{python3_pkgversion}-%{name}%{?isa} = %{version}-%{release} %endif @@ -240,20 +254,6 @@ Requires: python%{python3_pkgversion}-%{name}%{?isa} = %{version}-%{release} %{name} Software Development Kit. -%package -n python2-%{name} -Summary: Python bindings for %{name} -Group: Development/Libraries -Requires: %{name}-server%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python2-%{name}} -# Remove before F30 -Provides: python-VirtualBox = %{version}-%{release} -Provides: python-VirtualBox%{?_isa} = %{version}-%{release} -Obsoletes: python-VirtualBox < %{version}-%{release} - -%description -n python2-%{name} -Python XPCOM bindings to %{name}. - - %package -n python%{python3_pkgversion}-%{name} Summary: Python3 bindings for %{name} Group: Development/Libraries @@ -309,11 +309,14 @@ find -name '*.py[co]' -delete rm -r src/VBox/Additions/WINNT rm -r src/VBox/Additions/os2 rm -r kBuild/ +#mv tools/kBuildUnits . rm -r tools/ +#mkdir tools +#mv kBuildUnits tools/ + # Remove bundle X11 sources and some lib sources, before patching. rm -r src/VBox/Additions/x11/x11include/ -rm -r src/VBox/Additions/x11/x11stubs/ -rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/ +rm -r src/VBox/Additions/3D/mesa/mesa-21.3.8/ # wglext.h has typedefs for Windows-specific extensions #rm include/VBox/HostServices/wglext.h # src/VBox/GuestHost/OpenGL/include/GL/glext.h have VBOX definitions @@ -322,27 +325,39 @@ rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/ rm -r src/libs/liblzf-3.*/ rm -r src/libs/libpng-1.6.*/ rm -r src/libs/libxml2-2.9.*/ -rm -r src/libs/openssl-1.*/ +rm -r src/libs/openssl-3.*/ rm -r src/libs/zlib-1.2.*/ +rm -r src/libs/curl-7.*/ +rm -r src/libs/libvorbis-1.3.*/ +rm -r src/libs/libogg-1.3.*/ +%if %{with system_libtpms} +rm -r src/libs/libtpms-0.9.0/ +%endif +%if %{with dxvk_native} +#rm -r src/libs/dxvk-native-1.9.*/ +%endif +#rm -r src/libs/softfloat-3e/ %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings %patch3 -p1 -b .default_os_fedora +%patch4 -p1 -b .lib64-VBox.sh #patch27 -p1 -b .gcc %if 0%{?rhel} && 0%{?rhel} < 8 %patch29 -p2 -R -b .gsoap3 %endif +%patch30 -p1 -b .use_vorbis_and_ogg_system +%patch31 -p1 -b .fix_build_noneed_kBuildUnits %if %{with python3} %patch40 -p1 -b .python2_path -%patch52 -p1 -b .convert-map-python3 %endif %patch50 -p1 -b .mageia-support -%patch51 -p1 -b .revert-VBox.sh +%patch52 -p1 -b .qt +%patch53 -p1 -b .qt2 +%patch54 -p1 -b .dtrace %patch60 -p1 -b .xclient -%patch70 -p1 -b .python-detection -%patch71 -p1 -b .qt +#patch70 -p1 -b .python-detection %patch72 -p1 -b .snpritnf-buffer-overflow -%patch73 -p1 -b .modal-dialog-parent %patch80 -p1 -b .gcc10 %patch88 -p1 -b .lzf %patch90 -p1 -b .python3.11 @@ -362,7 +377,7 @@ rm -r src/libs/zlib-1.2.*/ %if !%{with docs} --disable-docs \ %endif -%if !%{with python2} && !%{with python3} +%if !%{with python3} --disable-python \ %endif @@ -408,16 +423,40 @@ kmk %{_smp_mflags} \ SDK_VBOX_OPENSSL_INCS="" \ SDK_VBOX_OPENSSL_LIBS="ssl crypto" \ SDK_VBOX_ZLIB_INCS="" \ +%{?with_system_libtpms: SDK_VBOX_LIBTPMS_INCS="/usr/include/libtpms"} \ + SDK_VBOX_VORBIS_INCS="/usr/include/vorbis" \ + SDK_VBOX_OGG_INCS="/usr/include/ogg" \ +%{!?with_dxvk_native: VBOX_WITH_DXVK= } \ %{?with_docs: VBOX_WITH_DOCS=1 } \ VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \ VBOX_WITH_UPDATE_REQUEST= \ VBOX_WITHOUT_PRECOMPILED_HEADERS=1 \ VBOX_BUILD_PUBLISHER=%{publisher} +# VBOX_WITH_CLOUD_NET:= # VBOX_WITH_TESTCASES= \ # VBOX_WITH_VALIDATIONKIT= \ # VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ + +# build fails with system dxvk_native +#{?with_dxvk_native: SDK_VBOX_DXVK_INCS="/usr/include/dxvk-native/native/directx /usr/include/dxvk-native/native/windows"} \ +# +# In file included from /usr/include/dxvk-native/native/windows/windows.h:3, +#from /usr/include/dxvk-native/native/directx/d3d11_1.h:12, +#from /builddir/build/BUILD/VirtualBox-7.0.2/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win-dx.cpp:58: +#/usr/include/dxvk-native/native/windows/windows_base.h:110:10: warning: ISO C++ prohibits anonymous structs [-Wpedantic] +#110 | struct { +#| ^ +#In file included from /builddir/build/BUILD/VirtualBox-7.0.2/src/VBox/Devices/Graphics/DevVGA.h:68, +#from /builddir/build/BUILD/VirtualBox-7.0.2/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win-dx.cpp:47: +#/builddir/build/BUILD/VirtualBox-7.0.2/src/VBox/Devices/Graphics/DevVGA-SVGA.h:64:15: error: expected unqualified-id before numeric constant +#64 | # define TRUE 1 +#| ^ +#/usr/include/dxvk-native/native/windows/windows_base.h:161:16: note: in expansion of macro 'TRUE' +#161 | constexpr BOOL TRUE = 1; +#| ^~~~ + # doc/manual/fr_FR/ missing man_VBoxManage-debugvm.xml and man_VBoxManage-extpack.xml # VBOX_WITH_DOCS_TRANSLATIONS=1 \ # we can't build CHM DOCS we need hhc.exe which is not in source and we need @@ -462,8 +501,6 @@ install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox \ # Binaries install -p -m 0755 obj/bin/VBox.sh %{buildroot}%{_bindir}/VBox -install -p -m 0755 -t %{buildroot}%{_bindir} \ - obj/bin/VBoxTunctl # Executables install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \ @@ -473,7 +510,6 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \ obj/bin/VBoxNetNAT \ obj/bin/VBoxNetAdpCtl \ obj/bin/VBoxVolInfo \ - obj/bin/VBoxSDL \ obj/bin/SUPInstall \ obj/bin/SUPLoggerCtl \ obj/bin/SUPUninstall \ @@ -487,7 +523,7 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \ obj/bin/VBoxXPCOMIPCD \ obj/bin/VBoxSysInfo.sh \ obj/bin/vboxweb-service.sh \ -%if %{with python2} || %{with python3} +%if %{with python3} obj/bin/vboxshell.py \ %endif obj/bin/vbox-img \ @@ -537,18 +573,13 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \ obj/bin/nls/* # Python -%if %{with python2} || %{with python3} +%if %{with python3} pushd obj/bin/sdk/installer export VBOX_INSTALL_PATH=%{_libdir}/virtualbox -%if %{with python2} - %{__python2} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot} -%endif -%if %{with python3} - %{__python3} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot} - if [ -x /usr/bin/pathfix.py ]; then - pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}${VBOX_INSTALL_PATH}/vboxshell.py - fi -%endif +%{__python3} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot} +if [ -x /usr/bin/pathfix.py ]; then + pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}${VBOX_INSTALL_PATH}/vboxshell.py +fi popd %endif @@ -622,7 +653,6 @@ install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_unitdir}/vboxclient.service # Module Source Code mkdir -p %{name}-kmod-%{version} cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version} -#rm -r %{name}-kmod-%{version}/vboxvideo/ install -d %{buildroot}%{_datadir}/%{name}-kmod-%{version} tar --use-compress-program xz -cf %{buildroot}%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \ %{name}-kmod-%{version} @@ -632,10 +662,6 @@ install -m 0644 -D %{SOURCE10} \ %{buildroot}%{_unitdir}/vboxweb.service %endif -# Installation root configuration -install -d %{buildroot}%{_sysconfdir}/vbox -echo 'INSTALL_DIR=%{_libdir}/virtualbox' > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg - # Install udev rules install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh %{buildroot}%{_prefix}/lib/udev/VBoxCreateUSBNode.sh install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules @@ -644,7 +670,6 @@ install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_unitdir}/vboxdrv.service install -p -m 0644 -D %{SOURCE9} %{buildroot}%{_presetdir}/96-vboxhost.preset - # Menu entry desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ --remove-key=Encoding obj/bin/virtualbox.desktop @@ -661,12 +686,6 @@ install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml #set_selinux_permissions /usr/lib/virtualbox /usr/share/virtualbox # vboxautostart-service -install -d %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps -install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps obj/bin/rdesktop-vrdp-keymaps/* -install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox obj/bin/rdesktop-vrdp.tar.gz -install -p -m 0755 -t %{buildroot}%{_bindir} obj/bin/rdesktop-vrdp - - %pre server # Group for USB devices getent group vboxusers >/dev/null || groupadd -r vboxusers @@ -787,21 +806,16 @@ getent passwd vboxadd >/dev/null || \ %{_bindir}/vboxmanage %{_bindir}/VBoxSDL %{_bindir}/vboxsdl -%{_bindir}/VBoxTunctl %{_bindir}/VBoxVRDP %{_bindir}/VirtualBoxVM %{_bindir}/virtualboxvm %{_bindir}/vbox-img %{_bindir}/vboximg-mount -%{_bindir}/rdesktop-vrdp %dir %{_libdir}/virtualbox %{_libdir}/virtualbox/*.[^p]* %exclude %{_libdir}/virtualbox/VBoxDbg.so %exclude %{_libdir}/virtualbox/UICommon.so %exclude %{_libdir}/virtualbox/VirtualBoxVM.so -%if %{with python2} -%exclude %{_libdir}/virtualbox/VBoxPython2_7.so -%endif %if %{with python3} %exclude %{_libdir}/virtualbox/VBoxPython3*.so %endif @@ -821,18 +835,14 @@ getent passwd vboxadd >/dev/null || \ %{_libdir}/virtualbox/VBoxDTrace %{_libdir}/virtualbox/vbox-img %{_libdir}/virtualbox/vboximg-mount -%{_libdir}/virtualbox/rdesktop-vrdp-keymaps # This permissions have to be here, before generator of debuginfo need # permissions to read this files %attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetNAT %attr(4511,root,root) %{_libdir}/virtualbox/VBoxVolInfo %attr(4511,root,root) %{_libdir}/virtualbox/VBoxHeadless -%attr(4511,root,root) %{_libdir}/virtualbox/VBoxSDL %attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetDHCP %attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl %attr(4511,root,root) %{_libdir}/virtualbox/VirtualBoxVM -%dir %{_sysconfdir}/vbox -%config %{_sysconfdir}/vbox/vbox.cfg %{_udevrulesdir}/60-vboxdrv.rules %{_unitdir}/vboxdrv.service %{_presetdir}/96-vboxhost.preset @@ -866,13 +876,6 @@ getent passwd vboxadd >/dev/null || \ %files devel %{_libdir}/virtualbox/sdk -%if %{with python2} -%files -n python2-%{name} -%{_libdir}/virtualbox/*.py* -%{python2_sitelib}/vboxapi* -%{_libdir}/virtualbox/VBoxPython2_7.so -%endif - %if %{with python3} %files -n python%{python3_pkgversion}-%{name} %{_libdir}/virtualbox/*.py* @@ -905,6 +908,19 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Wed Oct 26 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.2-1 +- Update to 7.0.2 +- Drop python2 support +- Based on Mageia and after on Debian packages +- Drop VirtualBox-6.0.10-convert-map-python3.patch and vb-6.1.16-modal-dialog-parent.patch +- Refresh default-to-Fedora, noupdate.patch, xclient.patch, build-xpcom18a4-with-c++17.patch and python3.11.patch +- Replace fixes_for_Qt5.11to15.patch with remove-duplicated-define.patch, update-Mageia-support.patch and fix-missing-includes-with-qt-5.15.patch +- Add ExtPacks-VBoxDTrace-no-publisher-in-version.patch from Mageia +- Add partial system-libs.patch and fix-build.patch from Debian (libvorbis and libogg system support) +- Add build conditionals for system_libtpms and dxvk-native +- Add VirtualBox-5.1.0-lib64-VBox.sh.patch and finally drop /etc/vbox as upstream did in 5.1.0 +- Add BR: nasm (to fix nasm: not found message) + * Wed Oct 12 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.40-1 - Update VirtualBox to 6.1.40 diff --git a/fix-build.patch b/fix-build.patch new file mode 100644 index 0000000..020091b --- /dev/null +++ b/fix-build.patch @@ -0,0 +1,21 @@ +Description: that file needs to be used on windows only. + +The build can also be fixed by exporting +VBOX_WITH_HOST_SHIPPING_AUDIO_TEST= +VBOX_WITH_VALIDATIONKIT= + +in LocalConfig.kmk + +diff --git a/src/VBox/ValidationKit/Config.kmk b/src/VBox/ValidationKit/Config.kmk +index 7047a04b8..66ea42ca4 100644 +--- a/src/VBox/ValidationKit/Config.kmk ++++ b/src/VBox/ValidationKit/Config.kmk +@@ -122,7 +122,7 @@ TEMPLATE_VBoxValidationKitR3_LNK_DEPS.win.amd64 = $(if $(eq $(tool_do),LINK_LIB + + #TODO: TEMPLATE_VBoxValidationKitR3_EXTENDS = VBOXGUESTR3EXE + +-TEMPLATE_VBoxValidationKitR3_USES += vboximportchecker ++TEMPLATE_VBoxValidationKitR3_USES.win += vboximportchecker + TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.win.x86 = nt31 + TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.win.amd64 = xp64 + diff --git a/sources b/sources index 2e82fd7..a0d4fed 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VirtualBox-6.1.40.tar.bz2) = 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096 -SHA512 (UserManual.pdf) = cba2baf8e196d1be939e2b0ffef0a4015d06eb2671df51a4ed9eac2389f0194cb2cce8984394855779bfeb51f4756f0939032358dc41b9b8bf9e5ac270f2e07f +SHA512 (VirtualBox-7.0.2.tar.bz2) = c79d6365f83e1fde356a7f4a6ccd23bc7306d1b5b4be669634c575f08ba53338caca684758c9409ecef2b05ab6f9ad37dfa6075ad6afbc5d7909d46ee6794927 +SHA512 (UserManual.pdf) = 930e1e371b20e2d1d66ea66a3eda87338e9f51df7cfb6530147c649f4a0ab7e1ec194606b0cda2acbab40d426a0f496e17b327bacf196bf79b1978c51b83db66 diff --git a/system-libs_cutted.patch b/system-libs_cutted.patch new file mode 100644 index 0000000..7de7ecf --- /dev/null +++ b/system-libs_cutted.patch @@ -0,0 +1,121 @@ +--- ./configure.orig 2022-10-19 19:17:13.000000000 +0100 ++++ ./configure 2022-10-31 15:16:29.775851599 +0000 +@@ -110,6 +110,8 @@ WITH_DOCS=1 + WITH_LIBVPX=1 + WITH_LIBOPUS=1 + WITH_LIBTPMS=1 ++WITH_LIBVORBIS=1 ++WITH_LIBOGG=1 + BUILD_LIBXML2= + BUILD_LIBCURL= + BUILD_LIBSSL= +@@ -1846,6 +1848,78 @@ EOF + + + # ++# Check for libvorbis ++# ++check_libvorbis() ++{ ++ test_header libvorbis ++ if which_wrapper pkg-config > /dev/null; then ++ libvorbis_ver=`pkg-config vorbis --modversion 2>> $LOG` ++ if [ $? -eq 0 ]; then ++ FLGVRB=`pkg-config vorbis --cflags` ++ INCVRB=`strip_I "$FLGVRB"` ++ LIBVRB=`pkg-config vorbis --libs` ++ fi ++ cat > $ODIR.tmp_src.cc << EOF ++#include <cstdio> ++#include <vorbis/vorbisenc.h> ++extern "C" int main(void) ++{ ++ vorbis_info v; ++ vorbis_info_init(&v); ++ printf("found, OK.\n"); ++} ++EOF ++ [ -n "$INCVRB" ] && I_INCVRB=`prefix_I "$INCVRB"` ++ if test_compile "$LIBVRB $I_INCVRB" vorbis vorbis nofatal; then ++ if test_execute; then ++ cnf_append "SDK_VBOX_VORBIS_INCS" "$INCVRB" ++ cnf_append "SDK_VBOX_VORBIS_LIBS" "`strip_l "$LIBVRB"`" ++ fi ++ else ++ echo "not found -- building libvorbis from in-tree code." ++ fi ++ fi ++} ++ ++ ++# ++# Check for libogg ++# ++check_libogg() ++{ ++ test_header libogg ++ if which_wrapper pkg-config > /dev/null; then ++ libogg_ver=`pkg-config ogg --modversion 2>> $LOG` ++ if [ $? -eq 0 ]; then ++ FLGOGG=`pkg-config ogg --cflags` ++ INCOGG=`strip_I "$FLGOGG"` ++ LIBOGG=`pkg-config ogg --libs` ++ fi ++ cat > $ODIR.tmp_src.cc << EOF ++#include <cstdio> ++#include <ogg/ogg.h> ++extern "C" int main(void) ++{ ++ oggpack_buffer o; ++ oggpack_get_buffer(&o); ++ printf("found, OK.\n"); ++} ++EOF ++ [ -n "$INCOGG" ] && I_INCVRB=`prefix_I "$INCOGG"` ++ if test_compile "$LIBOGG $I_INCOGG" ogg ogg nofatal; then ++ if test_execute; then ++ cnf_append "SDK_VBOX_OGG_INCS" "$INCOGG" ++ cnf_append "SDK_VBOX_OGG_LIBS" "`strip_l "$LIBOGG"`" ++ fi ++ else ++ echo "not found -- building libogg from in-tree code." ++ fi ++ fi ++} ++ ++ ++# + # Check whether static libstdc++ is installed. This library is required + # for the Linux guest additions. + # +@@ -2437,6 +2511,8 @@ EOF + [ $WITH_LIBVPX -eq 1 ] && echo " --disable-libvpx don't use libvpx for video capturing" + [ $WITH_LIBOPUS -eq 1 ] && echo " --disable-libopus don't use libopus for audio capturing" + [ $WITH_LIBTPMS -eq 1 ] && echo " --disable-libtpms don't use libtpms for TPM emulation" ++[ $WITH_LIBVORBIS -eq 1 ] && echo " --disable-libvorbis enable system libvorbis" ++[ $WITH_LIBOGG -eq 1 ] && echo " --disable-libogg enable system libogg" + [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" + cat << EOF + --disable-udptunnel disable UDP tunnel networking +@@ -2688,6 +2764,12 @@ for option in "$@"; do + --disable-libtpms) + WITH_LIBTPMS=0 + ;; ++ --disable-libvorbis) ++ WITH_LIBVORBIS=0 ++ ;; ++ --disable-libogg) ++ WITH_LIBOGG=0 ++ ;; + --disable-sdl) + WITH_SDL=0 + ;; +@@ -2909,6 +2991,8 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then + [ $WITH_LIBVPX -eq 1 ] && check_vpx + [ $WITH_LIBOPUS -eq 1 ] && check_libopus + [ $WITH_LIBTPMS -eq 1 ] && check_libtpms ++ check_libvorbis ++ check_libogg + [ "$OS" != "darwin" ] && check_png + [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam + if [ $WITH_SDL -eq 1 ]; then diff --git a/update_vbox.sh b/update_vbox.sh index d0d6284..21b46ae 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,4 +1,4 @@ -VERSION=6.1.40 +VERSION=7.0.2 REL=1 RAWHIDE=38 REPOS="f37 f36 f35 el9 el8 el7" @@ -24,7 +24,7 @@ rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf fi echo Press enter scratch-build or n to skip ; read dummy; if [[ "$dummy" != "n" ]]; then - rfpkg scratch-build --srpm --nowait + rfpkg scratch-build --srpm fi echo Press enter to build on corp -build or n to skip ; read dummy; if [[ "$dummy" != "n" ]]; then @@ -47,7 +47,7 @@ echo STAGE 2 for repo in $REPOS ; do echo Press enter to build on branch $repo or n to skip; read dummy; if [[ "$dummy" != "n" ]]; then -git checkout $repo && git merge master && git push && rfpkg build --nowait; git checkout master +git checkout $repo && git merge master && git push && rfpkg build; git checkout master fi done fi