[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     40432bd2a3ccbb98c1ae1db51ef04cd5be304e19
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 11:48:10 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 11:54:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40432bd2

app-emulation/virtualbox: Fixed build with USE="-opus"

Closes: https://bugs.gentoo.org/671280
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/virtualbox-6.0.0_beta2-no_libopus.patch  | 39 ++++++++++++++++++++++
 .../virtualbox/virtualbox-6.0.0_beta2.ebuild       | 12 +++++--
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/app-emulation/virtualbox/files/virtualbox-6.0.0_beta2-no_libopus.patch b/app-emulation/virtualbox/files/virtualbox-6.0.0_beta2-no_libopus.patch
new file mode 100644
index 00000000000..ccf3f2acceb
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.0.0_beta2-no_libopus.patch
@@ -0,0 +1,39 @@
+--- VirtualBox-6.0.0_BETA2/src/VBox/Main/include/ConsoleImpl.h
++++ VirtualBox-6.0.0_BETA2/src/VBox/Main/include/ConsoleImpl.h
+@@ -147,9 +147,13 @@
+     int i_recordingGetSettings(settings::RecordingSettings &Settings);
+     int i_recordingStart(void);
+     int i_recordingStop(void);
++# ifdef VBOX_WITH_AUDIO_RECORDING
+     AudioVideoRec *i_recordingGetAudioDrv(void) const { return Recording.mAudioRec; }
++# endif
+     RecordingContext *i_recordingGetContext(void) const { return Recording.mpCtx; }
++# ifdef VBOX_WITH_AUDIO_RECORDING
+     HRESULT i_recordingSendAudio(const void *pvData, size_t cbData, uint64_t uDurationMs);
++# endif
+ #endif
+ 
+     const ComPtr<IMachine> &i_machine() const { return mMachine; }
+@@ -1038,7 +1042,10 @@
+     {
+         Recording()
+             : mpCtx(NULL)
+-            , mAudioRec(NULL) { }
++# ifdef VBOX_WITH_AUDIO_RECORDING
++            , mAudioRec(NULL)
++# endif
++        { }
+ 
+         /** The recording context. */
+         RecordingContext       *mpCtx;
+--- VirtualBox-6.0.0_BETA2/src/VBox/Main/src-client/Recording.cpp
++++ VirtualBox-6.0.0_BETA2/src/VBox/Main/src-client/Recording.cpp
+@@ -587,7 +587,7 @@
+ 
+     return rc;
+ #else
+-    RT_NOREF(pCtx, pvData, cbData, uTimeStampMs);
++    RT_NOREF(pvData, cbData, uTimeStampMs);
+     return VINF_SUCCESS;
+ #endif
+ }

diff --git a/app-emulation/virtualbox/virtualbox-6.0.0_beta2.ebuild b/app-emulation/virtualbox/virtualbox-6.0.0_beta2.ebuild
index b334d69c98a..0b6ff09dd2f 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.0_beta2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.0_beta2.ebuild
@@ -29,10 +29,11 @@ RDEPEND="!app-emulation/virtualbox-bin
 	dev-libs/libxml2
 	media-libs/libpng:0=
 	media-libs/libvpx:0=
-	sys-libs/zlib
+	sys-libs/zlib:=
 	!headless? (
 		media-libs/libsdl:0[X,video]
 		x11-libs/libX11
+		x11-libs/libxcb:=
 		x11-libs/libXcursor
 		x11-libs/libXext
 		x11-libs/libXmu
@@ -195,9 +196,16 @@ src_prepare() {
 
 	eapply "${WORKDIR}/patches"
 
+	eapply "${FILESDIR}"/${P}-no_libopus.patch
+
 	eapply_user
 }
 
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
 src_configure() {
 	local myconf=(
 		--with-gcc="$(tc-getCC)"
@@ -230,7 +238,7 @@ src_configure() {
 		myconf+=( --disable-vmmraw )
 	fi
 	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
+	doecho ./configure ${myconf[@]}
 }
 
 src_compile() {