ba05efc063
- update firefox-esr and thunderbird to 17.0.6 - WEBRTC now supports PULSEAUDIO - make linux-firefox work with plugins again (e.g. quakelive) Security: 4a1ca8a4-bd82-11e2-b7a0-d43d7e0c7c02 In collaboration with: Jan Beich <jbeich@tormail.org>
126 lines
4.5 KiB
Text
126 lines
4.5 KiB
Text
diff --git configure.in configure.in
|
|
index 7cd6e17..a1dbdf7 100644
|
|
--- configure.in
|
|
+++ configure.in
|
|
@@ -9106,6 +9106,18 @@ elif test "${OS_TARGET}" = "Android"; th
|
|
fi
|
|
fi
|
|
|
|
+# Keep libcubeb and audio_device backends in sync
|
|
+if test -n "$MOZ_ALSA"; then
|
|
+ EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D include_alsa_audio=1"
|
|
+else
|
|
+ EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D include_alsa_audio=0"
|
|
+fi
|
|
+if test -n "$MOZ_PULSEAUDIO"; then
|
|
+ EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D include_pulse_audio=1"
|
|
+else
|
|
+ EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D include_pulse_audio=0"
|
|
+fi
|
|
+
|
|
# Don't try to compile sse4.1 code if toolchain doesn't support
|
|
if test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE4_1"; then
|
|
EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1"
|
|
diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
|
|
index 8457737..dfc83ff 100644
|
|
--- media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
|
|
+++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
|
|
@@ -45,11 +45,15 @@
|
|
'dummy/audio_device_utility_dummy.h',
|
|
],
|
|
'conditions': [
|
|
- ['OS=="linux"', {
|
|
+ ['include_alsa_audio==1 or include_pulse_audio==1', {
|
|
'include_dirs': [
|
|
'linux',
|
|
],
|
|
- }], # OS==linux
|
|
+ 'defines': [
|
|
+ # avoid pointless rename
|
|
+ 'WEBRTC_LINUX',
|
|
+ ],
|
|
+ }], # include_alsa_audio==1 or include_pulse_audio==1
|
|
['OS=="ios"', {
|
|
'include_dirs': [
|
|
'ios',
|
|
@@ -74,14 +78,8 @@
|
|
}],
|
|
['include_internal_audio_device==1', {
|
|
'sources': [
|
|
- 'linux/alsasymboltable_linux.cc',
|
|
- 'linux/alsasymboltable_linux.h',
|
|
- 'linux/audio_device_alsa_linux.cc',
|
|
- 'linux/audio_device_alsa_linux.h',
|
|
'linux/audio_device_utility_linux.cc',
|
|
'linux/audio_device_utility_linux.h',
|
|
- 'linux/audio_mixer_manager_alsa_linux.cc',
|
|
- 'linux/audio_mixer_manager_alsa_linux.h',
|
|
'linux/latebindingsymboltable_linux.cc',
|
|
'linux/latebindingsymboltable_linux.h',
|
|
'mac/audio_device_mac.cc',
|
|
@@ -116,28 +114,36 @@
|
|
},
|
|
}],
|
|
['OS=="linux"', {
|
|
- 'defines': [
|
|
- 'LINUX_ALSA',
|
|
- ],
|
|
'link_settings': {
|
|
'libraries': [
|
|
'-ldl',
|
|
],
|
|
},
|
|
- 'conditions': [
|
|
- ['include_pulse_audio==1', {
|
|
- 'defines': [
|
|
- 'LINUX_PULSE',
|
|
- ],
|
|
- 'sources': [
|
|
- 'linux/audio_device_pulse_linux.cc',
|
|
- 'linux/audio_device_pulse_linux.h',
|
|
- 'linux/audio_mixer_manager_pulse_linux.cc',
|
|
- 'linux/audio_mixer_manager_pulse_linux.h',
|
|
- 'linux/pulseaudiosymboltable_linux.cc',
|
|
- 'linux/pulseaudiosymboltable_linux.h',
|
|
- ],
|
|
- }],
|
|
+ }],
|
|
+ ['include_alsa_audio==1', {
|
|
+ 'defines': [
|
|
+ 'LINUX_ALSA',
|
|
+ ],
|
|
+ 'sources': [
|
|
+ 'linux/alsasymboltable_linux.cc',
|
|
+ 'linux/alsasymboltable_linux.h',
|
|
+ 'linux/audio_device_alsa_linux.cc',
|
|
+ 'linux/audio_device_alsa_linux.h',
|
|
+ 'linux/audio_mixer_manager_alsa_linux.cc',
|
|
+ 'linux/audio_mixer_manager_alsa_linux.h',
|
|
+ ],
|
|
+ }],
|
|
+ ['include_pulse_audio==1', {
|
|
+ 'defines': [
|
|
+ 'LINUX_PULSE',
|
|
+ ],
|
|
+ 'sources': [
|
|
+ 'linux/audio_device_pulse_linux.cc',
|
|
+ 'linux/audio_device_pulse_linux.h',
|
|
+ 'linux/audio_mixer_manager_pulse_linux.cc',
|
|
+ 'linux/audio_mixer_manager_pulse_linux.h',
|
|
+ 'linux/pulseaudiosymboltable_linux.cc',
|
|
+ 'linux/pulseaudiosymboltable_linux.h',
|
|
],
|
|
}],
|
|
['OS=="mac"', {
|
|
diff --git media/webrtc/webrtc_config.gypi media/webrtc/webrtc_config.gypi
|
|
index b504d3d..e2eb127 100644
|
|
--- media/webrtc/webrtc_config.gypi
|
|
+++ media/webrtc/webrtc_config.gypi
|
|
@@ -9,7 +9,6 @@
|
|
'include_internal_video_render': 0,
|
|
'clang_use_chrome_plugins': 0,
|
|
'enable_protobuf': 0,
|
|
- 'include_pulse_audio': 0,
|
|
'include_tests': 0,
|
|
'use_system_libjpeg': 1,
|
|
'use_system_libvpx': 1,
|