145 lines
4.1 KiB
Diff
145 lines
4.1 KiB
Diff
# HG changeset patch
|
|
# User Matthew Gregan <kinetik@flim.org>
|
|
# Date 1383172648 -46800
|
|
# Thu Oct 31 11:37:28 2013 +1300
|
|
# Node ID 2f6bd7da0756edaad53b601b18cf0c0e27f5f676
|
|
# Parent 0f6219c6fb61f3f5e6775d269a6cf52305021024
|
|
Bug 837563 - Enable libcubeb's PulseAudio backend. r=glandium
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -5522,65 +5522,68 @@ fi
|
|
if test -n "$MOZ_TREMOR"; then
|
|
AC_DEFINE(MOZ_TREMOR)
|
|
fi
|
|
|
|
if test -n "$MOZ_OPUS"; then
|
|
AC_DEFINE(MOZ_OPUS)
|
|
fi
|
|
|
|
-dnl ========================================================
|
|
-dnl = Check alsa availability on Linux if using sydneyaudio
|
|
-dnl ========================================================
|
|
-
|
|
-dnl If using sydneyaudio with Linux, ensure that the alsa library is available
|
|
+dnl ====================================================
|
|
+dnl = Check alsa availability on Linux if using libcubeb
|
|
+dnl ====================================================
|
|
+
|
|
+dnl If using libcubeb with Linux, ensure that the alsa library is available
|
|
if test -n "$MOZ_CUBEB" -a "$OS_TARGET" = "Linux"; then
|
|
MOZ_ALSA=1
|
|
fi
|
|
|
|
MOZ_ARG_ENABLE_BOOL(alsa,
|
|
[ --enable-alsa Enable Alsa support (default on Linux)],
|
|
-MOZ_ALSA=1,
|
|
-MOZ_ALSA=)
|
|
+ MOZ_ALSA=1,
|
|
+ MOZ_ALSA=)
|
|
|
|
if test -n "$MOZ_ALSA"; then
|
|
AC_DEFINE(MOZ_CUBEB)
|
|
PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
|
|
[echo "$MOZ_ALSA_PKG_ERRORS"
|
|
AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])])
|
|
fi
|
|
|
|
AC_SUBST(MOZ_ALSA)
|
|
AC_SUBST(MOZ_ALSA_CFLAGS)
|
|
AC_SUBST(MOZ_ALSA_LIBS)
|
|
|
|
dnl ========================================================
|
|
-dnl = Enable PulseAudio
|
|
-dnl ========================================================
|
|
-
|
|
-MOZ_ARG_ENABLE_BOOL(pulseaudio,
|
|
-[ --enable-pulseaudio Enable PulseAudio support (experimental)],
|
|
-MOZ_PULSEAUDIO=1,
|
|
-MOZ_PULSEAUDIO=)
|
|
+dnl = Disable PulseAudio
|
|
+dnl ========================================================
|
|
+
|
|
+dnl If using libcubeb with Linux, ensure that the PA library is available
|
|
+if test -n "$MOZ_CUBEB" -a "$OS_TARGET" = "Linux" -a -z "$MOZ_B2G"; then
|
|
+ MOZ_PULSEAUDIO=1
|
|
+fi
|
|
+
|
|
+MOZ_ARG_DISABLE_BOOL(pulseaudio,
|
|
+[ --disable-pulseaudio Disable PulseAudio support],
|
|
+ MOZ_PULSEAUDIO=,
|
|
+ MOZ_PULSEAUDIO=1)
|
|
|
|
if test -n "$MOZ_PULSEAUDIO"; then
|
|
AC_DEFINE(MOZ_CUBEB)
|
|
if test -z "$gonkdir"; then
|
|
PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
|
|
[echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
|
|
AC_MSG_ERROR([pulseaudio audio backend requires libpulse development package])])
|
|
else
|
|
MOZ_PULSEAUDIO_CFLAGS="-I$gonkdir/external/pulseaudio/pulseaudio/src"
|
|
- MOZ_PULSEAUDIO_LIBS="-lpulse"
|
|
fi
|
|
fi
|
|
|
|
AC_SUBST(MOZ_PULSEAUDIO)
|
|
AC_SUBST(MOZ_PULSEAUDIO_CFLAGS)
|
|
-AC_SUBST(MOZ_PULSEAUDIO_LIBS)
|
|
|
|
dnl ========================================================
|
|
dnl = Enable GStreamer
|
|
dnl ========================================================
|
|
if test "$OS_TARGET" = "Linux"; then
|
|
MOZ_GSTREAMER=1
|
|
fi
|
|
|
|
diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in
|
|
--- a/media/webrtc/signaling/test/Makefile.in
|
|
+++ b/media/webrtc/signaling/test/Makefile.in
|
|
@@ -18,21 +18,16 @@ LIBS = \
|
|
$(NULL)
|
|
|
|
ifdef MOZ_CUBEB
|
|
ifdef MOZ_ALSA
|
|
LIBS += \
|
|
$(MOZ_ALSA_LIBS) \
|
|
$(NULL)
|
|
endif
|
|
-ifdef MOZ_PULSEAUDIO
|
|
-LIBS += \
|
|
- $(MOZ_PULSEAUDIO_LIBS) \
|
|
- $(NULL)
|
|
-endif
|
|
endif
|
|
|
|
ifeq ($(OS_TARGET),Android)
|
|
LIBS += \
|
|
$(STLPORT_LDFLAGS) \
|
|
$(STLPORT_LIBS) \
|
|
$(NULL)
|
|
CPPFLAGS += \
|
|
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
|
|
--- a/toolkit/library/Makefile.in
|
|
+++ b/toolkit/library/Makefile.in
|
|
@@ -428,19 +428,16 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32
|
|
endif
|
|
endif
|
|
|
|
|
|
ifdef MOZ_CUBEB
|
|
ifdef MOZ_ALSA
|
|
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
|
|
endif
|
|
-ifdef MOZ_PULSEAUDIO
|
|
-EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
|
|
-endif
|
|
endif
|
|
|
|
ifdef HAVE_CLOCK_MONOTONIC
|
|
EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
|
|
endif
|
|
|
|
ifeq (android,$(MOZ_WIDGET_TOOLKIT))
|
|
OS_LIBS += -lGLESv2
|