commit: a394973cbb5fbacd2699cc49b13a57505c419f2b Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Wed Mar 9 13:03:18 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Mar 9 17:19:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a394973c
www-client/firefox-bin: alsa-lib is an unconditional dep - +alsa -pulseaudio should still pull apulse normally, -alsa -pulseaudio won't pull any sound daemons, but alsa-lib is now a mandatory requirement nevertheless. Closes: https://bugs.gentoo.org/834757 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ...x-bin-98.0.ebuild => firefox-bin-98.0-r1.ebuild} | 14 ++++---------- www-client/firefox-bin/metadata.xml | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/www-client/firefox-bin/firefox-bin-98.0.ebuild b/www-client/firefox-bin/firefox-bin-98.0-r1.ebuild similarity index 97% rename from www-client/firefox-bin/firefox-bin-98.0.ebuild rename to www-client/firefox-bin/firefox-bin-98.0-r1.ebuild index 95692d298f34..c13f8dd287c9 100644 --- a/www-client/firefox-bin/firefox-bin-98.0.ebuild +++ b/www-client/firefox-bin/firefox-bin-98.0-r1.ebuild @@ -64,6 +64,7 @@ RDEPEND="${COMMON_DEPEND} dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 + media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus @@ -83,7 +84,9 @@ RDEPEND="${COMMON_DEPEND} x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 - alsa? ( media-libs/alsa-lib ) + alsa? ( + !pulseaudio? ( media-sound/apulse ) + ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla ) @@ -326,15 +329,6 @@ pkg_postinst() { use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed" - local HAS_AUDIO=0 - if use alsa || use pulseaudio; then - HAS_AUDIO=1 - fi - - if [[ ${HAS_AUDIO} -eq 0 ]] ; then - ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!" - fi - local show_doh_information show_normandy_information show_shortcut_information if [[ -z "${REPLACING_VERSIONS}" ]] ; then diff --git a/www-client/firefox-bin/metadata.xml b/www-client/firefox-bin/metadata.xml index 5decd3397e64..122788d55f43 100644 --- a/www-client/firefox-bin/metadata.xml +++ b/www-client/firefox-bin/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Mozilla Team</name> - </maintainer> - <use> - <flag name="gmp-autoupdate"> - Allow Gecko Media Plugins (binary blobs) to be automatically - downloaded and kept up-to-date in user profiles - </flag> - </use> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Mozilla Team</name> + </maintainer> + <use> + <flag name="alsa">When pulseaudio isn't set, this prefers apulse</flag> + <flag name="gmp-autoupdate"> + Allow Gecko Media Plugins (binary blobs) to be automatically + downloaded and kept up-to-date in user profiles + </flag> + </use> </pkgmetadata>
