| 1 |
commit: cc0c2ad02c35cda18d8cb38f9a05926e134f49ee |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 5 16:47:04 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 5 16:47:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0c2ad0 |
| 7 |
|
| 8 |
www-client/firefox-bin: fix USE=alsa |
| 9 |
|
| 10 |
Fixes: 1fcbfb9 ("www-client/firefox-bin: drop BDEPEND on dev-util/patchelf") |
| 11 |
Bug: https://bugs.gentoo.org/746500 |
| 12 |
Closes: https://bugs.gentoo.org/746626 |
| 13 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 14 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 15 |
|
| 16 |
...efox-bin-78.3.1.ebuild => firefox-bin-78.3.1-r1.ebuild} | 14 +++++++++++++- |
| 17 |
...efox-bin-81.0.1.ebuild => firefox-bin-81.0.1-r1.ebuild} | 14 +++++++++++++- |
| 18 |
2 files changed, 26 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-client/firefox-bin/firefox-bin-78.3.1.ebuild b/www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild |
| 21 |
similarity index 97% |
| 22 |
rename from www-client/firefox-bin/firefox-bin-78.3.1.ebuild |
| 23 |
rename to www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild |
| 24 |
index 7c46bdb0310..d95da6f4e1a 100644 |
| 25 |
--- a/www-client/firefox-bin/firefox-bin-78.3.1.ebuild |
| 26 |
+++ b/www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild |
| 27 |
@@ -35,7 +35,12 @@ IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland" |
| 28 |
|
| 29 |
RESTRICT="strip" |
| 30 |
|
| 31 |
-BDEPEND="app-arch/unzip" |
| 32 |
+BDEPEND="app-arch/unzip |
| 33 |
+ alsa? ( |
| 34 |
+ !pulseaudio? ( |
| 35 |
+ dev-util/patchelf |
| 36 |
+ ) |
| 37 |
+ )" |
| 38 |
|
| 39 |
CDEPEND="alsa? ( |
| 40 |
!pulseaudio? ( |
| 41 |
@@ -185,6 +190,13 @@ src_install() { |
| 42 |
"${MOZILLA_FIVE_HOME}"/firefox-bin \ |
| 43 |
"${MOZILLA_FIVE_HOME}"/plugin-container |
| 44 |
|
| 45 |
+ # Patch alsa support |
| 46 |
+ local apulselib= |
| 47 |
+ if use alsa && ! use pulseaudio ; then |
| 48 |
+ apulselib="${EPREFIX}/usr/$(get_libdir)/apulse" |
| 49 |
+ patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die |
| 50 |
+ fi |
| 51 |
+ |
| 52 |
# Install policy (currently only used to disable application updates) |
| 53 |
insinto "${MOZILLA_FIVE_HOME}/distribution" |
| 54 |
newins "${FILESDIR}"/disable-auto-update.policy.json policies.json |
| 55 |
|
| 56 |
diff --git a/www-client/firefox-bin/firefox-bin-81.0.1.ebuild b/www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild |
| 57 |
similarity index 97% |
| 58 |
rename from www-client/firefox-bin/firefox-bin-81.0.1.ebuild |
| 59 |
rename to www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild |
| 60 |
index 78c15285fb3..6f6355a74f0 100644 |
| 61 |
--- a/www-client/firefox-bin/firefox-bin-81.0.1.ebuild |
| 62 |
+++ b/www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild |
| 63 |
@@ -35,7 +35,12 @@ IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland" |
| 64 |
|
| 65 |
RESTRICT="strip" |
| 66 |
|
| 67 |
-BDEPEND="app-arch/unzip" |
| 68 |
+BDEPEND="app-arch/unzip |
| 69 |
+ alsa? ( |
| 70 |
+ !pulseaudio? ( |
| 71 |
+ dev-util/patchelf |
| 72 |
+ ) |
| 73 |
+ )" |
| 74 |
|
| 75 |
CDEPEND="alsa? ( |
| 76 |
!pulseaudio? ( |
| 77 |
@@ -185,6 +190,13 @@ src_install() { |
| 78 |
"${MOZILLA_FIVE_HOME}"/firefox-bin \ |
| 79 |
"${MOZILLA_FIVE_HOME}"/plugin-container |
| 80 |
|
| 81 |
+ # Patch alsa support |
| 82 |
+ local apulselib= |
| 83 |
+ if use alsa && ! use pulseaudio ; then |
| 84 |
+ apulselib="${EPREFIX}/usr/$(get_libdir)/apulse" |
| 85 |
+ patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
# Install policy (currently only used to disable application updates) |
| 89 |
insinto "${MOZILLA_FIVE_HOME}/distribution" |
| 90 |
newins "${FILESDIR}"/disable-auto-update.policy.json policies.json |
Archives