| 1 |
commit: 40432bd2a3ccbb98c1ae1db51ef04cd5be304e19 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 17 11:48:10 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 17 11:54:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40432bd2 |
| 7 |
|
| 8 |
app-emulation/virtualbox: Fixed build with USE="-opus" |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/671280 |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/virtualbox-6.0.0_beta2-no_libopus.patch | 39 ++++++++++++++++++++++ |
| 15 |
.../virtualbox/virtualbox-6.0.0_beta2.ebuild | 12 +++++-- |
| 16 |
2 files changed, 49 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..ccf3f2acceb |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-emulation/virtualbox/files/virtualbox-6.0.0_beta2-no_libopus.patch |
| 23 |
@@ -0,0 +1,39 @@ |
| 24 |
+--- VirtualBox-6.0.0_BETA2/src/VBox/Main/include/ConsoleImpl.h |
| 25 |
++++ VirtualBox-6.0.0_BETA2/src/VBox/Main/include/ConsoleImpl.h |
| 26 |
+@@ -147,9 +147,13 @@ |
| 27 |
+ int i_recordingGetSettings(settings::RecordingSettings &Settings); |
| 28 |
+ int i_recordingStart(void); |
| 29 |
+ int i_recordingStop(void); |
| 30 |
++# ifdef VBOX_WITH_AUDIO_RECORDING |
| 31 |
+ AudioVideoRec *i_recordingGetAudioDrv(void) const { return Recording.mAudioRec; } |
| 32 |
++# endif |
| 33 |
+ RecordingContext *i_recordingGetContext(void) const { return Recording.mpCtx; } |
| 34 |
++# ifdef VBOX_WITH_AUDIO_RECORDING |
| 35 |
+ HRESULT i_recordingSendAudio(const void *pvData, size_t cbData, uint64_t uDurationMs); |
| 36 |
++# endif |
| 37 |
+ #endif |
| 38 |
+ |
| 39 |
+ const ComPtr<IMachine> &i_machine() const { return mMachine; } |
| 40 |
+@@ -1038,7 +1042,10 @@ |
| 41 |
+ { |
| 42 |
+ Recording() |
| 43 |
+ : mpCtx(NULL) |
| 44 |
+- , mAudioRec(NULL) { } |
| 45 |
++# ifdef VBOX_WITH_AUDIO_RECORDING |
| 46 |
++ , mAudioRec(NULL) |
| 47 |
++# endif |
| 48 |
++ { } |
| 49 |
+ |
| 50 |
+ /** The recording context. */ |
| 51 |
+ RecordingContext *mpCtx; |
| 52 |
+--- VirtualBox-6.0.0_BETA2/src/VBox/Main/src-client/Recording.cpp |
| 53 |
++++ VirtualBox-6.0.0_BETA2/src/VBox/Main/src-client/Recording.cpp |
| 54 |
+@@ -587,7 +587,7 @@ |
| 55 |
+ |
| 56 |
+ return rc; |
| 57 |
+ #else |
| 58 |
+- RT_NOREF(pCtx, pvData, cbData, uTimeStampMs); |
| 59 |
++ RT_NOREF(pvData, cbData, uTimeStampMs); |
| 60 |
+ return VINF_SUCCESS; |
| 61 |
+ #endif |
| 62 |
+ } |
| 63 |
|
| 64 |
diff --git a/app-emulation/virtualbox/virtualbox-6.0.0_beta2.ebuild b/app-emulation/virtualbox/virtualbox-6.0.0_beta2.ebuild |
| 65 |
index b334d69c98a..0b6ff09dd2f 100644 |
| 66 |
--- a/app-emulation/virtualbox/virtualbox-6.0.0_beta2.ebuild |
| 67 |
+++ b/app-emulation/virtualbox/virtualbox-6.0.0_beta2.ebuild |
| 68 |
@@ -29,10 +29,11 @@ RDEPEND="!app-emulation/virtualbox-bin |
| 69 |
dev-libs/libxml2 |
| 70 |
media-libs/libpng:0= |
| 71 |
media-libs/libvpx:0= |
| 72 |
- sys-libs/zlib |
| 73 |
+ sys-libs/zlib:= |
| 74 |
!headless? ( |
| 75 |
media-libs/libsdl:0[X,video] |
| 76 |
x11-libs/libX11 |
| 77 |
+ x11-libs/libxcb:= |
| 78 |
x11-libs/libXcursor |
| 79 |
x11-libs/libXext |
| 80 |
x11-libs/libXmu |
| 81 |
@@ -195,9 +196,16 @@ src_prepare() { |
| 82 |
|
| 83 |
eapply "${WORKDIR}/patches" |
| 84 |
|
| 85 |
+ eapply "${FILESDIR}"/${P}-no_libopus.patch |
| 86 |
+ |
| 87 |
eapply_user |
| 88 |
} |
| 89 |
|
| 90 |
+doecho() { |
| 91 |
+ echo "$@" |
| 92 |
+ "$@" || die |
| 93 |
+} |
| 94 |
+ |
| 95 |
src_configure() { |
| 96 |
local myconf=( |
| 97 |
--with-gcc="$(tc-getCC)" |
| 98 |
@@ -230,7 +238,7 @@ src_configure() { |
| 99 |
myconf+=( --disable-vmmraw ) |
| 100 |
fi |
| 101 |
# not an autoconf script |
| 102 |
- ./configure ${myconf[@]} || die "configure failed" |
| 103 |
+ doecho ./configure ${myconf[@]} |
| 104 |
} |
| 105 |
|
| 106 |
src_compile() { |
Archives