diff options
Diffstat (limited to 'emulators/virtualbox-ose')
7 files changed, 91 insertions, 7 deletions
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index e79e170b28a5..0dab90413e05 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 6.1.50 -PORTREVISION?= 13 +PORTREVISION?= 16 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ LOCAL/bofh/emulators/virtualbox-ose:docs diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA.cpp new file mode 100644 index 000000000000..949c413d4ba3 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA.cpp @@ -0,0 +1,20 @@ +--- src/VBox/Devices/Graphics/DevVGA-SVGA.cpp.orig 2024-01-11 12:18:20 UTC ++++ src/VBox/Devices/Graphics/DevVGA-SVGA.cpp +@@ -169,7 +169,7 @@ + # ifdef RT_OS_DARWIN + # include "DevVGA-SVGA3d-cocoa.h" + # endif +-# ifdef RT_OS_LINUX ++# if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) + # ifdef IN_RING3 + #include "DevVGA-SVGA3d-glLdr.h" + # endif +@@ -3520,7 +3520,7 @@ static DECLCALLBACK(int) vmsvgaR3FifoLoop(PPDMDEVINS p + PVMSVGAR3STATE pSVGAState = pThisCC->svga.pSvgaR3State; + int rc; + +-# if defined(VBOX_WITH_VMSVGA3D) && defined(RT_OS_LINUX) ++# if defined(VBOX_WITH_VMSVGA3D) && (defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)) + if (pThis->svga.f3DEnabled) + { + /* The FIFO thread may use X API for accelerated screen output. */ diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.cpp index c9574654562d..4bee4df8ce47 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.cpp +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.cpp @@ -1,4 +1,4 @@ ---- src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp.orig 2021-01-07 15:39:16 UTC +--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp.orig 2024-01-11 12:18:21 UTC +++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp @@ -186,7 +186,7 @@ int glLdrInit(PPDMDEVINS pDevIns) pfn_wglDeleteContext = 0; diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.h b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.h index 3069950947cd..34edb2b49799 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.h +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.h @@ -1,6 +1,6 @@ ---- src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h.orig 2021-01-07 15:39:17 UTC +--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h.orig 2024-01-11 12:18:21 UTC +++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h -@@ -338,7 +338,7 @@ GLPFN BOOL (WINAPI *pfn_wglMakeCurrent)(HDC, HGLRC); +@@ -338,7 +338,7 @@ GLPFN BOOL (WINAPI *pfn_wglShareLists)(HGLRC, HGLRC); GLPFN BOOL (WINAPI *pfn_wglShareLists)(HGLRC, HGLRC); #define wglShareLists pfn_wglShareLists diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-internal.h b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-internal.h new file mode 100644 index 000000000000..1378f39b6a59 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-internal.h @@ -0,0 +1,11 @@ +--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h.orig 2024-01-11 12:18:21 UTC ++++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h +@@ -1175,7 +1175,7 @@ typedef struct VMSVGAHWSCREEN + typedef struct VMSVGAHWSCREEN + { + uint32_t u32Reserved0; +-#if defined(RT_OS_LINUX) ++#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) + /* OpenGL context, which is used for the screen updates. */ + GLXContext glxctx; + diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_xml.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_xml.cpp new file mode 100644 index 000000000000..9f17777fdc2a --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_xml.cpp @@ -0,0 +1,53 @@ +--- src/VBox/Runtime/r3/xml.cpp.orig 2024-01-11 12:26:05 UTC ++++ src/VBox/Runtime/r3/xml.cpp +@@ -1837,12 +1837,20 @@ static void xmlParserBaseGenericError(void *pCtx, cons + va_end(args); + } + ++#if LIBXML_VERSION >= 21206 ++static void xmlStructuredErrorFunc(void *userData, const xmlError *error) ++{ ++ NOREF(userData); ++ NOREF(error); ++} ++#else + static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) + { + NOREF(pCtx); + /* we expect that there is always a trailing NL */ + LogRel(("XML error at '%s' line %d: %s", error->file, error->line, error->message)); + } ++#endif + + XmlParserBase::XmlParserBase() + { +@@ -1851,7 +1859,11 @@ XmlParserBase::XmlParserBase() + throw std::bad_alloc(); + /* per-thread so it must be here */ + xmlSetGenericErrorFunc(NULL, xmlParserBaseGenericError); ++#if LIBXML_VERSION >= 21206 ++ xmlSetStructuredErrorFunc(NULL, xmlStructuredErrorFunc); ++#else + xmlSetStructuredErrorFunc(NULL, xmlParserBaseStructuredError); ++#endif + } + + XmlParserBase::~XmlParserBase() +@@ -1912,7 +1924,7 @@ void XmlMemParser::read(const void *pvBuf, size_t cbSi + pcszFilename, + NULL, // encoding = auto + options))) +- throw XmlError(xmlCtxtGetLastError(m_ctxt)); ++ throw XmlError((xmlErrorPtr)xmlCtxtGetLastError(m_ctxt)); + + doc.refreshInternals(); + } +@@ -2172,7 +2184,7 @@ void XmlFileParser::read(const RTCString &strFilename, + pcszFilename, + NULL, // encoding = auto + options))) +- throw XmlError(xmlCtxtGetLastError(m_ctxt)); ++ throw XmlError((xmlErrorPtr)xmlCtxtGetLastError(m_ctxt)); + + doc.refreshInternals(); + } diff --git a/emulators/virtualbox-ose/files/vboxinit.in b/emulators/virtualbox-ose/files/vboxinit.in index 13ec9614827d..9895da9e362e 100644 --- a/emulators/virtualbox-ose/files/vboxinit.in +++ b/emulators/virtualbox-ose/files/vboxinit.in @@ -37,7 +37,7 @@ restart_cmd="${name}_restart" vboxinit_start() { # Get a list of all machines with autorun enabled in phpvirtualbox - ${su_command} "${command} list vms | /usr/bin/tr -d '{}\"'" | while read VMNAME UUID; do + ${su_command} "${command} list vms | /usr/bin/tr -d '{}\"'" | /usr/bin/sort | while read VMNAME UUID; do STARTUP=$(${su_command} "${command} getextradata ${UUID} 'pvbx/startupMode'" | /usr/bin/cut -d' ' -f2) if [ "${STARTUP}" == "auto" ]; then echo "${name}: starting machine ${VMNAME} ..." @@ -50,7 +50,7 @@ vboxinit_start() vboxinit_stop() { # Get all running machines - ${su_command} "${command} list runningvms | /usr/bin/tr -d '{}\"'" | while read VMNAME UUID; do + ${su_command} "${command} list runningvms | /usr/bin/tr -d '{}\"'" | /usr/bin/sort -r | while read VMNAME UUID; do echo "${name}: stopping machine ${VMNAME} with action '${vboxinit_stop}' ..." ${su_command} "${command} controlvm ${UUID} ${vboxinit_stop}" sleep "${vboxinit_stop_delay}" @@ -75,7 +75,7 @@ load_rc_config $name : ${vboxinit_user="%%VBOXUSER%%"} : ${vboxinit_home=$(/usr/sbin/pw usershow -7 -n "${vboxinit_user}" | /usr/bin/cut -d: -f6)} : ${vboxinit_stop="savestate"} -: ${vboxinit_start_delay="0"} +: ${vboxinit_start_delay="1"} : ${vboxinit_stop_delay="0"} HOME=${vboxinit_home} USER=${vboxinit_user} |