зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1452509 - Move --enable-pulseaudio to moz.configure. r=froydnj
MozReview-Commit-ID: J1fJUukDJXh --HG-- extra : rebase_source : c582a589b767d199413e77c7c237d4402599179f
This commit is contained in:
Родитель
efa1be2618
Коммит
6a8b9ac6f9
|
@ -205,7 +205,6 @@ def old_configure_options(*options):
|
|||
'--enable-pie',
|
||||
'--enable-posix-nspr-emulation',
|
||||
'--enable-pref-extensions',
|
||||
'--enable-pulseaudio',
|
||||
'--enable-raw',
|
||||
'--enable-readline',
|
||||
'--enable-reflow-perf',
|
||||
|
|
|
@ -2599,33 +2599,6 @@ MOZ_WEBM_ENCODER=1
|
|||
AC_DEFINE(MOZ_WEBM_ENCODER)
|
||||
AC_SUBST(MOZ_WEBM_ENCODER)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Disable PulseAudio
|
||||
dnl ========================================================
|
||||
|
||||
dnl If using Desktop Linux, ensure that the PA library is available
|
||||
case "$OS_TARGET" in
|
||||
WINNT|Darwin|Android|OpenBSD)
|
||||
;;
|
||||
*)
|
||||
MOZ_PULSEAUDIO=1
|
||||
;;
|
||||
esac
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(pulseaudio,
|
||||
[ --disable-pulseaudio Disable PulseAudio support],
|
||||
MOZ_PULSEAUDIO=,
|
||||
MOZ_PULSEAUDIO=1)
|
||||
|
||||
if test -n "$MOZ_PULSEAUDIO"; then
|
||||
AC_DEFINE(MOZ_PULSEAUDIO)
|
||||
PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
|
||||
[echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
|
||||
AC_MSG_ERROR([pulseaudio audio backend requires libpulse development package])])
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_PULSEAUDIO)
|
||||
|
||||
dnl ========================================================
|
||||
dnl NegotiateAuth
|
||||
dnl ========================================================
|
||||
|
|
|
@ -75,6 +75,20 @@ jack = pkg_check_modules('MOZ_JACK', 'jack', when='--enable-jack')
|
|||
set_config('MOZ_JACK', depends_if(jack)(lambda _: True))
|
||||
set_define('MOZ_JACK', depends_if(jack)(lambda _: True))
|
||||
|
||||
# PulseAudio cubeb backend
|
||||
# ==============================================================
|
||||
@depends(target)
|
||||
def pulseaudio_default(target):
|
||||
return target.os not in ('WINNT', 'OSX', 'iOS', 'Android', 'OpenBSD')
|
||||
|
||||
option('--enable-pulseaudio', env='MOZ_PULSEAUDIO', default=pulseaudio_default,
|
||||
help='Enable PulseAudio audio backend.')
|
||||
|
||||
pulseaudio = pkg_check_modules('MOZ_PULSEAUDIO', 'libpulse', when='--enable-pulseaudio')
|
||||
|
||||
set_config('MOZ_PULSEAUDIO', depends_if(pulseaudio)(lambda _: True))
|
||||
set_define('MOZ_PULSEAUDIO', depends_if(pulseaudio)(lambda _: True))
|
||||
|
||||
# Javascript engine
|
||||
# ==============================================================
|
||||
include('../js/moz.configure')
|
||||
|
|
Загрузка…
Ссылка в новой задаче