Lines 25-31
Link Here
|
25 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
25 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
26 |
SLOT="0" |
26 |
SLOT="0" |
27 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
27 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
28 |
IUSE="+alsa bindist java libnotify wifi" |
28 |
IUSE="+alsa bindist java libnotify oss wifi" |
29 |
|
29 |
|
30 |
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" |
30 |
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" |
31 |
SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 |
31 |
SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 |
Lines 101-106
Link Here
|
101 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
101 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
102 |
fi |
102 |
fi |
103 |
|
103 |
|
|
|
104 |
if use alsa && use oss ; then |
105 |
einfo |
106 |
ewarn "You have enabled both the \"alsa\" as well as the \"oss\" USE flags. It" |
107 |
ewarn "is not possible to build mozilla-firefox or xulrunner with support for" |
108 |
ewarn "both. ALSA will be used in this case. If you want OSS support, unset the" |
109 |
ewarn "\"alsa\" USE flag and leave only \"oss\" set." |
110 |
fi |
111 |
|
104 |
java-pkg-opt-2_pkg_setup |
112 |
java-pkg-opt-2_pkg_setup |
105 |
} |
113 |
} |
106 |
|
114 |
|
Lines 123-128
Link Here
|
123 |
# Fix media build failure |
131 |
# Fix media build failure |
124 |
epatch "${FILESDIR}/xulrunner-1.9.2-noalsa-fixup.patch" |
132 |
epatch "${FILESDIR}/xulrunner-1.9.2-noalsa-fixup.patch" |
125 |
|
133 |
|
|
|
134 |
# Switch from ALSA to OSS |
135 |
if use oss && ! use alsa; then |
136 |
ebegin "Switching from ALSA to Open Sound System" |
137 |
sed -i 's/sydney_audio_alsa/sydney_audio_oss/' \ |
138 |
media/libsydneyaudio/src/Makefile.in || die "sed failed!" \ |
139 |
&& sed -i '/alsa\//d' config/system-headers || die "sed failed!" \ |
140 |
&& sed -i '/alsa\//d' \ |
141 |
js/src/config/system-headers || die "sed failed!" \ |
142 |
&& sed -i '/LIB(asound/d' configure.in || die "sed failed!" |
143 |
eend $? |
144 |
fi |
145 |
|
126 |
eautoreconf |
146 |
eautoreconf |
127 |
|
147 |
|
128 |
cd js/src |
148 |
cd js/src |
Lines 183-197
Link Here
|
183 |
mozconfig_use_enable libnotify |
203 |
mozconfig_use_enable libnotify |
184 |
mozconfig_use_enable java javaxpcom |
204 |
mozconfig_use_enable java javaxpcom |
185 |
mozconfig_use_enable wifi necko-wifi |
205 |
mozconfig_use_enable wifi necko-wifi |
186 |
mozconfig_use_enable alsa ogg |
|
|
187 |
mozconfig_use_enable alsa wave |
188 |
|
206 |
|
189 |
# Other ff-specific settings |
207 |
# Other ff-specific settings |
190 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
208 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
191 |
|
209 |
|
192 |
# Enable/Disable audio in firefox |
210 |
# Enable/Disable audio in firefox |
193 |
mozconfig_use_enable alsa ogg |
211 |
if use alsa || use oss ; then |
194 |
mozconfig_use_enable alsa wave |
212 |
mozconfig_annotate '' --enable-ogg |
|
|
213 |
mozconfig_annotate '' --enable-wave |
214 |
fi |
195 |
|
215 |
|
196 |
if ! use bindist ; then |
216 |
if ! use bindist ; then |
197 |
mozconfig_annotate '' --enable-official-branding |
217 |
mozconfig_annotate '' --enable-official-branding |