[SVN-Commit] r1114 - in trunk: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files www/seamonkey www/seamonkey/files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Wed Dec 5 20:03:22 UTC 2012
Author: jbeich
Date: Wed Dec 5 20:03:15 2012
New Revision: 1114
Log:
propagate r1089 to releases
Added:
trunk/mail/thunderbird/files/patch-bug800401
trunk/mail/thunderbird/files/patch-bug807492
- copied, changed from r1113, trunk/www/firefox-nightly/files/patch-bug807492
trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc
trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc
trunk/mail/thunderbird/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c
trunk/www/firefox-nightly/files/patch-python-psutil-psutil-_psutil_bsd.c
trunk/www/firefox/files/patch-bug800401
trunk/www/firefox/files/patch-bug807492
- copied, changed from r1113, trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc
trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc
trunk/www/firefox/files/patch-python-psutil-psutil-_psutil_bsd.c
trunk/www/seamonkey/files/patch-bug800401
trunk/www/seamonkey/files/patch-bug807492
- copied, changed from r1113, trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc
trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc
trunk/www/seamonkey/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c
Modified:
trunk/Mk/bsd.gecko.mk
trunk/mail/thunderbird/Makefile
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox/Makefile
trunk/www/firefox/Makefile.options
trunk/www/seamonkey/Makefile
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Wed Dec 5 20:03:00 2012 (r1113)
+++ trunk/Mk/bsd.gecko.mk Wed Dec 5 20:03:15 2012 (r1114)
@@ -733,6 +733,15 @@
MOZ_OPTIONS+= --disable-libproxy
.endif
+.if ${PORT_OPTIONS:MWEBRTC}
+BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+. if ! ${PORT_OPTIONS:MALSA}
+IGNORE= WEBRTC works only with ALSA audio backend
+. endif
+.else
+MOZ_OPTIONS+= --disable-webrtc
+.endif
+
.if ${PORT_OPTIONS:MALSA}
LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Wed Dec 5 20:03:00 2012 (r1113)
+++ trunk/mail/thunderbird/Makefile Wed Dec 5 20:03:15 2012 (r1114)
@@ -52,7 +52,7 @@
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-OPTIONS_DEFINE= ENIGMAIL GSTREAMER LIGHTNING
+OPTIONS_DEFINE= ENIGMAIL GSTREAMER LIGHTNING WEBRTC
OPTIONS_DEFAULT=ENIGMAIL LIGHTNING
.include "${.CURDIR}/../../www/firefox/Makefile.options"
Added: trunk/mail/thunderbird/files/patch-bug800401
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug800401 Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,91 @@
+commit a564d64
+Author: Ehsan Akhgari <ehsan at mozilla.com>
+Date: Thu Oct 11 13:42:12 2012 -0400
+
+ Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup
+
+ In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery.
+---
+ media/mtransport/third_party/nICEr/nicer.gyp | 2 --
+ media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 --
+ media/webrtc/signaling/signaling.gyp | 6 ------
+ 3 files changed, 10 deletions(-)
+
+diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
+index 26ec0c5..0e1f8b4 100644
+--- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
++++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp
+@@ -132,7 +132,6 @@
+ ## Mac
+ [ 'OS == "mac"', {
+ 'cflags_mozilla': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+@@ -183,7 +182,6 @@
+ ## Linux
+ [ 'OS == "linux"', {
+ 'cflags': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
+index f9a5c19..3cc8e1c 100644
+--- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
++++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
+@@ -150,7 +150,6 @@
+ ## Mac
+ [ 'OS == "mac"', {
+ 'cflags_mozilla': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+@@ -200,7 +199,6 @@
+ ## Linux
+ [ 'OS == "linux"', {
+ 'cflags': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
+index 1ec0ee2..175996f 100644
+--- mozilla/media/webrtc/signaling/signaling.gyp
++++ mozilla/media/webrtc/signaling/signaling.gyp
+@@ -184,7 +184,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+ ],
+ }],
+ ['OS=="win"', {
+@@ -212,8 +211,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+- '-Wno-error=conversion'
+ ],
+ }],
+ ],
+@@ -633,7 +630,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+ ],
+ }],
+ ['OS=="win"', {
+@@ -752,8 +748,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+- '-Wno-error=conversion'
+ ],
+ }],
+ ],
Copied and modified: trunk/mail/thunderbird/files/patch-bug807492 (from r1113, trunk/www/firefox-nightly/files/patch-bug807492)
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Wed Dec 5 20:03:00 2012 (r1113, copy source)
+++ trunk/mail/thunderbird/files/patch-bug807492 Wed Dec 5 20:03:15 2012 (r1114)
@@ -1,7 +1,7 @@
diff --git config/system-headers config/system-headers
index 9bd1efa..1095a01 100644
---- config/system-headers
-+++ config/system-headers
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
@@ -15,8 +15,8 @@
+xlocale.h
diff --git configure.in configure.in
index c167461..8346c11 100644
---- configure.in
-+++ configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
@@ -1413,16 +1413,27 @@ if test "$GNU_CC"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -mssse3"
@@ -64,7 +64,7 @@
;;
esac
fi
-@@ -8865,16 +8876,21 @@ if test "${OS_TARGET}" = "WINNT"; then
+@@ -8909,16 +8920,21 @@ if test "${OS_TARGET}" = "WINNT"; then
if test "$HAVE_64BIT_OS"; then
OS_BITS=64
else
@@ -81,15 +81,15 @@
if test -n "$MOZ_WEBRTC"; then
AC_MSG_RESULT("generating WebRTC Makefiles...")
- dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries
- dnl so that regeneration via dependencies works correctly
WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi"
GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
+
+ $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \
diff --git js/src/config/system-headers js/src/config/system-headers
index 9bd1efa..1095a01 100644
---- js/src/config/system-headers
-+++ js/src/config/system-headers
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
@@ -103,8 +103,8 @@
+xlocale.h
diff --git media/mtransport/objs.mk media/mtransport/objs.mk
index f1fc85f..141e8ca 100644
---- media/mtransport/objs.mk
-+++ media/mtransport/objs.mk
+--- mozilla/media/mtransport/objs.mk
++++ mozilla/media/mtransport/objs.mk
@@ -18,22 +18,26 @@ LOCAL_INCLUDES += \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/libekr \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/log \
@@ -135,8 +135,8 @@
DEFINES += -DLINUX
diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
index 0e1f8b4..9a4b995 100644
---- media/mtransport/third_party/nICEr/nicer.gyp
-+++ media/mtransport/third_party/nICEr/nicer.gyp
+--- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
++++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp
@@ -124,26 +124,36 @@
'R_DEFINED_UINT2=uint16_t',
'R_DEFINED_INT4=int32_t',
@@ -178,8 +178,8 @@
'TIME_WITH_SYS_TIME_H=1',
diff --git media/mtransport/third_party/nICEr/src/stun/addrs.c media/mtransport/third_party/nICEr/src/stun/addrs.c
index b0b66b2..04fea94 100644
---- media/mtransport/third_party/nICEr/src/stun/addrs.c
-+++ media/mtransport/third_party/nICEr/src/stun/addrs.c
+--- mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c
++++ mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c
@@ -69,17 +69,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
#include <netdb.h>
#endif /* UNIX */
@@ -220,8 +220,8 @@
#endif
diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h
index a3c51f9..eb65ac8 100644
---- media/mtransport/third_party/nICEr/src/stun/stun.h
-+++ media/mtransport/third_party/nICEr/src/stun/stun.h
+--- mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h
++++ mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h
@@ -40,17 +40,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sys/param.h>
#include <sys/socket.h>
@@ -244,8 +244,8 @@
#include <time.h>
diff --git media/mtransport/third_party/nICEr/src/util/mbslen.c media/mtransport/third_party/nICEr/src/util/mbslen.c
index cc260b7..66af2d7 100644
---- media/mtransport/third_party/nICEr/src/util/mbslen.c
-+++ media/mtransport/third_party/nICEr/src/util/mbslen.c
+--- mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c
++++ mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c
@@ -38,50 +38,58 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <errno.h>
@@ -346,8 +346,8 @@
ABORT(R_BAD_DATA);
diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
index 3cc8e1c..74016c6 100644
---- media/mtransport/third_party/nrappkit/nrappkit.gyp
-+++ media/mtransport/third_party/nrappkit/nrappkit.gyp
+--- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
++++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
@@ -142,26 +142,35 @@
'R_DEFINED_UINT2=uint16_t',
'R_DEFINED_INT4=int32_t',
@@ -388,8 +388,8 @@
'TIME_WITH_SYS_TIME_H=1',
diff --git media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
index 15452e3..2c9651a 100644
---- media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
-+++ media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
+--- mozilla/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
++++ mozilla/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
@@ -37,16 +37,21 @@
*/
@@ -414,8 +414,8 @@
#define NR_SOCKET_WRITE(sock,buf,count) write((sock),(buf),(count))
diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
index bcb1ec0..bb73591 100644
---- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-+++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
+--- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
++++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
@@ -28,17 +28,17 @@
*
* @(#)queue.h 8.5 (Berkeley) 8/20/94
@@ -437,8 +437,8 @@
(var) = (tvar))
diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c
index 3aced8b..be020bb 100644
---- media/mtransport/third_party/nrappkit/src/util/util.c
-+++ media/mtransport/third_party/nrappkit/src/util/util.c
+--- mozilla/media/mtransport/third_party/nrappkit/src/util/util.c
++++ mozilla/media/mtransport/third_party/nrappkit/src/util/util.c
@@ -36,16 +36,19 @@
ekr at rtfm.com Wed Dec 26 17:19:36 2001
*/
@@ -480,8 +480,8 @@
if (! buf)
diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
index f0cbf870..ba0f801 100644
---- media/webrtc/signaling/signaling.gyp
-+++ media/webrtc/signaling/signaling.gyp
+--- mozilla/media/webrtc/signaling/signaling.gyp
++++ mozilla/media/webrtc/signaling/signaling.gyp
@@ -208,16 +208,29 @@
'SIPCC_BUILD',
'HAVE_WINSOCK2_H',
@@ -557,10 +557,40 @@
}],
],
+diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
+index a7c47e1..4f191de 100644
+--- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
++++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
+@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b
+ {
+ static const char fname[] = "cprGetMessage";
+
+ void *buffer = 0;
+ cpr_msg_queue_t *msgq;
+ cpr_msgq_node_t *node;
+ struct timespec timeout;
+ struct timeval tv;
++#ifndef __APPLE__
++ struct timezone tz;
++#else
+ // On the iPhone, there is a DarwinAlias problem with "timezone"
+ struct _timezone {
+ int tz_minuteswest; /* of Greenwich */
+ int tz_dsttime; /* type of dst correction to apply */
+ } tz;
++#endif
+
+ /* Initialize ppUserData */
+ if (ppUserData) {
+ *ppUserData = NULL;
+ }
+
+ msgq = (cpr_msg_queue_t *) msgQueue;
+ if (msgq == NULL) {
diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi
index 6ca2f70..5d261cb 100644
---- media/webrtc/trunk/build/common.gypi
-+++ media/webrtc/trunk/build/common.gypi
+--- mozilla/media/webrtc/trunk/build/common.gypi
++++ mozilla/media/webrtc/trunk/build/common.gypi
@@ -75,22 +75,31 @@
# ash. This rule should be removed for the future when Windows is
# using the aura windows without the ash interface.
@@ -659,8 +689,8 @@
'use_glib%': 0,
diff --git media/webrtc/trunk/src/build/common.gypi media/webrtc/trunk/src/build/common.gypi
index 9ca9f7c..d5c4ab9 100644
---- media/webrtc/trunk/src/build/common.gypi
-+++ media/webrtc/trunk/src/build/common.gypi
+--- mozilla/media/webrtc/trunk/src/build/common.gypi
++++ mozilla/media/webrtc/trunk/src/build/common.gypi
@@ -101,16 +101,23 @@
'enable_protobuf%': 1,
'include_tests%': 1,
@@ -716,8 +746,8 @@
}],
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
+--- 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',
@@ -778,8 +808,8 @@
'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
-+++ media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
+--- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
++++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
@@ -41,17 +41,17 @@ bool AudioDeviceUtility::StringCompare(
const char* str1 , const char* str2,
const WebRtc_UWord32 length)
@@ -814,8 +844,8 @@
diff --git media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
index bdad224..39e1132 100644
---- media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
-+++ media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
+--- mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
++++ mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
@@ -7,16 +7,17 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -836,8 +866,8 @@
namespace webrtc {
diff --git media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
index 298d479..37b70c9 100644
---- media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
-+++ media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
+--- mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
++++ mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
@@ -13,17 +13,17 @@
#include <cassert>
#include <cmath> // ceil
@@ -935,8 +965,8 @@
#error Either WEBRTC_LITTLE_ENDIAN or WEBRTC_BIG_ENDIAN must be defined
diff --git media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
index e50db5d..70ad8a8 100644
---- media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
-+++ media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
+--- mozilla/media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
++++ mozilla/media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
@@ -13,60 +13,62 @@
#include <stdio.h>
#include <stdlib.h>
@@ -1083,8 +1113,8 @@
else if(ipFamily == AF_INET6)
diff --git media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
index 69a52ec..7ac226c 100644
---- media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
-+++ media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
+--- mozilla/media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
++++ mozilla/media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
@@ -14,17 +14,17 @@
#include <stdio.h>
@@ -1125,8 +1155,8 @@
#else
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
index 653ee16..8d6fd68 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
+--- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc
++++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc
@@ -14,17 +14,23 @@
#include <unistd.h>
#include <sys/ioctl.h>
@@ -1153,8 +1183,8 @@
namespace videocapturemodule
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
index 12df1b3..424ea0a 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
+--- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
++++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
@@ -7,22 +7,30 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -1179,6 +1209,7 @@
+#include <linux/videodev2.h>
+#endif
+
+ #include <iostream>
#include <new>
#include "ref_count.h"
@@ -1186,11 +1217,10 @@
#include "thread_wrapper.h"
#include "critical_section_wrapper.h"
#include "video_capture_linux.h"
-
diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
index e3f7bb5..882cede 100644
---- media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
-+++ media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
+--- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
++++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
@@ -49,17 +49,17 @@ WebRtc_Word32 DeviceInfoImpl::NumberOfCapabilities(
if (!deviceUniqueIdUTF8)
return -1;
@@ -1250,8 +1280,8 @@
#endif
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
index 0a9765e..8d4bbf4 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
+--- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
++++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
@@ -50,17 +50,17 @@
['include_internal_video_capture==0', {
'sources': [
@@ -1312,8 +1342,8 @@
'OTHER_LDFLAGS': [
diff --git media/webrtc/trunk/src/system_wrappers/interface/tick_util.h media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
index 0cd85d0..45591be 100644
---- media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
-+++ media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
+--- mozilla/media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
++++ mozilla/media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
@@ -161,17 +161,17 @@ inline TickTime TickTime::Now()
// so it must have been a wrap around.
if(old > 0xf0000000 && now < 0x0fffffff)
@@ -1448,8 +1478,8 @@
diff --git media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
index bb10c6b..4878d71 100644
---- media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
@@ -7,24 +7,21 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -1478,8 +1508,8 @@
#endif
diff --git media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
index 05b0e57..993456c 100644
---- media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
@@ -7,17 +7,16 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -1500,8 +1530,8 @@
assert(Is32bitAligned());
diff --git media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
index b37d037..fcea221 100644
---- media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
@@ -3,35 +3,33 @@
*
* Use of this source code is governed by a BSD-style license
@@ -1546,8 +1576,8 @@
} // namespace webrtc
diff --git media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
index 48835ab..16c6033 100644
---- media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
@@ -90,17 +90,17 @@ void ConditionVariablePosix::SleepCS(CriticalSectionWrapper& critSect)
bool
ConditionVariablePosix::SleepCS(
@@ -1569,8 +1599,8 @@
diff --git media/webrtc/trunk/src/system_wrappers/source/cpu.cc media/webrtc/trunk/src/system_wrappers/source/cpu.cc
index 3df5d18..4cd3ddf 100644
---- media/webrtc/trunk/src/system_wrappers/source/cpu.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/cpu.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/cpu.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/cpu.cc
@@ -11,28 +11,28 @@
#include "cpu_wrapper.h"
@@ -1604,8 +1634,8 @@
} // namespace webrtc
diff --git media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
index e367abf..e14d7af 100644
---- media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
@@ -7,25 +7,27 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -1681,8 +1711,8 @@
}
diff --git media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
index 6334490..852ebaa 100644
---- media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
@@ -53,16 +53,25 @@
#include <sched.h>
#include <sys/syscall.h>
@@ -1821,8 +1851,8 @@
}
diff --git media/webrtc/trunk/src/video_engine/vie_defines.h media/webrtc/trunk/src/video_engine/vie_defines.h
index 2cc18cc7..2c042a0 100644
---- media/webrtc/trunk/src/video_engine/vie_defines.h
-+++ media/webrtc/trunk/src/video_engine/vie_defines.h
+--- mozilla/media/webrtc/trunk/src/video_engine/vie_defines.h
++++ mozilla/media/webrtc/trunk/src/video_engine/vie_defines.h
@@ -168,17 +168,17 @@ inline int ChannelId(const int moduleId) {
// Example: "Oct 10 2002 12:05:30 r".
@@ -1844,8 +1874,8 @@
#else
diff --git media/webrtc/trunk/src/voice_engine/voe_network_impl.cc media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
index 174abca..f8a2b2d 100644
---- media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
-+++ media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
+--- mozilla/media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
++++ mozilla/media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
@@ -467,17 +467,17 @@ int VoENetworkImpl::SetSendTOS(int channel,
int DSCP,
int priority,
@@ -1905,8 +1935,8 @@
_shared->SetLastError(VE_NOT_INITED, kTraceError);
diff --git media/webrtc/trunk/src/voice_engine/voice_engine_defines.h media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
index 7d4c729..4104719 100644
---- media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
-+++ media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
+--- mozilla/media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
++++ mozilla/media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
@@ -434,41 +434,44 @@ namespace webrtc
#else
@@ -1970,8 +2000,8 @@
#endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_DEFINES_H
diff --git media/webrtc/trunk/third_party/libyuv/libyuv.gyp media/webrtc/trunk/third_party/libyuv/libyuv.gyp
index 6f4eb9e..5f044ad 100644
---- media/webrtc/trunk/third_party/libyuv/libyuv.gyp
-+++ media/webrtc/trunk/third_party/libyuv/libyuv.gyp
+--- mozilla/media/webrtc/trunk/third_party/libyuv/libyuv.gyp
++++ mozilla/media/webrtc/trunk/third_party/libyuv/libyuv.gyp
@@ -4,16 +4,17 @@
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
@@ -1990,7 +2020,7 @@
'conditions': [
['use_system_libjpeg==0', {
'dependencies': [
-@@ -43,16 +44,23 @@
+@@ -43,16 +44,21 @@
],
'direct_dependent_settings': {
'include_dirs': [
@@ -2004,8 +2034,6 @@
+ 'YUV_DISABLE_ASM',
+ ],
+ }],
-+ ],
-+ 'conditions': [
['build_with_mozilla==1', {
'include_dirs': [
'$(DEPTH)/dist/include',
@@ -2016,8 +2044,8 @@
],
diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
index 338d0b7..2241d41 100644
---- media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
-+++ media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+--- mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
++++ mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
@@ -4,16 +4,17 @@
# Python 2.5 needs this for the with statement.
Added: trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,37 @@
+--- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc~
++++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
+@@ -31,6 +31,10 @@
+ #include <dlfcn.h>
+ #endif
+
++#ifdef __FreeBSD__
++#include <osreldate.h>
++#endif
++
+ // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead.
+ using namespace webrtc;
+
+@@ -38,7 +42,11 @@ namespace webrtc_adm_linux {
+
+ inline static const char *GetDllError() {
+ #ifdef WEBRTC_LINUX
++#if __FreeBSD_version < 800505
++ const char *err = dlerror();
++#else
+ char *err = dlerror();
++#endif
+ if (err) {
+ return err;
+ } else {
+@@ -78,7 +86,11 @@ static bool LoadSymbol(DllHandle handle,
+ void **symbol) {
+ #ifdef WEBRTC_LINUX
+ *symbol = dlsym(handle, symbol_name);
++#if __FreeBSD_version < 800505
++ const char *err = dlerror();
++#else
+ char *err = dlerror();
++#endif
+ if (err) {
+ WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
+ "Error loading symbol %s : %d", symbol_name, err);
Added: trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,16 @@
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp~
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp
+@@ -21,6 +21,13 @@ Scott McMurray
+ #include "constants.hpp"
+ #include <cstring>
+
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 900506
++# define getchar boost_getchar
++# endif
++#endif
++
+ namespace boost {
+ namespace detail {
+ //This only works on unsigned data types
Added: trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,16 @@
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc~
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
+@@ -62,7 +62,13 @@
+ #include <lwp.h>
+ #elif defined(__FreeBSD__)
+ #include <sys/param.h>
++#if __FreeBSD_version > 802500
+ #include <sys/thr.h>
++#else
++_Pragma("GCC visibility push(default)")
++extern "C" int thr_self(long *);
++_Pragma("GCC visibility pop")
++#endif
+ #endif
+
+ #if defined(WEBRTC_BSD) && !defined(__NetBSD__)
Added: trunk/mail/thunderbird/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,13 @@
+--- mozilla/python/psutil/psutil/_psutil_bsd.c.orig 2012-08-16 23:07:37.000000000 +0800
++++ mozilla/python/psutil/psutil/_psutil_bsd.c 2012-09-27 14:50:20.843763756 +0800
+@@ -1376,8 +1376,10 @@
+ strlcat(opts, ",noclusterr", sizeof(opts));
+ if (flags & MNT_NOCLUSTERW)
+ strlcat(opts, ",noclusterw", sizeof(opts));
++#if __FreeBSD_version >= 800000
+ if (flags & MNT_NFS4ACLS)
+ strlcat(opts, ",nfs4acls", sizeof(opts));
++#endif
+
+ py_tuple = Py_BuildValue("(ssss)", fs[i].f_mntfromname, // device
+ fs[i].f_mntonname, // mount point
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Wed Dec 5 20:03:00 2012 (r1113)
+++ trunk/www/firefox-nightly/Makefile Wed Dec 5 20:03:15 2012 (r1114)
@@ -54,8 +54,6 @@
OPTIONS_DEFINE= GSTREAMER PGO WEBRTC
OPTIONS_DEFAULT=GIO GSTREAMER WEBRTC
-WEBRTC_DESC?= Web Real-Time Communication
-
.include "${.CURDIR}/../../www/firefox/Makefile.options"
OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/}
@@ -79,15 +77,6 @@
.endif
.endif
-.if ${PORT_OPTIONS:MWEBRTC}
-BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-. if ! ${PORT_OPTIONS:MALSA}
-IGNORE= WEBRTC works only with ALSA audio backend
-. endif
-.else
-MOZ_OPTIONS+= --disable-webrtc
-.endif
-
.if ${PORT_OPTIONS:MPGO}
USE_DISPLAY= yes
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Wed Dec 5 20:03:00 2012 (r1113)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Wed Dec 5 20:03:15 2012 (r1114)
@@ -557,6 +557,36 @@
}],
],
+diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
+index a7c47e1..4f191de 100644
+--- media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
++++ media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
+@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
+ {
+ static const char fname[] = "cprGetMessage";
+
+ void *buffer = 0;
+ cpr_msg_queue_t *msgq;
+ cpr_msgq_node_t *node;
+ struct timespec timeout;
+ struct timeval tv;
++#ifndef __APPLE__
++ struct timezone tz;
++#else
+ // On the iPhone, there is a DarwinAlias problem with "timezone"
+ struct _timezone {
+ int tz_minuteswest; /* of Greenwich */
+ int tz_dsttime; /* type of dst correction to apply */
+ } tz;
++#endif
+
+ /* Initialize ppUserData */
+ if (ppUserData) {
+ *ppUserData = NULL;
+ }
+
+ msgq = (cpr_msg_queue_t *) msgQueue;
+ if (msgq == NULL) {
diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi
index 6ca2f70..5d261cb 100644
--- media/webrtc/trunk/build/common.gypi
@@ -1990,7 +2020,7 @@
'conditions': [
['use_system_libjpeg==0', {
'dependencies': [
-@@ -43,16 +44,23 @@
+@@ -43,16 +44,21 @@
],
'direct_dependent_settings': {
'include_dirs': [
@@ -2004,8 +2034,6 @@
+ 'YUV_DISABLE_ASM',
+ ],
+ }],
-+ ],
-+ 'conditions': [
['build_with_mozilla==1', {
'include_dirs': [
'$(DEPTH)/dist/include',
Added: trunk/www/firefox-nightly/files/patch-python-psutil-psutil-_psutil_bsd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-python-psutil-psutil-_psutil_bsd.c Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,13 @@
+--- python/psutil/psutil/_psutil_bsd.c.orig 2012-08-16 23:07:37.000000000 +0800
++++ python/psutil/psutil/_psutil_bsd.c 2012-09-27 14:50:20.843763756 +0800
+@@ -1376,8 +1376,10 @@
+ strlcat(opts, ",noclusterr", sizeof(opts));
+ if (flags & MNT_NOCLUSTERW)
+ strlcat(opts, ",noclusterw", sizeof(opts));
++#if __FreeBSD_version >= 800000
+ if (flags & MNT_NFS4ACLS)
+ strlcat(opts, ",nfs4acls", sizeof(opts));
++#endif
+
+ py_tuple = Py_BuildValue("(ssss)", fs[i].f_mntfromname, // device
+ fs[i].f_mntonname, // mount point
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Wed Dec 5 20:03:00 2012 (r1113)
+++ trunk/www/firefox/Makefile Wed Dec 5 20:03:15 2012 (r1114)
@@ -49,8 +49,8 @@
--enable-application=browser \
--enable-official-branding
-OPTIONS_DEFINE= GSTREAMER PGO
-OPTIONS_DEFAULT=GIO
+OPTIONS_DEFINE= GSTREAMER PGO WEBRTC
+OPTIONS_DEFAULT=GIO WEBRTC
.include "${.CURDIR}/../../www/firefox/Makefile.options"
Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options Wed Dec 5 20:03:00 2012 (r1113)
+++ trunk/www/firefox/Makefile.options Wed Dec 5 20:03:15 2012 (r1114)
@@ -13,3 +13,4 @@
LIBPROXY_DESC?= Proxy support via libproxy
LIGHTNING_DESC?= Calendar extension
LOGGING_DESC?= Additional log messages
+WEBRTC_DESC?= Web Real-Time Communication
Added: trunk/www/firefox/files/patch-bug800401
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug800401 Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,91 @@
+commit a564d64
+Author: Ehsan Akhgari <ehsan at mozilla.com>
+Date: Thu Oct 11 13:42:12 2012 -0400
+
+ Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup
+
+ In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery.
+---
+ media/mtransport/third_party/nICEr/nicer.gyp | 2 --
+ media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 --
+ media/webrtc/signaling/signaling.gyp | 6 ------
+ 3 files changed, 10 deletions(-)
+
+diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
+index 26ec0c5..0e1f8b4 100644
+--- media/mtransport/third_party/nICEr/nicer.gyp
++++ media/mtransport/third_party/nICEr/nicer.gyp
+@@ -132,7 +132,6 @@
+ ## Mac
+ [ 'OS == "mac"', {
+ 'cflags_mozilla': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+@@ -183,7 +182,6 @@
+ ## Linux
+ [ 'OS == "linux"', {
+ 'cflags': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
+index f9a5c19..3cc8e1c 100644
+--- media/mtransport/third_party/nrappkit/nrappkit.gyp
++++ media/mtransport/third_party/nrappkit/nrappkit.gyp
+@@ -150,7 +150,6 @@
+ ## Mac
+ [ 'OS == "mac"', {
+ 'cflags_mozilla': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+@@ -200,7 +199,6 @@
+ ## Linux
+ [ 'OS == "linux"', {
+ 'cflags': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
+index 1ec0ee2..175996f 100644
+--- media/webrtc/signaling/signaling.gyp
++++ media/webrtc/signaling/signaling.gyp
+@@ -184,7 +184,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+ ],
+ }],
+ ['OS=="win"', {
+@@ -212,8 +211,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+- '-Wno-error=conversion'
+ ],
+ }],
+ ],
+@@ -633,7 +630,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+ ],
+ }],
+ ['OS=="win"', {
+@@ -752,8 +748,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+- '-Wno-error=conversion'
+ ],
+ }],
+ ],
Copied and modified: trunk/www/firefox/files/patch-bug807492 (from r1113, trunk/www/firefox-nightly/files/patch-bug807492)
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Wed Dec 5 20:03:00 2012 (r1113, copy source)
+++ trunk/www/firefox/files/patch-bug807492 Wed Dec 5 20:03:15 2012 (r1114)
@@ -64,7 +64,7 @@
;;
esac
fi
-@@ -8865,16 +8876,21 @@ if test "${OS_TARGET}" = "WINNT"; then
+@@ -8909,16 +8920,21 @@ if test "${OS_TARGET}" = "WINNT"; then
if test "$HAVE_64BIT_OS"; then
OS_BITS=64
else
@@ -81,11 +81,11 @@
if test -n "$MOZ_WEBRTC"; then
AC_MSG_RESULT("generating WebRTC Makefiles...")
- dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries
- dnl so that regeneration via dependencies works correctly
WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi"
GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
+
+ $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \
diff --git js/src/config/system-headers js/src/config/system-headers
index 9bd1efa..1095a01 100644
--- js/src/config/system-headers
@@ -557,6 +557,36 @@
}],
],
+diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
+index a7c47e1..4f191de 100644
+--- media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
++++ media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
+@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b
+ {
+ static const char fname[] = "cprGetMessage";
+
+ void *buffer = 0;
+ cpr_msg_queue_t *msgq;
+ cpr_msgq_node_t *node;
+ struct timespec timeout;
+ struct timeval tv;
++#ifndef __APPLE__
++ struct timezone tz;
++#else
+ // On the iPhone, there is a DarwinAlias problem with "timezone"
+ struct _timezone {
+ int tz_minuteswest; /* of Greenwich */
+ int tz_dsttime; /* type of dst correction to apply */
+ } tz;
++#endif
+
+ /* Initialize ppUserData */
+ if (ppUserData) {
+ *ppUserData = NULL;
+ }
+
+ msgq = (cpr_msg_queue_t *) msgQueue;
+ if (msgq == NULL) {
diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi
index 6ca2f70..5d261cb 100644
--- media/webrtc/trunk/build/common.gypi
@@ -1179,6 +1209,7 @@
+#include <linux/videodev2.h>
+#endif
+
+ #include <iostream>
#include <new>
#include "ref_count.h"
@@ -1186,7 +1217,6 @@
#include "thread_wrapper.h"
#include "critical_section_wrapper.h"
#include "video_capture_linux.h"
-
diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
index e3f7bb5..882cede 100644
--- media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
@@ -1990,7 +2020,7 @@
'conditions': [
['use_system_libjpeg==0', {
'dependencies': [
-@@ -43,16 +44,23 @@
+@@ -43,16 +44,21 @@
],
'direct_dependent_settings': {
'include_dirs': [
@@ -2004,8 +2034,6 @@
+ 'YUV_DISABLE_ASM',
+ ],
+ }],
-+ ],
-+ 'conditions': [
['build_with_mozilla==1', {
'include_dirs': [
'$(DEPTH)/dist/include',
Added: trunk/www/firefox/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,37 @@
+--- media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc~
++++ media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
+@@ -31,6 +31,10 @@
+ #include <dlfcn.h>
+ #endif
+
++#ifdef __FreeBSD__
++#include <osreldate.h>
++#endif
++
+ // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead.
+ using namespace webrtc;
+
+@@ -38,7 +42,11 @@ namespace webrtc_adm_linux {
+
+ inline static const char *GetDllError() {
+ #ifdef WEBRTC_LINUX
++#if __FreeBSD_version < 800505
++ const char *err = dlerror();
++#else
+ char *err = dlerror();
++#endif
+ if (err) {
+ return err;
+ } else {
+@@ -78,7 +86,11 @@ static bool LoadSymbol(DllHandle handle,
+ void **symbol) {
+ #ifdef WEBRTC_LINUX
+ *symbol = dlsym(handle, symbol_name);
++#if __FreeBSD_version < 800505
++ const char *err = dlerror();
++#else
+ char *err = dlerror();
++#endif
+ if (err) {
+ WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
+ "Error loading symbol %s : %d", symbol_name, err);
Added: trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,16 @@
+--- media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp~
++++ media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp
+@@ -21,6 +21,13 @@ Scott McMurray
+ #include "constants.hpp"
+ #include <cstring>
+
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 900506
++# define getchar boost_getchar
++# endif
++#endif
++
+ namespace boost {
+ namespace detail {
+ //This only works on unsigned data types
Added: trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,16 @@
+--- media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc~
++++ media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
+@@ -62,7 +62,13 @@
+ #include <lwp.h>
+ #elif defined(__FreeBSD__)
+ #include <sys/param.h>
++#if __FreeBSD_version > 802500
+ #include <sys/thr.h>
++#else
++_Pragma("GCC visibility push(default)")
++extern "C" int thr_self(long *);
++_Pragma("GCC visibility pop")
++#endif
+ #endif
+
+ #if defined(WEBRTC_BSD) && !defined(__NetBSD__)
Added: trunk/www/firefox/files/patch-python-psutil-psutil-_psutil_bsd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-python-psutil-psutil-_psutil_bsd.c Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,13 @@
+--- python/psutil/psutil/_psutil_bsd.c.orig 2012-08-16 23:07:37.000000000 +0800
++++ python/psutil/psutil/_psutil_bsd.c 2012-09-27 14:50:20.843763756 +0800
+@@ -1376,8 +1376,10 @@
+ strlcat(opts, ",noclusterr", sizeof(opts));
+ if (flags & MNT_NOCLUSTERW)
+ strlcat(opts, ",noclusterw", sizeof(opts));
++#if __FreeBSD_version >= 800000
+ if (flags & MNT_NFS4ACLS)
+ strlcat(opts, ",nfs4acls", sizeof(opts));
++#endif
+
+ py_tuple = Py_BuildValue("(ssss)", fs[i].f_mntfromname, // device
+ fs[i].f_mntonname, // mount point
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Wed Dec 5 20:03:00 2012 (r1113)
+++ trunk/www/seamonkey/Makefile Wed Dec 5 20:03:15 2012 (r1114)
@@ -45,8 +45,8 @@
NOT_FOR_ARCHS= ia64
-OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS
-OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GIO LDAP LIGHTNING MAILNEWS
+OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS WEBRTC
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GIO LDAP LIGHTNING MAILNEWS WEBRTC
CHATZILLA_DESC?=Chatzilla IRC module
COMPOSER_DESC?= HTML Composer module
Added: trunk/www/seamonkey/files/patch-bug800401
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug800401 Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,91 @@
+commit a564d64
+Author: Ehsan Akhgari <ehsan at mozilla.com>
+Date: Thu Oct 11 13:42:12 2012 -0400
+
+ Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup
+
+ In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery.
+---
+ media/mtransport/third_party/nICEr/nicer.gyp | 2 --
+ media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 --
+ media/webrtc/signaling/signaling.gyp | 6 ------
+ 3 files changed, 10 deletions(-)
+
+diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
+index 26ec0c5..0e1f8b4 100644
+--- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
++++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp
+@@ -132,7 +132,6 @@
+ ## Mac
+ [ 'OS == "mac"', {
+ 'cflags_mozilla': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+@@ -183,7 +182,6 @@
+ ## Linux
+ [ 'OS == "linux"', {
+ 'cflags': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
+index f9a5c19..3cc8e1c 100644
+--- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
++++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
+@@ -150,7 +150,6 @@
+ ## Mac
+ [ 'OS == "mac"', {
+ 'cflags_mozilla': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+@@ -200,7 +199,6 @@
+ ## Linux
+ [ 'OS == "linux"', {
+ 'cflags': [
+- '-Werror',
+ '-Wall',
+ '-Wno-parentheses',
+ '-Wno-strict-prototypes',
+diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
+index 1ec0ee2..175996f 100644
+--- mozilla/media/webrtc/signaling/signaling.gyp
++++ mozilla/media/webrtc/signaling/signaling.gyp
+@@ -184,7 +184,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+ ],
+ }],
+ ['OS=="win"', {
+@@ -212,8 +211,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+- '-Wno-error=conversion'
+ ],
+ }],
+ ],
+@@ -633,7 +630,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+ ],
+ }],
+ ['OS=="win"', {
+@@ -752,8 +748,6 @@
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+- '-Wno-error=conversion'
+ ],
+ }],
+ ],
Copied and modified: trunk/www/seamonkey/files/patch-bug807492 (from r1113, trunk/www/firefox-nightly/files/patch-bug807492)
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Wed Dec 5 20:03:00 2012 (r1113, copy source)
+++ trunk/www/seamonkey/files/patch-bug807492 Wed Dec 5 20:03:15 2012 (r1114)
@@ -1,7 +1,7 @@
diff --git config/system-headers config/system-headers
index 9bd1efa..1095a01 100644
---- config/system-headers
-+++ config/system-headers
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
@@ -15,8 +15,8 @@
+xlocale.h
diff --git configure.in configure.in
index c167461..8346c11 100644
---- configure.in
-+++ configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
@@ -1413,16 +1413,27 @@ if test "$GNU_CC"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -mssse3"
@@ -64,7 +64,7 @@
;;
esac
fi
-@@ -8865,16 +8876,21 @@ if test "${OS_TARGET}" = "WINNT"; then
+@@ -8909,16 +8920,21 @@ if test "${OS_TARGET}" = "WINNT"; then
if test "$HAVE_64BIT_OS"; then
OS_BITS=64
else
@@ -81,15 +81,15 @@
if test -n "$MOZ_WEBRTC"; then
AC_MSG_RESULT("generating WebRTC Makefiles...")
- dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries
- dnl so that regeneration via dependencies works correctly
WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi"
GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
+
+ $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \
diff --git js/src/config/system-headers js/src/config/system-headers
index 9bd1efa..1095a01 100644
---- js/src/config/system-headers
-+++ js/src/config/system-headers
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
@@ -103,8 +103,8 @@
+xlocale.h
diff --git media/mtransport/objs.mk media/mtransport/objs.mk
index f1fc85f..141e8ca 100644
---- media/mtransport/objs.mk
-+++ media/mtransport/objs.mk
+--- mozilla/media/mtransport/objs.mk
++++ mozilla/media/mtransport/objs.mk
@@ -18,22 +18,26 @@ LOCAL_INCLUDES += \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/libekr \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/log \
@@ -135,8 +135,8 @@
DEFINES += -DLINUX
diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
index 0e1f8b4..9a4b995 100644
---- media/mtransport/third_party/nICEr/nicer.gyp
-+++ media/mtransport/third_party/nICEr/nicer.gyp
+--- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
++++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp
@@ -124,26 +124,36 @@
'R_DEFINED_UINT2=uint16_t',
'R_DEFINED_INT4=int32_t',
@@ -178,8 +178,8 @@
'TIME_WITH_SYS_TIME_H=1',
diff --git media/mtransport/third_party/nICEr/src/stun/addrs.c media/mtransport/third_party/nICEr/src/stun/addrs.c
index b0b66b2..04fea94 100644
---- media/mtransport/third_party/nICEr/src/stun/addrs.c
-+++ media/mtransport/third_party/nICEr/src/stun/addrs.c
+--- mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c
++++ mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c
@@ -69,17 +69,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
#include <netdb.h>
#endif /* UNIX */
@@ -220,8 +220,8 @@
#endif
diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h
index a3c51f9..eb65ac8 100644
---- media/mtransport/third_party/nICEr/src/stun/stun.h
-+++ media/mtransport/third_party/nICEr/src/stun/stun.h
+--- mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h
++++ mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h
@@ -40,17 +40,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sys/param.h>
#include <sys/socket.h>
@@ -244,8 +244,8 @@
#include <time.h>
diff --git media/mtransport/third_party/nICEr/src/util/mbslen.c media/mtransport/third_party/nICEr/src/util/mbslen.c
index cc260b7..66af2d7 100644
---- media/mtransport/third_party/nICEr/src/util/mbslen.c
-+++ media/mtransport/third_party/nICEr/src/util/mbslen.c
+--- mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c
++++ mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c
@@ -38,50 +38,58 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <errno.h>
@@ -346,8 +346,8 @@
ABORT(R_BAD_DATA);
diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
index 3cc8e1c..74016c6 100644
---- media/mtransport/third_party/nrappkit/nrappkit.gyp
-+++ media/mtransport/third_party/nrappkit/nrappkit.gyp
+--- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
++++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
@@ -142,26 +142,35 @@
'R_DEFINED_UINT2=uint16_t',
'R_DEFINED_INT4=int32_t',
@@ -388,8 +388,8 @@
'TIME_WITH_SYS_TIME_H=1',
diff --git media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
index 15452e3..2c9651a 100644
---- media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
-+++ media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
+--- mozilla/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
++++ mozilla/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
@@ -37,16 +37,21 @@
*/
@@ -414,8 +414,8 @@
#define NR_SOCKET_WRITE(sock,buf,count) write((sock),(buf),(count))
diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
index bcb1ec0..bb73591 100644
---- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-+++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
+--- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
++++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
@@ -28,17 +28,17 @@
*
* @(#)queue.h 8.5 (Berkeley) 8/20/94
@@ -437,8 +437,8 @@
(var) = (tvar))
diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c
index 3aced8b..be020bb 100644
---- media/mtransport/third_party/nrappkit/src/util/util.c
-+++ media/mtransport/third_party/nrappkit/src/util/util.c
+--- mozilla/media/mtransport/third_party/nrappkit/src/util/util.c
++++ mozilla/media/mtransport/third_party/nrappkit/src/util/util.c
@@ -36,16 +36,19 @@
ekr at rtfm.com Wed Dec 26 17:19:36 2001
*/
@@ -480,8 +480,8 @@
if (! buf)
diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
index f0cbf870..ba0f801 100644
---- media/webrtc/signaling/signaling.gyp
-+++ media/webrtc/signaling/signaling.gyp
+--- mozilla/media/webrtc/signaling/signaling.gyp
++++ mozilla/media/webrtc/signaling/signaling.gyp
@@ -208,16 +208,29 @@
'SIPCC_BUILD',
'HAVE_WINSOCK2_H',
@@ -557,10 +557,40 @@
}],
],
+diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
+index a7c47e1..4f191de 100644
+--- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
++++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
+@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b
+ {
+ static const char fname[] = "cprGetMessage";
+
+ void *buffer = 0;
+ cpr_msg_queue_t *msgq;
+ cpr_msgq_node_t *node;
+ struct timespec timeout;
+ struct timeval tv;
++#ifndef __APPLE__
++ struct timezone tz;
++#else
+ // On the iPhone, there is a DarwinAlias problem with "timezone"
+ struct _timezone {
+ int tz_minuteswest; /* of Greenwich */
+ int tz_dsttime; /* type of dst correction to apply */
+ } tz;
++#endif
+
+ /* Initialize ppUserData */
+ if (ppUserData) {
+ *ppUserData = NULL;
+ }
+
+ msgq = (cpr_msg_queue_t *) msgQueue;
+ if (msgq == NULL) {
diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi
index 6ca2f70..5d261cb 100644
---- media/webrtc/trunk/build/common.gypi
-+++ media/webrtc/trunk/build/common.gypi
+--- mozilla/media/webrtc/trunk/build/common.gypi
++++ mozilla/media/webrtc/trunk/build/common.gypi
@@ -75,22 +75,31 @@
# ash. This rule should be removed for the future when Windows is
# using the aura windows without the ash interface.
@@ -659,8 +689,8 @@
'use_glib%': 0,
diff --git media/webrtc/trunk/src/build/common.gypi media/webrtc/trunk/src/build/common.gypi
index 9ca9f7c..d5c4ab9 100644
---- media/webrtc/trunk/src/build/common.gypi
-+++ media/webrtc/trunk/src/build/common.gypi
+--- mozilla/media/webrtc/trunk/src/build/common.gypi
++++ mozilla/media/webrtc/trunk/src/build/common.gypi
@@ -101,16 +101,23 @@
'enable_protobuf%': 1,
'include_tests%': 1,
@@ -716,8 +746,8 @@
}],
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
+--- 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',
@@ -778,8 +808,8 @@
'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
-+++ media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
+--- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
++++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc
@@ -41,17 +41,17 @@ bool AudioDeviceUtility::StringCompare(
const char* str1 , const char* str2,
const WebRtc_UWord32 length)
@@ -814,8 +844,8 @@
diff --git media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
index bdad224..39e1132 100644
---- media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
-+++ media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
+--- mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
++++ mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
@@ -7,16 +7,17 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -836,8 +866,8 @@
namespace webrtc {
diff --git media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
index 298d479..37b70c9 100644
---- media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
-+++ media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
+--- mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
++++ mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc
@@ -13,17 +13,17 @@
#include <cassert>
#include <cmath> // ceil
@@ -935,8 +965,8 @@
#error Either WEBRTC_LITTLE_ENDIAN or WEBRTC_BIG_ENDIAN must be defined
diff --git media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
index e50db5d..70ad8a8 100644
---- media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
-+++ media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
+--- mozilla/media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
++++ mozilla/media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc
@@ -13,60 +13,62 @@
#include <stdio.h>
#include <stdlib.h>
@@ -1083,8 +1113,8 @@
else if(ipFamily == AF_INET6)
diff --git media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
index 69a52ec..7ac226c 100644
---- media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
-+++ media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
+--- mozilla/media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
++++ mozilla/media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc
@@ -14,17 +14,17 @@
#include <stdio.h>
@@ -1125,8 +1155,8 @@
#else
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
index 653ee16..8d6fd68 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
+--- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc
++++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc
@@ -14,17 +14,23 @@
#include <unistd.h>
#include <sys/ioctl.h>
@@ -1153,8 +1183,8 @@
namespace videocapturemodule
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
index 12df1b3..424ea0a 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
+--- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
++++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
@@ -7,22 +7,30 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -1179,6 +1209,7 @@
+#include <linux/videodev2.h>
+#endif
+
+ #include <iostream>
#include <new>
#include "ref_count.h"
@@ -1186,11 +1217,10 @@
#include "thread_wrapper.h"
#include "critical_section_wrapper.h"
#include "video_capture_linux.h"
-
diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
index e3f7bb5..882cede 100644
---- media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
-+++ media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
+--- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
++++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
@@ -49,17 +49,17 @@ WebRtc_Word32 DeviceInfoImpl::NumberOfCapabilities(
if (!deviceUniqueIdUTF8)
return -1;
@@ -1250,8 +1280,8 @@
#endif
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
index 0a9765e..8d4bbf4 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
+--- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
++++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
@@ -50,17 +50,17 @@
['include_internal_video_capture==0', {
'sources': [
@@ -1312,8 +1342,8 @@
'OTHER_LDFLAGS': [
diff --git media/webrtc/trunk/src/system_wrappers/interface/tick_util.h media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
index 0cd85d0..45591be 100644
---- media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
-+++ media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
+--- mozilla/media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
++++ mozilla/media/webrtc/trunk/src/system_wrappers/interface/tick_util.h
@@ -161,17 +161,17 @@ inline TickTime TickTime::Now()
// so it must have been a wrap around.
if(old > 0xf0000000 && now < 0x0fffffff)
@@ -1448,8 +1478,8 @@
diff --git media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
index bb10c6b..4878d71 100644
---- media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
@@ -7,24 +7,21 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -1478,8 +1508,8 @@
#endif
diff --git media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
index 05b0e57..993456c 100644
---- media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/atomic32_posix.cc
@@ -7,17 +7,16 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -1500,8 +1530,8 @@
assert(Is32bitAligned());
diff --git media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
index b37d037..fcea221 100644
---- media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/condition_variable.cc
@@ -3,35 +3,33 @@
*
* Use of this source code is governed by a BSD-style license
@@ -1546,8 +1576,8 @@
} // namespace webrtc
diff --git media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
index 48835ab..16c6033 100644
---- media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/condition_variable_posix.cc
@@ -90,17 +90,17 @@ void ConditionVariablePosix::SleepCS(CriticalSectionWrapper& critSect)
bool
ConditionVariablePosix::SleepCS(
@@ -1569,8 +1599,8 @@
diff --git media/webrtc/trunk/src/system_wrappers/source/cpu.cc media/webrtc/trunk/src/system_wrappers/source/cpu.cc
index 3df5d18..4cd3ddf 100644
---- media/webrtc/trunk/src/system_wrappers/source/cpu.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/cpu.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/cpu.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/cpu.cc
@@ -11,28 +11,28 @@
#include "cpu_wrapper.h"
@@ -1604,8 +1634,8 @@
} // namespace webrtc
diff --git media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
index e367abf..e14d7af 100644
---- media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
@@ -7,25 +7,27 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
@@ -1681,8 +1711,8 @@
}
diff --git media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
index 6334490..852ebaa 100644
---- media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
-+++ media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
@@ -53,16 +53,25 @@
#include <sched.h>
#include <sys/syscall.h>
@@ -1821,8 +1851,8 @@
}
diff --git media/webrtc/trunk/src/video_engine/vie_defines.h media/webrtc/trunk/src/video_engine/vie_defines.h
index 2cc18cc7..2c042a0 100644
---- media/webrtc/trunk/src/video_engine/vie_defines.h
-+++ media/webrtc/trunk/src/video_engine/vie_defines.h
+--- mozilla/media/webrtc/trunk/src/video_engine/vie_defines.h
++++ mozilla/media/webrtc/trunk/src/video_engine/vie_defines.h
@@ -168,17 +168,17 @@ inline int ChannelId(const int moduleId) {
// Example: "Oct 10 2002 12:05:30 r".
@@ -1844,8 +1874,8 @@
#else
diff --git media/webrtc/trunk/src/voice_engine/voe_network_impl.cc media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
index 174abca..f8a2b2d 100644
---- media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
-+++ media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
+--- mozilla/media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
++++ mozilla/media/webrtc/trunk/src/voice_engine/voe_network_impl.cc
@@ -467,17 +467,17 @@ int VoENetworkImpl::SetSendTOS(int channel,
int DSCP,
int priority,
@@ -1905,8 +1935,8 @@
_shared->SetLastError(VE_NOT_INITED, kTraceError);
diff --git media/webrtc/trunk/src/voice_engine/voice_engine_defines.h media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
index 7d4c729..4104719 100644
---- media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
-+++ media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
+--- mozilla/media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
++++ mozilla/media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
@@ -434,41 +434,44 @@ namespace webrtc
#else
@@ -1970,8 +2000,8 @@
#endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_DEFINES_H
diff --git media/webrtc/trunk/third_party/libyuv/libyuv.gyp media/webrtc/trunk/third_party/libyuv/libyuv.gyp
index 6f4eb9e..5f044ad 100644
---- media/webrtc/trunk/third_party/libyuv/libyuv.gyp
-+++ media/webrtc/trunk/third_party/libyuv/libyuv.gyp
+--- mozilla/media/webrtc/trunk/third_party/libyuv/libyuv.gyp
++++ mozilla/media/webrtc/trunk/third_party/libyuv/libyuv.gyp
@@ -4,16 +4,17 @@
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
@@ -1990,7 +2020,7 @@
'conditions': [
['use_system_libjpeg==0', {
'dependencies': [
-@@ -43,16 +44,23 @@
+@@ -43,16 +44,21 @@
],
'direct_dependent_settings': {
'include_dirs': [
@@ -2004,8 +2034,6 @@
+ 'YUV_DISABLE_ASM',
+ ],
+ }],
-+ ],
-+ 'conditions': [
['build_with_mozilla==1', {
'include_dirs': [
'$(DEPTH)/dist/include',
@@ -2016,8 +2044,8 @@
],
diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
index 338d0b7..2241d41 100644
---- media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
-+++ media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+--- mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
++++ mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
@@ -4,16 +4,17 @@
# Python 2.5 needs this for the with statement.
Added: trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,37 @@
+--- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc~
++++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
+@@ -31,6 +31,10 @@
+ #include <dlfcn.h>
+ #endif
+
++#ifdef __FreeBSD__
++#include <osreldate.h>
++#endif
++
+ // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead.
+ using namespace webrtc;
+
+@@ -38,7 +42,11 @@ namespace webrtc_adm_linux {
+
+ inline static const char *GetDllError() {
+ #ifdef WEBRTC_LINUX
++#if __FreeBSD_version < 800505
++ const char *err = dlerror();
++#else
+ char *err = dlerror();
++#endif
+ if (err) {
+ return err;
+ } else {
+@@ -78,7 +86,11 @@ static bool LoadSymbol(DllHandle handle,
+ void **symbol) {
+ #ifdef WEBRTC_LINUX
+ *symbol = dlsym(handle, symbol_name);
++#if __FreeBSD_version < 800505
++ const char *err = dlerror();
++#else
+ char *err = dlerror();
++#endif
+ if (err) {
+ WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
+ "Error loading symbol %s : %d", symbol_name, err);
Added: trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,16 @@
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp~
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp
+@@ -21,6 +21,13 @@ Scott McMurray
+ #include "constants.hpp"
+ #include <cstring>
+
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 900506
++# define getchar boost_getchar
++# endif
++#endif
++
+ namespace boost {
+ namespace detail {
+ //This only works on unsigned data types
Added: trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,16 @@
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc~
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
+@@ -62,7 +62,13 @@
+ #include <lwp.h>
+ #elif defined(__FreeBSD__)
+ #include <sys/param.h>
++#if __FreeBSD_version > 802500
+ #include <sys/thr.h>
++#else
++_Pragma("GCC visibility push(default)")
++extern "C" int thr_self(long *);
++_Pragma("GCC visibility pop")
++#endif
+ #endif
+
+ #if defined(WEBRTC_BSD) && !defined(__NetBSD__)
Added: trunk/www/seamonkey/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c Wed Dec 5 20:03:15 2012 (r1114)
@@ -0,0 +1,13 @@
+--- mozilla/python/psutil/psutil/_psutil_bsd.c.orig 2012-08-16 23:07:37.000000000 +0800
++++ mozilla/python/psutil/psutil/_psutil_bsd.c 2012-09-27 14:50:20.843763756 +0800
+@@ -1376,8 +1376,10 @@
+ strlcat(opts, ",noclusterr", sizeof(opts));
+ if (flags & MNT_NOCLUSTERW)
+ strlcat(opts, ",noclusterw", sizeof(opts));
++#if __FreeBSD_version >= 800000
+ if (flags & MNT_NFS4ACLS)
+ strlcat(opts, ",nfs4acls", sizeof(opts));
++#endif
+
+ py_tuple = Py_BuildValue("(ssss)", fs[i].f_mntfromname, // device
+ fs[i].f_mntonname, // mount point
More information about the freebsd-gecko
mailing list