diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-10-05 18:47:04 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-10-05 18:47:19 +0200 |
| commit | cc0c2ad02c35cda18d8cb38f9a05926e134f49ee (patch) | |
| tree | 241962da720ef58e9de5cc62bde0b1e58b336794 /www-client/firefox-bin | |
| parent | mail-client/thunderbird-bin: fix USE=alsa (diff) | |
| download | gentoo-cc0c2ad02c35cda18d8cb38f9a05926e134f49ee.tar.gz gentoo-cc0c2ad02c35cda18d8cb38f9a05926e134f49ee.tar.bz2 gentoo-cc0c2ad02c35cda18d8cb38f9a05926e134f49ee.zip | |
www-client/firefox-bin: fix USE=alsa
Fixes: 1fcbfb9 ("www-client/firefox-bin: drop BDEPEND on dev-util/patchelf")
Bug: https://bugs.gentoo.org/746500
Closes: https://bugs.gentoo.org/746626
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'www-client/firefox-bin')
| -rw-r--r-- | www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild (renamed from www-client/firefox-bin/firefox-bin-78.3.1.ebuild) | 14 | ||||
| -rw-r--r-- | www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild (renamed from www-client/firefox-bin/firefox-bin-81.0.1.ebuild) | 14 |
2 files changed, 26 insertions, 2 deletions
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 index 7c46bdb03106..d95da6f4e1ac 100644 --- a/www-client/firefox-bin/firefox-bin-78.3.1.ebuild +++ b/www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild @@ -35,7 +35,12 @@ IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland" RESTRICT="strip" -BDEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip + alsa? ( + !pulseaudio? ( + dev-util/patchelf + ) + )" CDEPEND="alsa? ( !pulseaudio? ( @@ -185,6 +190,13 @@ src_install() { "${MOZILLA_FIVE_HOME}"/firefox-bin \ "${MOZILLA_FIVE_HOME}"/plugin-container + # Patch alsa support + local apulselib= + if use alsa && ! use pulseaudio ; then + apulselib="${EPREFIX}/usr/$(get_libdir)/apulse" + patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die + fi + # Install policy (currently only used to disable application updates) insinto "${MOZILLA_FIVE_HOME}/distribution" newins "${FILESDIR}"/disable-auto-update.policy.json policies.json 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 index 78c15285fb38..6f6355a74f05 100644 --- a/www-client/firefox-bin/firefox-bin-81.0.1.ebuild +++ b/www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild @@ -35,7 +35,12 @@ IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland" RESTRICT="strip" -BDEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip + alsa? ( + !pulseaudio? ( + dev-util/patchelf + ) + )" CDEPEND="alsa? ( !pulseaudio? ( @@ -185,6 +190,13 @@ src_install() { "${MOZILLA_FIVE_HOME}"/firefox-bin \ "${MOZILLA_FIVE_HOME}"/plugin-container + # Patch alsa support + local apulselib= + if use alsa && ! use pulseaudio ; then + apulselib="${EPREFIX}/usr/$(get_libdir)/apulse" + patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die + fi + # Install policy (currently only used to disable application updates) insinto "${MOZILLA_FIVE_HOME}/distribution" newins "${FILESDIR}"/disable-auto-update.policy.json policies.json |