From ba05efc063c9046a1d004d9fefcf212026a60faf Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Thu, 16 May 2013 02:00:38 +0000 Subject: - 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 --- www/firefox/files/patch-bug826985 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'www/firefox/files/patch-bug826985') diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985 index e7df887723f7..d15ab05562d1 100644 --- a/www/firefox/files/patch-bug826985 +++ b/www/firefox/files/patch-bug826985 @@ -6,9 +6,9 @@ Date: Fri Jan 4 13:49:22 2013 +0100 --- configure.in | 7 +++++++ media/webrtc/signaling/test/Makefile.in | 1 + - .../modules/video_capture/main/source/Linux/device_info_linux.cc | 17 +++++++++++++++++ - .../modules/video_capture/main/source/Linux/video_capture_linux.cc | 16 +++++++++++++++- - .../webrtc/modules/video_capture/main/source/video_capture.gypi | 11 +++++++++++ + .../modules/video_capture/linux/device_info_linux.cc | 17 +++++++++++++++++ + .../modules/video_capture/linux/video_capture_linux.cc | 16 +++++++++++++++- + .../webrtc/modules/video_capture/video_capture.gypi | 11 +++++++++++ toolkit/library/Makefile.in | 1 + 6 files changed, 52 insertions(+), 1 deletion(-) @@ -16,7 +16,7 @@ diff --git configure.in configure.in index 55e4cd1..76567b3 100644 --- configure.in +++ configure.in -@@ -5238,6 +5238,9 @@ if test -n "$MOZ_WEBRTC"; then +@@ -5250,6 +5250,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VP8_ENCODER=1 MOZ_VP8_ERROR_CONCEALMENT=1 @@ -49,10 +49,10 @@ index b483cd1..f1dd1f0 100644 $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \ $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ -diff --git media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc +diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc index 239a292..bab496c 100644 ---- media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc -+++ media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc +--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc ++++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc @@ -26,11 +26,23 @@ #else #include @@ -89,10 +89,10 @@ index 239a292..bab496c 100644 if (deviceNameLength >= strlen(cameraName)) { memcpy(deviceNameUTF8, cameraName, strlen(cameraName)); -diff --git media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc +diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc index 12df1b3..e9863ba 100644 ---- media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc -+++ media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc +--- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc ++++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc @@ -25,6 +25,9 @@ #else #include @@ -119,10 +119,10 @@ index 12df1b3..e9863ba 100644 namespace webrtc { namespace videocapturemodule -diff --git media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi +diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi index d46b5aa..e452223 100644 ---- media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi -+++ media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi +--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi ++++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi @@ -7,6 +7,9 @@ # be found in the AUTHORS file in the root of the source tree. -- cgit v1.2.3