Date: Tue, 26 Feb 2013 04:18:30 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1191 - in trunk: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files Message-ID: <201302260418.r1Q4IUh4065675@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Feb 26 04:18:30 2013
New Revision: 1191
Log:
(wip) allow pulseaudio with webrtc
Added:
trunk/mail/thunderbird/files/patch-bug844818
trunk/www/firefox-nightly/files/patch-bug844818
trunk/www/firefox/files/patch-bug844818
trunk/www/seamonkey/files/patch-bug844818
Modified:
trunk/mail/thunderbird/files/patch-bug807492
trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox/files/patch-bug807492
trunk/www/seamonkey/files/patch-bug807492
Modified: trunk/mail/thunderbird/files/patch-bug807492
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug807492 Sun Feb 24 04:00:04 2013 (r1190)
+++ trunk/mail/thunderbird/files/patch-bug807492 Tue Feb 26 04:18:30 2013 (r1191)
@@ -750,7 +750,7 @@
index 9ca9f7c..d5c4ab9 100644
--- mozilla/media/webrtc/trunk/src/build/common.gypi
+++ mozilla/media/webrtc/trunk/src/build/common.gypi
-@@ -101,16 +101,23 @@
+@@ -101,16 +101,21 @@
'enable_protobuf%': 1,
'include_tests%': 1,
@@ -760,10 +760,8 @@
'clang_use_chrome_plugins%': 0,
}],
+ ['OS=="linux" or OS=="solaris" or os_bsd==1', {
-+ 'include_alsa_audio%': 1,
+ 'include_v4l2_video_capture%': 1,
+ }, {
-+ 'include_alsa_audio%': 0,
+ 'include_v4l2_video_capture%': 0,
+ }],
], # conditions
@@ -803,68 +801,6 @@
'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
-diff --git media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
-index 8457737..4d0f322 100644
---- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
-+++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
-@@ -41,21 +41,25 @@
- 'audio_device_utility.h',
- 'audio_device_impl.cc',
- 'audio_device_impl.h',
- 'audio_device_config.h',
- 'dummy/audio_device_dummy.h',
- 'dummy/audio_device_utility_dummy.h',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['include_alsa_audio==1', {
- 'include_dirs': [
- 'linux',
- ],
-- }], # OS==linux
-+ 'defines': [
-+ # avoiding pointless ifdef churn
-+ 'WEBRTC_LINUX',
-+ ],
-+ }], # include_alsa_audio==1
- ['OS=="mac"', {
- 'include_dirs': [
- 'mac',
- ],
- }], # OS==mac
- ['OS=="win"', {
- 'include_dirs': [
- 'win',
-@@ -111,24 +115,26 @@
- 'link_settings': {
- 'libraries': [
- '-llog',
- '-lOpenSLES',
- ],
- },
- }],
- ['OS=="linux"', {
-- 'defines': [
-- 'LINUX_ALSA',
-- ],
- 'link_settings': {
- 'libraries': [
- '-ldl',
- ],
- },
-+ }],
-+ ['include_alsa_audio==1', {
-+ 'defines': [
-+ 'LINUX_ALSA',
-+ ],
- 'conditions': [
- ['include_pulse_audio==1', {
- 'defines': [
- 'LINUX_PULSE',
- ],
- 'sources': [
- 'linux/audio_device_pulse_linux.cc',
- 'linux/audio_device_pulse_linux.h',
diff --git media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
index 203f09a..0b0b70e 100644
--- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
Added: trunk/mail/thunderbird/files/patch-bug844818
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug844818 Tue Feb 26 04:18:30 2013 (r1191)
@@ -0,0 +1,126 @@
+diff --git configure.in configure.in
+index 7cd6e17..a1dbdf7 100644
+--- mozilla/configure.in
++++ mozilla/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/src/modules/audio_device/main/source/audio_device.gypi media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
+index 8457737..dfc83ff 100644
+--- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
++++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/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=="mac"', {
+ 'include_dirs': [
+ 'mac',
+@@ -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
+--- mozilla/media/webrtc/webrtc_config.gypi
++++ mozilla/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,
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Sun Feb 24 04:00:04 2013 (r1190)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Tue Feb 26 04:18:30 2013 (r1191)
@@ -666,7 +666,7 @@
index 9ca9f7c..d5c4ab9 100644
--- media/webrtc/trunk/webrtc/build/common.gypi
+++ media/webrtc/trunk/webrtc/build/common.gypi
-@@ -119,16 +119,23 @@
+@@ -119,16 +119,21 @@
# flood of chromium-style warnings. Investigate enabling them:
# http://code.google.com/p/webrtc/issues/detail?id=163
'clang_use_chrome_plugins%': 0,
@@ -676,10 +676,8 @@
'enable_android_opensl%': 0,
}],
+ ['OS=="linux" or OS=="solaris" or os_bsd==1', {
-+ 'include_alsa_audio%': 1,
+ 'include_v4l2_video_capture%': 1,
+ }, {
-+ 'include_alsa_audio%': 0,
+ 'include_v4l2_video_capture%': 0,
+ }],
['OS=="ios"', {
@@ -719,68 +717,6 @@
'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
-diff --git media/webrtc/trunk/src/modules/audio_device/audio_device.gypi media/webrtc/trunk/src/modules/audio_device/audio_device.gypi
-index 8457737..4d0f322 100644
---- media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
-+++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
-@@ -40,21 +40,25 @@
- 'audio_device_utility.h',
- 'audio_device_impl.cc',
- 'audio_device_impl.h',
- 'audio_device_config.h',
- 'dummy/audio_device_dummy.h',
- 'dummy/audio_device_utility_dummy.h',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['include_alsa_audio==1', {
- 'include_dirs': [
- 'linux',
- ],
-- }], # OS==linux
-+ 'defines': [
-+ # avoiding pointless ifdef churn
-+ 'WEBRTC_LINUX',
-+ ],
-+ }], # include_alsa_audio==1
- ['OS=="ios"', {
- 'include_dirs': [
- 'ios',
- ],
- }], # OS==ios
- ['OS=="mac"', {
- 'include_dirs': [
- 'mac',
-@@ -129,24 +133,26 @@
- 'sources': [
- 'android/audio_device_jni_android.cc',
- 'android/audio_device_jni_android.h',
- ],
- }],
- ],
- }],
- ['OS=="linux"', {
-- 'defines': [
-- 'LINUX_ALSA',
-- ],
- 'link_settings': {
- 'libraries': [
- '-ldl',
- ],
- },
-+ }],
-+ ['include_alsa_audio==1', {
-+ 'defines': [
-+ 'LINUX_ALSA',
-+ ],
- 'conditions': [
- ['include_pulse_audio==1', {
- 'defines': [
- 'LINUX_PULSE',
- ],
- 'sources': [
- 'linux/audio_device_pulse_linux.cc',
- 'linux/audio_device_pulse_linux.h',
diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc
index 203f09a..0b0b70e 100644
--- media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc
Added: trunk/www/firefox-nightly/files/patch-bug844818
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug844818 Tue Feb 26 04:18:30 2013 (r1191)
@@ -0,0 +1,126 @@
+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,
Modified: trunk/www/firefox/files/patch-bug807492
==============================================================================
--- trunk/www/firefox/files/patch-bug807492 Sun Feb 24 04:00:04 2013 (r1190)
+++ trunk/www/firefox/files/patch-bug807492 Tue Feb 26 04:18:30 2013 (r1191)
@@ -753,7 +753,7 @@
index 9ca9f7c..d5c4ab9 100644
--- media/webrtc/trunk/src/build/common.gypi
+++ media/webrtc/trunk/src/build/common.gypi
-@@ -101,16 +101,23 @@
+@@ -101,16 +101,21 @@
'enable_protobuf%': 1,
'include_tests%': 1,
@@ -763,10 +763,8 @@
'clang_use_chrome_plugins%': 0,
}],
+ ['OS=="linux" or OS=="solaris" or os_bsd==1', {
-+ 'include_alsa_audio%': 1,
+ 'include_v4l2_video_capture%': 1,
+ }, {
-+ 'include_alsa_audio%': 0,
+ 'include_v4l2_video_capture%': 0,
+ }],
], # conditions
@@ -806,68 +804,6 @@
'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
-diff --git media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
-index 8457737..4d0f322 100644
---- media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
-+++ media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
-@@ -41,21 +41,25 @@
- 'audio_device_utility.h',
- 'audio_device_impl.cc',
- 'audio_device_impl.h',
- 'audio_device_config.h',
- 'dummy/audio_device_dummy.h',
- 'dummy/audio_device_utility_dummy.h',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['include_alsa_audio==1', {
- 'include_dirs': [
- 'linux',
- ],
-- }], # OS==linux
-+ 'defines': [
-+ # avoiding pointless ifdef churn
-+ 'WEBRTC_LINUX',
-+ ],
-+ }], # include_alsa_audio==1
- ['OS=="mac"', {
- 'include_dirs': [
- 'mac',
- ],
- }], # OS==mac
- ['OS=="win"', {
- 'include_dirs': [
- 'win',
-@@ -111,24 +115,26 @@
- 'link_settings': {
- 'libraries': [
- '-llog',
- '-lOpenSLES',
- ],
- },
- }],
- ['OS=="linux"', {
-- 'defines': [
-- 'LINUX_ALSA',
-- ],
- 'link_settings': {
- 'libraries': [
- '-ldl',
- ],
- },
-+ }],
-+ ['include_alsa_audio==1', {
-+ 'defines': [
-+ 'LINUX_ALSA',
-+ ],
- 'conditions': [
- ['include_pulse_audio==1', {
- 'defines': [
- 'LINUX_PULSE',
- ],
- 'sources': [
- 'linux/audio_device_pulse_linux.cc',
- 'linux/audio_device_pulse_linux.h',
diff --git media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
index 203f09a..0b0b70e 100644
--- media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
Added: trunk/www/firefox/files/patch-bug844818
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug844818 Tue Feb 26 04:18:30 2013 (r1191)
@@ -0,0 +1,126 @@
+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/src/modules/audio_device/main/source/audio_device.gypi media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
+index 8457737..dfc83ff 100644
+--- media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
++++ media/webrtc/trunk/src/modules/audio_device/main/source/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=="mac"', {
+ 'include_dirs': [
+ 'mac',
+@@ -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,
Modified: trunk/www/seamonkey/files/patch-bug807492
==============================================================================
--- trunk/www/seamonkey/files/patch-bug807492 Sun Feb 24 04:00:04 2013 (r1190)
+++ trunk/www/seamonkey/files/patch-bug807492 Tue Feb 26 04:18:30 2013 (r1191)
@@ -750,7 +750,7 @@
index 9ca9f7c..d5c4ab9 100644
--- mozilla/media/webrtc/trunk/src/build/common.gypi
+++ mozilla/media/webrtc/trunk/src/build/common.gypi
-@@ -101,16 +101,23 @@
+@@ -101,16 +101,21 @@
'enable_protobuf%': 1,
'include_tests%': 1,
@@ -760,10 +760,8 @@
'clang_use_chrome_plugins%': 0,
}],
+ ['OS=="linux" or OS=="solaris" or os_bsd==1', {
-+ 'include_alsa_audio%': 1,
+ 'include_v4l2_video_capture%': 1,
+ }, {
-+ 'include_alsa_audio%': 0,
+ 'include_v4l2_video_capture%': 0,
+ }],
], # conditions
@@ -803,68 +801,6 @@
'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
-diff --git media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
-index 8457737..4d0f322 100644
---- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
-+++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
-@@ -41,21 +41,25 @@
- 'audio_device_utility.h',
- 'audio_device_impl.cc',
- 'audio_device_impl.h',
- 'audio_device_config.h',
- 'dummy/audio_device_dummy.h',
- 'dummy/audio_device_utility_dummy.h',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['include_alsa_audio==1', {
- 'include_dirs': [
- 'linux',
- ],
-- }], # OS==linux
-+ 'defines': [
-+ # avoiding pointless ifdef churn
-+ 'WEBRTC_LINUX',
-+ ],
-+ }], # include_alsa_audio==1
- ['OS=="mac"', {
- 'include_dirs': [
- 'mac',
- ],
- }], # OS==mac
- ['OS=="win"', {
- 'include_dirs': [
- 'win',
-@@ -111,24 +115,26 @@
- 'link_settings': {
- 'libraries': [
- '-llog',
- '-lOpenSLES',
- ],
- },
- }],
- ['OS=="linux"', {
-- 'defines': [
-- 'LINUX_ALSA',
-- ],
- 'link_settings': {
- 'libraries': [
- '-ldl',
- ],
- },
-+ }],
-+ ['include_alsa_audio==1', {
-+ 'defines': [
-+ 'LINUX_ALSA',
-+ ],
- 'conditions': [
- ['include_pulse_audio==1', {
- 'defines': [
- 'LINUX_PULSE',
- ],
- 'sources': [
- 'linux/audio_device_pulse_linux.cc',
- 'linux/audio_device_pulse_linux.h',
diff --git media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
index 203f09a..0b0b70e 100644
--- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
Added: trunk/www/seamonkey/files/patch-bug844818
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug844818 Tue Feb 26 04:18:30 2013 (r1191)
@@ -0,0 +1,126 @@
+diff --git configure.in configure.in
+index 7cd6e17..a1dbdf7 100644
+--- mozilla/configure.in
++++ mozilla/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/src/modules/audio_device/main/source/audio_device.gypi media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
+index 8457737..dfc83ff 100644
+--- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
++++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/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=="mac"', {
+ 'include_dirs': [
+ 'mac',
+@@ -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
+--- mozilla/media/webrtc/webrtc_config.gypi
++++ mozilla/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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302260418.r1Q4IUh4065675>