forked from pool/virtualbox
4c5592f466
---------------------------------------------------------------------
- Version bump to VirtualBox 7.0.20 (released July 16 2024 by Oracle))
This is a maintenance release. The following items were fixed and/or added:
TPM: Fixed errors appearing the event viewer with Windows guests
macOS Hosts: Fixed passing USB devices to the VM (bug #21218)
Audio: Fixed recording with HDA emulation after newer Windows 10 / 11 guests got rebooted
USB: Fixed a deadlock in OHCI triggered when saving the current state of a VM or taking a snapshot (bug #22059)
Linux Guest and Host: Introduced initial support for OpenSuse 15.6 kernel
Linux Guest and Host: Introduced initial support for RHEL 9.5 kernel (bug #22099)
Guest Additions: Shared Clipboard: Fixed issue when extra new lines were pasted when copying text between Win and X11 (bug #21716)
UEFI Secure Boot: Add new Microsoft certificates to list for new VMs
OBS-URL: https://build.opensuse.org/request/show/1188058
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=743
93 lines
3.1 KiB
Diff
93 lines
3.1 KiB
Diff
Index: VirtualBox-7.0.20/configure
|
|
===================================================================
|
|
--- VirtualBox-7.0.20.orig/configure
|
|
+++ VirtualBox-7.0.20/configure
|
|
@@ -1186,21 +1186,19 @@ check_sdl()
|
|
fail
|
|
fi
|
|
else
|
|
- if which_wrapper sdl-config > /dev/null; then
|
|
- FLGSDL=`sdl-config --cflags`
|
|
+ FLGSDL="-I/usr/include/SDL2 -D_GNU_SOURCE=1 -D_REENTRANT"
|
|
INCSDL=`strip_I "$FLGSDL"`
|
|
- LIBSDL=`sdl-config --libs`
|
|
+ LIBSDL="-L/usr/lib64 -LSDL2"
|
|
LIBSDLMAIN="-lSDLmain"
|
|
FLDSDL=
|
|
foundsdl=1
|
|
- fi
|
|
fi
|
|
[ "$OS" = "linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN=""
|
|
if [ -n "$foundsdl" ]; then
|
|
cat > $ODIR.tmp_src.cc << EOF
|
|
#include <cstdio>
|
|
#include <SDL.h>
|
|
-#include <SDL_main.h>
|
|
+//#include <SDL_main.h>
|
|
#undef main
|
|
extern "C" int main(int argc, char** argv)
|
|
{
|
|
@@ -1216,7 +1214,7 @@ extern "C" int main(int argc, char** arg
|
|
}
|
|
EOF
|
|
[ -n "$INCSDL" ] && I_INCSDL=`prefix_I "$INCSDL"`
|
|
- if test_compile "$LIBSDL $LIBSDLMAIN $I_INCSDL $FLDSDL" SDL SDL; then
|
|
+ if test_compile "$LIBSDL $LIBSDLMAIN $I_INCSDL $FLDSDL" SDL2 SDL2; then
|
|
if test_execute; then
|
|
cnf_append "LIB_SDK_LIBSDL_SDL" "`strip_l "$LIBSDL"`"
|
|
cnf_append "SDK_LIBSDL_LIBPATH" "`strip_L "$LIBSDL"`"
|
|
@@ -3010,11 +3008,8 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
|
|
[ $WITH_LIBLZMA -eq 1 ] && check_liblzma
|
|
[ "$OS" != "darwin" ] && check_png
|
|
[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
|
|
- if [ $WITH_SDL -eq 1 ]; then
|
|
- check_sdl
|
|
- else
|
|
- cnf_append "VBOX_WITH_VBOXSDL" ""
|
|
- fi
|
|
+ check_sdl
|
|
+ cnf_append "VBOX_WITH_VBOXSDL" "1"
|
|
[ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf
|
|
[ $WITH_X11 -eq 1 ] && check_x
|
|
# TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only)
|
|
Index: VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
|
===================================================================
|
|
--- VirtualBox-7.0.20.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
|
+++ VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
|
@@ -51,7 +51,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
|
PROGRAMS += VBoxSDL
|
|
endif
|
|
VBoxSDL_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBoxMainClientDll,VBoxMainClientExe)
|
|
- VBoxSDL_SDKS = LIBSDL2
|
|
+ VBoxSDL_SDKS = LIBSDL
|
|
VBoxSDL_SOURCES = \
|
|
VBoxSDL.cpp \
|
|
Framebuffer.cpp \
|
|
@@ -81,7 +81,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
|
endif
|
|
ifn1of ($(KBUILD_TARGET), solaris) # Probably wrong with SDL2
|
|
VBoxSDL_LIBS = \
|
|
- $(LIB_SDK_LIBSDL2_SDLMAIN)
|
|
+ $(LIB_SDK_LIBSDL_SDLMAIN)
|
|
endif
|
|
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
|
|
VBoxSDL_LIBS += \
|
|
@@ -121,7 +121,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
|
if 0
|
|
PROGRAMS += tstSDL
|
|
tstSDL_TEMPLATE = VBoxR3TstExe
|
|
- tstSDL_SDKS = LIBSDL2
|
|
+ tstSDL_SDKS = LIBSDL
|
|
tstSDL_INST = $(INST_TESTCASE)
|
|
tstSDL_SOURCES = \
|
|
VBoxSDLTest.cpp
|
|
@@ -138,7 +138,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
|
$(LIB_RUNTIME)
|
|
ifn1of ($(KBUILD_TARGET), solaris)
|
|
tstSDL_LIBS += \
|
|
- $(LIB_SDK_LIBSDL2_SDLMAIN)
|
|
+ $(LIB_SDK_LIBSDL_SDLMAIN)
|
|
endif
|
|
|
|
ifdef VBOX_OPENGL
|