From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E58F9138334 for ; Sat, 17 Nov 2018 11:55:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78BDBE0A4A; Sat, 17 Nov 2018 11:55:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3558EE0A4A for ; Sat, 17 Nov 2018 11:55:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E207B335C38 for ; Sat, 17 Nov 2018 11:55:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DF33455 for ; Sat, 17 Nov 2018 11:55:02 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1542455691.40432bd2a3ccbb98c1ae1db51ef04cd5be304e19.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/files/virtualbox-6.0.0_beta2-no_libopus.patch app-emulation/virtualbox/virtualbox-6.0.0_beta2.ebuild X-VCS-Directories: app-emulation/virtualbox/files/ app-emulation/virtualbox/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 40432bd2a3ccbb98c1ae1db51ef04cd5be304e19 X-VCS-Branch: master Date: Sat, 17 Nov 2018 11:55:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7982fc73-7565-40d6-ab37-ef7ab33d94c5 X-Archives-Hash: d8cd2ff6e08707dffe0ef4719d973f51 commit: 40432bd2a3ccbb98c1ae1db51ef04cd5be304e19 Author: Lars Wendler gentoo org> AuthorDate: Sat Nov 17 11:48:10 2018 +0000 Commit: Lars Wendler gentoo 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 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 &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() {