commit:     c8222e6710da2d14619ef7d6f9a1a533aeb0402f
Author:     Andrew Udvare <audvare <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 20:42:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 20:46:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8222e67

app-emulation/virtualbox: add SDL flag to 6.1.36-r1; revbump to r2

Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26991
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...box-6.1.36-r1.ebuild => virtualbox-6.1.36-r2.ebuild} | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild 
b/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
similarity index 98%
rename from app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
rename to app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
index e964abdd6906..f0081d49d032 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
@@ -36,7 +36,7 @@ SLOT="0/$(ver_cut 1-2)"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
        KEYWORDS="~amd64"
 fi
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch 
pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch 
pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
 
 unset WATCOM #856769
 
@@ -52,7 +52,7 @@ COMMON_DEPEND="
        media-libs/libvpx:0=
        sys-libs/zlib:=
        !headless? (
-               media-libs/libsdl:0[X,video]
+               sdl? ( media-libs/libsdl:0[X,video] )
                x11-libs/libX11
                x11-libs/libxcb:=
                x11-libs/libXcursor
@@ -293,6 +293,7 @@ src_configure() {
                myconf+=(
                        $(usex opengl '' --disable-opengl)
                        $(usex qt5 '' --disable-qt)
+                       $(usex sdl '' --disable-sdl)
                )
        else
                myconf+=(
@@ -487,12 +488,14 @@ src_install() {
 
        if ! use headless ; then
                vbox_inst rdesktop-vrdp
-               vbox_inst VBoxSDL 4750
-               pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+               if use sdl ; then
+                       vbox_inst VBoxSDL 4750
+                       pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
 
-               for each in vboxsdl VBoxSDL ; do
-                       dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-               done
+                       for each in vboxsdl VBoxSDL ; do
+                               dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+                       done
+               fi
 
                if use qt5 ; then
                        vbox_inst VirtualBox

Reply via email to