summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug844818
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-05-16 02:00:38 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-05-16 02:00:38 +0000
commitba05efc063c9046a1d004d9fefcf212026a60faf (patch)
tree97b1a90026635f394b7c23d7ecfdef200676e2e1 /www/firefox/files/patch-bug844818
parentAdd missing pb_basebackup (diff)
- update firefox to 21.0
- 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>
Diffstat (limited to 'www/firefox/files/patch-bug844818')
-rw-r--r--www/firefox/files/patch-bug84481812
1 files changed, 6 insertions, 6 deletions
diff --git a/www/firefox/files/patch-bug844818 b/www/firefox/files/patch-bug844818
index cf796b639134..87151264c032 100644
--- a/www/firefox/files/patch-bug844818
+++ b/www/firefox/files/patch-bug844818
@@ -21,10 +21,10 @@ index 7cd6e17..a1dbdf7 100644
# 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
+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/src/modules/audio_device/main/source/audio_device.gypi
-+++ media/webrtc/trunk/src/modules/audio_device/main/source/audio_device.gypi
+--- 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',
],
@@ -40,9 +40,9 @@ index 8457737..dfc83ff 100644
+ 'WEBRTC_LINUX',
+ ],
+ }], # include_alsa_audio==1 or include_pulse_audio==1
- ['OS=="mac"', {
- 'include_dirs': [
- 'mac',
+ ['OS=="ios"', {
+ 'include_dirs': [
+ 'ios',
@@ -74,14 +78,8 @@
}],
['include_internal_audio_device==1', {