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 3BB9E138350 for ; Thu, 13 Feb 2020 14:52:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AAF3E08C3; Thu, 13 Feb 2020 14:52:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 24467E08C3 for ; Thu, 13 Feb 2020 14:52:43 +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 3F20F34ED66 for ; Thu, 13 Feb 2020 14:52:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C348213A for ; Thu, 13 Feb 2020 14:52:39 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1581605391.94f34294e652cc99f47692a8c07a940005d82629.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox-bin/firefox-bin-68.5.0.ebuild www-client/firefox-bin/firefox-bin-73.0.ebuild X-VCS-Directories: www-client/firefox-bin/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 94f34294e652cc99f47692a8c07a940005d82629 X-VCS-Branch: master Date: Thu, 13 Feb 2020 14:52:39 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 601fc69a-fc49-453d-a8ad-709599f3c23e X-Archives-Hash: b10ef33b1429bcfe56a5c4cfc95fe4cc commit: 94f34294e652cc99f47692a8c07a940005d82629 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Feb 13 14:43:54 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Feb 13 14:49:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f34294 www-client/firefox-bin: add alsa support Thanks-to: Vitaly Zdanevich ya.ru> Closes: https://github.com/gentoo/gentoo/pull/14278 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Thomas Deutschmann gentoo.org> www-client/firefox-bin/firefox-bin-68.5.0.ebuild | 25 ++++++++++++++++++++---- www-client/firefox-bin/firefox-bin-73.0.ebuild | 25 ++++++++++++++++++++---- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/www-client/firefox-bin/firefox-bin-68.5.0.ebuild b/www-client/firefox-bin/firefox-bin-68.5.0.ebuild index a4bbc525473..030cfc8b6b1 100644 --- a/www-client/firefox-bin/firefox-bin-68.5.0.ebuild +++ b/www-client/firefox-bin/firefox-bin-68.5.0.ebuild @@ -35,9 +35,14 @@ RESTRICT="strip mirror" KEYWORDS="-* amd64 x86" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="+ffmpeg +pulseaudio selinux startup-notification" - -DEPEND="app-arch/unzip" +IUSE="alsa +ffmpeg +pulseaudio selinux startup-notification" +REQUIRED_USE="alsa? ( !pulseaudio )" + +DEPEND="app-arch/unzip + alsa? ( + dev-util/patchelf + media-sound/apulse + )" RDEPEND="dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 @@ -129,6 +134,11 @@ src_install() { MOZ_INSTALL_L10N_XPIFILE="1" \ mozlinguas_src_install + if use alsa ; then + local apulselib="/usr/$(get_libdir)/apulse" + patchelf --set-rpath "${apulselib}" "${ED}"${MOZILLA_FIVE_HOME}/libxul.so || die + fi + # Create /usr/bin/firefox-bin dodir /usr/bin/ local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "") @@ -162,7 +172,14 @@ pkg_postinst() { einfo fi use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed" - use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed" + + local HAS_AUDIO=0 + use pulseaudio && HAS_AUDIO=1 + use alsa && HAS_AUDIO=1 + + if [[ ${HAS_AUDIO} -eq 0 ]] ; then + ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!" + fi # Update mimedb for the new .desktop file xdg_desktop_database_update diff --git a/www-client/firefox-bin/firefox-bin-73.0.ebuild b/www-client/firefox-bin/firefox-bin-73.0.ebuild index 1f61fc71c8b..b83288b7f7e 100644 --- a/www-client/firefox-bin/firefox-bin-73.0.ebuild +++ b/www-client/firefox-bin/firefox-bin-73.0.ebuild @@ -35,9 +35,14 @@ RESTRICT="strip mirror" KEYWORDS="-* amd64 x86" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="+ffmpeg +pulseaudio selinux startup-notification" - -DEPEND="app-arch/unzip" +IUSE="alsa +ffmpeg +pulseaudio selinux startup-notification" +REQUIRED_USE="alsa? ( !pulseaudio )" + +DEPEND="app-arch/unzip + alsa? ( + dev-util/patchelf + media-sound/apulse + )" RDEPEND="dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 @@ -129,6 +134,11 @@ src_install() { MOZ_INSTALL_L10N_XPIFILE="1" \ mozlinguas_src_install + if use alsa ; then + local apulselib="/usr/$(get_libdir)/apulse" + patchelf --set-rpath "${apulselib}" "${ED}"${MOZILLA_FIVE_HOME}/libxul.so || die + fi + # Create /usr/bin/firefox-bin dodir /usr/bin/ local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "") @@ -167,7 +177,14 @@ pkg_postinst() { fi use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed" - use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed" + + local HAS_AUDIO=0 + use pulseaudio && HAS_AUDIO=1 + use alsa && HAS_AUDIO=1 + + 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