1
0
forked from pool/virtualbox
virtualbox/fix_sdl_build.patch
Larry Finger 6c3d667234 Accepting request 1142681 from home:larryr:branches:Virtualization
- Version bump to VirtualBox 7.0.14 (released January 16, 2024 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
    Audio: Added more fixes for switching host audio devices on Windows hosts using the WAS backend
    3D: Added general improvements
    OCI: Fixed wrong guest RAM unit usage in VirtualSystemDescription, memory is provided in bytes, "Byte" is the base unit
    Main: OVF Import/Export: Added support for importing and exporting VMs containing NVMe storage controllers (bug #19320)
    Main: OVF Import/Export: Added support for exporting a VM which contains a medium inserted into a virtual CD/DVD drive which is attached to a Virtio-SCSI controller
    Devices: Fixed a problem where Windows guests "forget" in-progress touch events when the user holds down a finger without moving it for a period of time.
    macOS Host USB: Added support for newer storage devices
    macOS Host: Fixed memory Leak in the VBoxIntNetSwitch process when VM was configured to use 'Internal Networking' (bug #21752)
    Linux Host and Guest: Added initial support for RHEL 9.4 kernel
    Linux Guest Additions: Fixed kernel panic on RHEL 8.9 kernel caused by vboxvideo (bugs #10381 and #21911)
    Solaris Guest Additions: Added support for the Additions to be installed into an alternate root path ('pkgadd -R')
    Solaris Guest Additions: Removed requirement to reboot VM after uninstalling GAs
    RDP: Fix possible crash when connecting with the Apple Silicon variant of the Microsoft Remote Desktop application (bug #21820).
    BIOS: Fixed handle number used for DMI OEM table (bug #19781) 
=======

>>>>>>> ./virtualbox.changes.new

OBS-URL: https://build.opensuse.org/request/show/1142681
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=720
2024-01-29 22:31:23 +00:00

93 lines
3.1 KiB
Diff

Index: VirtualBox-7.0.14/configure
===================================================================
--- VirtualBox-7.0.14.orig/configure
+++ VirtualBox-7.0.14/configure
@@ -1191,21 +1191,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)
{
@@ -1221,7 +1219,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"`"
@@ -3015,11 +3013,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.14/src/VBox/Frontends/VBoxSDL/Makefile.kmk
===================================================================
--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk
+++ VirtualBox-7.0.14/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