summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViorel Munteanu <ceamac@gentoo.org>2022-11-08 19:36:37 +0200
committerViorel Munteanu <ceamac@gentoo.org>2022-11-20 10:16:37 +0200
commitb61b9f265ffdba5cb6bef51d49a86c2e077416c2 (patch)
tree1fed68f6ac94e802da69aba3c1c7a91a14cde2ce /app-emulation/virtualbox/files
parentapp-emulation/virtualbox-modules: add 7.0.4 (diff)
downloadgentoo-b61b9f265ffdba5cb6bef51d49a86c2e077416c2.tar.gz
gentoo-b61b9f265ffdba5cb6bef51d49a86c2e077416c2.tar.bz2
gentoo-b61b9f265ffdba5cb6bef51d49a86c2e077416c2.zip
app-emulation/virtualbox: add 7.0.4
Add vbox-img, a tool that comes with virtualbox but was not being compiled Closes: https://bugs.gentoo.org/443830 Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
Diffstat (limited to 'app-emulation/virtualbox/files')
-rw-r--r--app-emulation/virtualbox/files/virtualbox-7.0.4-fix-compilation.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.4-fix-compilation.patch b/app-emulation/virtualbox/files/virtualbox-7.0.4-fix-compilation.patch
new file mode 100644
index 000000000000..4452d22fdfd2
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-7.0.4-fix-compilation.patch
@@ -0,0 +1,26 @@
+Fix compilation if VBOX_WITH_AUDIO_OSS is defined while VBOX_WITH_AUDIO_PULSE and VBOX_WITH_AUDIO_ALSA are not
+
+--- a/src/VBox/Main/xml/Settings.cpp
++++ b/src/VBox/Main/xml/Settings.cpp
+@@ -8931,6 +8931,9 @@
+ RTCLock lock(s_mtx);
+ if (s_enmLinuxDriver == AudioDriverType_Null)
+ {
++# ifdef VBOX_WITH_AUDIO_OSS
++ s_enmLinuxDriver = AudioDriverType_OSS;
++# endif /* VBOX_WITH_AUDIO_OSS */
+ # ifdef VBOX_WITH_AUDIO_PULSE
+ /* Check for the pulse library & that the pulse audio daemon is running. */
+ if (RTProcIsRunningByName("pulseaudio") &&
+@@ -8943,10 +8946,7 @@
+ if (RTLdrIsLoadable("libasound.so.2"))
+ s_enmLinuxDriver = AudioDriverType_ALSA;
+ # endif /* VBOX_WITH_AUDIO_ALSA */
+-# ifdef VBOX_WITH_AUDIO_OSS
+- else
+- s_enmLinuxDriver = AudioDriverType_OSS;
+-# endif /* VBOX_WITH_AUDIO_OSS */
++ ;
+ }
+ return s_enmLinuxDriver;
+