| 1 |
commit: 27dfc5592208b407bbaf26cbc780bfae5294c001 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 12 21:09:22 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 14 02:19:04 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27dfc559 |
| 7 |
|
| 8 |
www-client/firefox-bin: add apulse compatibility to wrapper and some use-flags |
| 9 |
|
| 10 |
Added ffmpeg and pulseaudio to IUSE, default-enabled, to be (A) compatible with |
| 11 |
www-client/firefox and (B) ensure dependencies for this functionality is brought |
| 12 |
in and retained without @world entries required. It's a binary package so the |
| 13 |
hit is minimal to be dealing with optional runtime-only deps with use flags. |
| 14 |
|
| 15 |
Also added apulse to the LD_LIBRARY_PATH so that it will be used to provide |
| 16 |
audio support when it is installed. |
| 17 |
|
| 18 |
Bug: http://bugs.gentoo.org/615000 |
| 19 |
|
| 20 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 21 |
|
| 22 |
...n-52.0.1.ebuild => firefox-bin-52.0.1-r1.ebuild} | 21 ++++++++------------- |
| 23 |
1 file changed, 8 insertions(+), 13 deletions(-) |
| 24 |
|
| 25 |
diff --git a/www-client/firefox-bin/firefox-bin-52.0.1.ebuild b/www-client/firefox-bin/firefox-bin-52.0.1-r1.ebuild |
| 26 |
similarity index 91% |
| 27 |
rename from www-client/firefox-bin/firefox-bin-52.0.1.ebuild |
| 28 |
rename to www-client/firefox-bin/firefox-bin-52.0.1-r1.ebuild |
| 29 |
index 5a15b94ea04..138b3285c87 100644 |
| 30 |
--- a/www-client/firefox-bin/firefox-bin-52.0.1.ebuild |
| 31 |
+++ b/www-client/firefox-bin/firefox-bin-52.0.1-r1.ebuild |
| 32 |
@@ -31,14 +31,13 @@ RESTRICT="strip mirror" |
| 33 |
KEYWORDS="-* ~amd64 ~x86" |
| 34 |
SLOT="0" |
| 35 |
LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |
| 36 |
-IUSE="selinux startup-notification" |
| 37 |
+IUSE="+ffmpeg +pulseaudio selinux startup-notification" |
| 38 |
|
| 39 |
DEPEND="app-arch/unzip" |
| 40 |
RDEPEND="dev-libs/atk |
| 41 |
>=sys-apps/dbus-0.60 |
| 42 |
>=dev-libs/dbus-glib-0.72 |
| 43 |
>=dev-libs/glib-2.26:2 |
| 44 |
- >=media-libs/alsa-lib-1.0.16 |
| 45 |
media-libs/fontconfig |
| 46 |
>=media-libs/freetype-2.4.10 |
| 47 |
>=x11-libs/cairo-1.10[X] |
| 48 |
@@ -54,6 +53,9 @@ RDEPEND="dev-libs/atk |
| 49 |
x11-libs/libXt |
| 50 |
>=x11-libs/pango-1.22.0 |
| 51 |
virtual/freedesktop-icon-theme |
| 52 |
+ pulseaudio? ( || ( media-sound/pulseaudio |
| 53 |
+ >=media-sound/apulse-0.1.9 ) ) |
| 54 |
+ ffmpeg? ( media-video/ffmpeg ) |
| 55 |
selinux? ( sec-policy/selinux-mozilla ) |
| 56 |
" |
| 57 |
|
| 58 |
@@ -132,8 +134,8 @@ src_install() { |
| 59 |
cat <<-EOF >"${ED}"usr/bin/${PN} |
| 60 |
#!/bin/sh |
| 61 |
unset LD_PRELOAD |
| 62 |
- LD_LIBRARY_PATH="/opt/firefox/" |
| 63 |
- GTK_PATH=/usr/lib/gtk-2.0/ |
| 64 |
+ LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse:/opt/firefox/" \\ |
| 65 |
+ GTK_PATH=/usr/lib/gtk-3.0/ \\ |
| 66 |
exec /opt/${MOZ_PN}/${MOZ_PN} "\$@" |
| 67 |
EOF |
| 68 |
fperms 0755 /usr/bin/${PN} |
| 69 |
@@ -162,15 +164,8 @@ pkg_postinst() { |
| 70 |
einfo "gnome-base/orbit and net-misc/curl emerged." |
| 71 |
einfo |
| 72 |
fi |
| 73 |
- einfo "For HTML5 video you need media-video/ffmpeg installed." |
| 74 |
- |
| 75 |
- # Drop requirement of curl not built with nss as it's not necessary anymore |
| 76 |
- #if has_version 'net-misc/curl[nss]'; then |
| 77 |
- # einfo |
| 78 |
- # einfo "Crashreporter won't be able to send reports" |
| 79 |
- # einfo "if you have curl emerged with the nss USE-flag" |
| 80 |
- # einfo |
| 81 |
- #fi |
| 82 |
+ use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed" |
| 83 |
+ use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without apulse or pulseaudio installed" |
| 84 |
|
| 85 |
# Update mimedb for the new .desktop file |
| 86 |
fdo-mime_desktop_database_update |
Archives