From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1429987-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 99A1C158094
for <garchives@archives.gentoo.org>; Tue, 23 Aug 2022 18:57:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 88A66E0824;
Tue, 23 Aug 2022 18:57:34 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 65AE2E0824
for <gentoo-commits@lists.gentoo.org>; Tue, 23 Aug 2022 18:57:34 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 52EE3340EBA
for <gentoo-commits@lists.gentoo.org>; Tue, 23 Aug 2022 18:57:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E7169571
for <gentoo-commits@lists.gentoo.org>; Tue, 23 Aug 2022 18:57:31 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1661281002.1580dc0483ebc5d389ae731399225d0115706570.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild app-emulation/virtualbox/virtualbox-6.1.34-r6.ebuild app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild app-emulation/virtualbox/virtualbox-6.1.36.ebuild
X-VCS-Directories: app-emulation/virtualbox/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 1580dc0483ebc5d389ae731399225d0115706570
X-VCS-Branch: master
Date: Tue, 23 Aug 2022 18:57:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b50a974c-3a8f-4d70-9083-53c6bbd75d36
X-Archives-Hash: a9c276eee331baa4db9b2f471c4e4978
commit: 1580dc0483ebc5d389ae731399225d0115706570
Author: Andrew Udvare <audvare <AT> gmail <DOT> com>
AuthorDate: Mon Aug 1 12:04:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:56:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1580dc04
app-emulation/virtualbox: add sdl USE flag
--disable-sdl is not documented in the configure script's help but it does work as expected.
Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25612
Signed-off-by: Sam James <sam <AT> gentoo.org>
...box-6.1.32-r2.ebuild => virtualbox-6.1.32-r3.ebuild} | 17 ++++++++++-------
...box-6.1.34-r6.ebuild => virtualbox-6.1.34-r7.ebuild} | 17 ++++++++++-------
app-emulation/virtualbox/virtualbox-6.1.36.ebuild | 17 ++++++++++-------
3 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild b/app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild
similarity index 97%
rename from app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
rename to app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild
index 96494cca02e5..722a6987c670 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
SLOT="0/$(ver_cut 1-2)"
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
KEYWORDS="amd64"
-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"
COMMON_DEPEND="
${PYTHON_DEPS}
@@ -36,7 +36,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
@@ -253,6 +253,7 @@ src_configure() {
if ! use headless ; then
myconf+=(
$(usex opengl '' --disable-opengl)
+ $(usex sdl '' --disable-sdl)
$(usex qt5 '' --disable-qt)
)
else
@@ -360,12 +361,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
diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r6.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild
similarity index 98%
rename from app-emulation/virtualbox/virtualbox-6.1.34-r6.ebuild
rename to app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild
index 7e63e28a4679..b18a640616f9 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.34-r6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r7.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"
REQUIRED_USE="
java? ( sdk )
@@ -58,7 +58,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
@@ -287,6 +287,7 @@ src_configure() {
if ! use headless ; then
myconf+=(
$(usex opengl '' --disable-opengl)
+ $(usex sdl '' --disable-sdl)
$(usex qt5 '' --disable-qt)
)
else
@@ -475,12 +476,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
diff --git a/app-emulation/virtualbox/virtualbox-6.1.36.ebuild b/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
index 19b363fc34f3..db6bcc8ca893 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36.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
@@ -285,6 +285,7 @@ src_configure() {
if ! use headless ; then
myconf+=(
$(usex opengl '' --disable-opengl)
+ $(usex sdl '' --disable-sdl)
$(usex qt5 '' --disable-qt)
)
else
@@ -480,12 +481,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