1 |
commit: 19e2bb19b7e61a15fcf2b840ac5e7520cc282fc3 |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 29 16:45:58 2017 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 29 16:48:06 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e2bb19 |
7 |
|
8 |
www-client/firefox: improve and unify apulse support |
9 |
|
10 |
Create relative symlinks to a defined set of apulse libs instead of |
11 |
iterating over what libraries are installed on disk and using absolute |
12 |
symlinks. Also sync the code between 52.1 and 53.0 ebuilds |
13 |
|
14 |
Bug: http://bugs.gentoo.org/613980 |
15 |
|
16 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
17 |
|
18 |
.../{firefox-52.1.0.ebuild => firefox-52.1.0-r1.ebuild} | 12 +++++++++--- |
19 |
www-client/firefox/firefox-53.0.ebuild | 8 ++++---- |
20 |
2 files changed, 13 insertions(+), 7 deletions(-) |
21 |
|
22 |
diff --git a/www-client/firefox/firefox-52.1.0.ebuild b/www-client/firefox/firefox-52.1.0-r1.ebuild |
23 |
similarity index 96% |
24 |
rename from www-client/firefox/firefox-52.1.0.ebuild |
25 |
rename to www-client/firefox/firefox-52.1.0-r1.ebuild |
26 |
index e8629299762..91b2a431871 100644 |
27 |
--- a/www-client/firefox/firefox-52.1.0.ebuild |
28 |
+++ b/www-client/firefox/firefox-52.1.0-r1.ebuild |
29 |
@@ -366,15 +366,15 @@ pkg_preinst() { |
30 |
|
31 |
# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse |
32 |
# doesn't need to be forced into the LD_LIBRARY_PATH |
33 |
- if use pulseaudio && [ -d "${EROOT}"usr/$(get_libdir)/apulse ] ; then |
34 |
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then |
35 |
einfo "APULSE found - Generating library symlinks for sound support" |
36 |
local lib |
37 |
pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die |
38 |
- for lib in "${EROOT}"usr/$(get_libdir)/apulse/libpulse* ; do |
39 |
+ for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do |
40 |
# a quickpkg rolled by hand will grab symlinks as part of the package, |
41 |
# so we need to avoid creating them if they already exist. |
42 |
if ! [ -L ${lib##*/} ]; then |
43 |
- ln -s "${lib}" || die |
44 |
+ ln -s "${lib}" ${lib##*/} || die |
45 |
fi |
46 |
done |
47 |
popd &>/dev/null || die |
48 |
@@ -392,6 +392,12 @@ pkg_postinst() { |
49 |
local plugin |
50 |
for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done |
51 |
fi |
52 |
+ |
53 |
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then |
54 |
+ elog "Apulse was detected at merge time on this system and so it will always be" |
55 |
+ elog "used for sound. If you wish to use pulseaudio instead please unmerge" |
56 |
+ elog "media-sound/apulse." |
57 |
+ fi |
58 |
} |
59 |
|
60 |
pkg_postrm() { |
61 |
|
62 |
diff --git a/www-client/firefox/firefox-53.0.ebuild b/www-client/firefox/firefox-53.0.ebuild |
63 |
index 16e714db907..a911896f0de 100644 |
64 |
--- a/www-client/firefox/firefox-53.0.ebuild |
65 |
+++ b/www-client/firefox/firefox-53.0.ebuild |
66 |
@@ -371,15 +371,15 @@ pkg_preinst() { |
67 |
|
68 |
# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse |
69 |
# doesn't need to be forced into the LD_LIBRARY_PATH |
70 |
- if use pulseaudio && [ -d "${EPREFIX}"/usr/$(get_libdir)/apulse ] ; then |
71 |
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then |
72 |
einfo "APULSE found - Generating library symlinks for sound support" |
73 |
local lib |
74 |
pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die |
75 |
- for lib in "${EPREFIX}"/usr/$(get_libdir)/apulse/libpulse* ; do |
76 |
+ for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do |
77 |
# a quickpkg rolled by hand will grab symlinks as part of the package, |
78 |
# so we need to avoid creating them if they already exist. |
79 |
if ! [ -L ${lib##*/} ]; then |
80 |
- ln -s "${lib}" || die |
81 |
+ ln -s "${lib}" ${lib##*/} || die |
82 |
fi |
83 |
done |
84 |
popd &>/dev/null || die |
85 |
@@ -398,7 +398,7 @@ pkg_postinst() { |
86 |
for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done |
87 |
fi |
88 |
|
89 |
- if use pulseaudio && [ -d "${EPREFIX}"/usr/$(get_libdir)/apulse ]; then |
90 |
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then |
91 |
elog "Apulse was detected at merge time on this system and so it will always be" |
92 |
elog "used for sound. If you wish to use pulseaudio instead please unmerge" |
93 |
elog "media-sound/apulse." |