From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 15 17:32:59 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6ADC9521 for ; Thu, 15 Aug 2013 17:32:59 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BAFA42E56 for ; Thu, 15 Aug 2013 17:32:58 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r7FHWoRc053999 for ; Thu, 15 Aug 2013 17:32:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r7FHWiJh050781 for freebsd-gecko@freebsd.org; Thu, 15 Aug 2013 17:32:44 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 15 Aug 2013 17:32:44 GMT Message-Id: <201308151732.r7FHWiJh050781@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1316 - in trunk/www/seamonkey: . files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Aug 2013 17:32:59 -0000 Author: jbeich Date: Thu Aug 15 17:32:44 2013 New Revision: 1316 Log: (configure broken) update seamonkey to 2.21b1 Added: trunk/www/seamonkey/files/patch-bug834091 trunk/www/seamonkey/files/patch-bug876156 Deleted: trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk trunk/www/seamonkey/files/extra-patch-configure.in trunk/www/seamonkey/files/patch-bug722975 trunk/www/seamonkey/files/patch-bug844818 trunk/www/seamonkey/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h Modified: trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo trunk/www/seamonkey/files/patch-bug783463 trunk/www/seamonkey/files/patch-bug803480 trunk/www/seamonkey/files/patch-bug807492 trunk/www/seamonkey/files/patch-bug893397 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Wed Aug 14 20:05:55 2013 (r1315) +++ trunk/www/seamonkey/Makefile Thu Aug 15 17:32:44 2013 (r1316) @@ -1,13 +1,13 @@ # Created by: eivind/dima/jseger -# $FreeBSD: head/www/seamonkey/Makefile 310240 2013-01-11 16:48:10Z flo $ +# $FreeBSD: head/www/seamonkey/Makefile 324744 2013-08-14 22:35:50Z ak $ PORTNAME= seamonkey -DISTVERSION= 2.20 +PORTVERSION= 2.21.b1 +DISTVERSION= 24.0b1 CATEGORIES?= www ipv6 -MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ -DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} -EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +MASTER_SITES= https://ftp.mozilla.org/pub/mozilla.org/thunderbird/candidates/${DISTVERSION}-candidates/build2/source/ +DISTFILES= thunderbird-${DISTVERSION}.source${EXTRACT_SUFX} +EXTRACT_ONLY= thunderbird-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser @@ -19,7 +19,7 @@ unzip:${PORTSDIR}/archivers/unzip EM_VERSION= 1.5.2 -L_VERSION= 2.5b1 +L_VERSION= 2.6b1 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 @@ -34,7 +34,6 @@ ALL_TARGET= default USE_GL= gl USE_DOS2UNIX= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp -MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_EXTENSIONS= default @@ -72,14 +71,12 @@ .include -WRKSRC= ${WRKDIR}/comm-release +WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi .if ! ${PORT_OPTIONS:MMAILNEWS} -EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ - ${FILESDIR}/extra-patch-configure.in MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP @@ -97,7 +94,7 @@ RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg EM_DISTNAME= enigmail-${EM_VERSION} EM_DISTFILE= ${EM_DISTNAME}.tar.gz -EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi +EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-${OPSYS:L}-${ARCH:S/amd64/x86_64/}.xpi EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} EM_ID= ${PORTNAME}@mozilla-enigmail.org EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ @@ -116,7 +113,7 @@ MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.freebsd${OSREL}-${ARCH:S/amd64/x86_64/}.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:L}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@seamonkey.mozilla.org .else Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Wed Aug 14 20:05:55 2013 (r1315) +++ trunk/www/seamonkey/distinfo Thu Aug 15 17:32:44 2013 (r1316) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.20.source.tar.bz2) = 17463fbbfe75a52317bbfb09e25dfce45539914f0559cdfe95f545408a8084fd -SIZE (seamonkey-2.20.source.tar.bz2) = 139969292 +SHA256 (thunderbird-24.0b1.source.tar.bz2) = 01f5d75522ef6288f6cbe8d5a89aa0675754549d4eaf787d9d6d3c581705b7ff +SIZE (thunderbird-24.0b1.source.tar.bz2) = 140053005 SHA256 (enigmail-1.5.2.tar.gz) = f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26 SIZE (enigmail-1.5.2.tar.gz) = 1211395 Deleted: trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk ============================================================================== --- trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk Thu Aug 15 17:32:44 2013 (r1315) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- bridge/bridge.mk.orig 2012-03-13 06:23:10.000000000 +0100 -+++ bridge/bridge.mk 2012-03-14 12:28:03.000000000 +0100 -@@ -47,8 +47,10 @@ - APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork - #endif - -+ifdef disabled - APP_LIBXUL_DIRS += \ - $(DEPTH)$(SUBDIR)/mailnews \ - $(NULL) -+endif Deleted: trunk/www/seamonkey/files/extra-patch-configure.in ============================================================================== --- trunk/www/seamonkey/files/extra-patch-configure.in Thu Aug 15 17:32:44 2013 (r1315) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- configure.in.orig 2012-03-14 14:18:03.000000000 +0100 -+++ configure.in 2012-03-14 14:18:25.000000000 +0100 -@@ -837,11 +837,6 @@ - AC_PROG_CPP - AC_PROG_CXXCPP - --MAIL_COMPONENT="mail msgsmime import" --export MAIL_COMPONENT --MAIL_MODULE="MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule)" --export MAIL_MODULE -- - if test -n "$_WIN32_MSVC"; then - SKIP_PATH_CHECKS=1 - SKIP_COMPILER_CHECKS=1 Deleted: trunk/www/seamonkey/files/patch-bug722975 ============================================================================== --- trunk/www/seamonkey/files/patch-bug722975 Thu Aug 15 17:32:44 2013 (r1315) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,61 +0,0 @@ -# HG changeset patch -# Parent 9d3c9b863c697634e434b687d456bb82fa794ecf -# User Uli Schlachter -Bug 722975 - --enable-system-cairo build is broken after Bug 715658 fixed - - -diff --git a/mozilla/gfx/thebes/gfxPlatform.cpp b/mozilla/gfx/thebes/gfxPlatform.cpp ---- mozilla/gfx/thebes/gfxPlatform.cpp -+++ mozilla/gfx/thebes/gfxPlatform.cpp -@@ -502,21 +502,19 @@ struct SourceSurfaceUserData - BackendType mBackendType; - }; - - void SourceBufferDestroy(void *srcSurfUD) - { - delete static_cast(srcSurfUD); - } - --void SourceSnapshotDetached(cairo_surface_t *nullSurf) -+void SourceSnapshotDetached(void *nullSurf) - { -- gfxImageSurface* origSurf = -- static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); -- -+ gfxImageSurface *origSurf = static_cast(nullSurf); - origSurf->SetData(&kSourceSurface, NULL, NULL); - } - - RefPtr - gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) - { - void *userData = aSurface->GetData(&kSourceSurface); - -@@ -621,24 +619,19 @@ gfxPlatform::GetSourceSurfaceForSurface( - } - - srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(), - imgSurface->Stride(), - size, format); - - } - -- cairo_surface_t *nullSurf = -- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); -- cairo_surface_set_user_data(nullSurf, -- &kSourceSurface, -- imgSurface, -- NULL); -- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); -- cairo_surface_destroy(nullSurf); -+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", -+ (const unsigned char *) "data", 4, -+ SourceSnapshotDetached, imgSurface.get()); - } - - SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData; - srcSurfUD->mBackendType = aTarget->GetType(); - srcSurfUD->mSrcSurface = srcBuffer; - aSurface->SetData(&kSourceSurface, srcSurfUD, SourceBufferDestroy); - - return srcBuffer; Modified: trunk/www/seamonkey/files/patch-bug783463 ============================================================================== --- trunk/www/seamonkey/files/patch-bug783463 Wed Aug 14 20:05:55 2013 (r1315) +++ trunk/www/seamonkey/files/patch-bug783463 Thu Aug 15 17:32:44 2013 (r1316) @@ -1,14 +1,14 @@ ---- mozilla/gfx/skia/Makefile.in~ -+++ mozilla/gfx/skia/Makefile.in -@@ -339,10 +339,9 @@ CPPSRCS += \ - SkMMapStream.cpp \ - SkOSFile.cpp \ - $(NULL) --ifeq (Linux,$(OS_TARGET)) -+ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET)))) - CPPSRCS += \ - SkFontHost_linux.cpp \ -- SkFontHost_tables.cpp \ - SkTime_Unix.cpp \ - $(NULL) - endif +--- mozilla/gfx/skia/moz.build~ ++++ mozilla/gfx/skia/moz.build +@@ -188,10 +188,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt + 'SkMMapStream.cpp', + 'SkOSFile.cpp', + ] +- if CONFIG['OS_TARGET'] == 'Linux': ++ if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux': + CPP_SOURCES += [ + 'SkFontHost_linux.cpp', +- 'SkFontHost_tables.cpp', + 'SkThread_pthread.cpp', + 'SkTime_Unix.cpp', + ] Modified: trunk/www/seamonkey/files/patch-bug803480 ============================================================================== --- trunk/www/seamonkey/files/patch-bug803480 Wed Aug 14 20:05:55 2013 (r1315) +++ trunk/www/seamonkey/files/patch-bug803480 Thu Aug 15 17:32:44 2013 (r1316) @@ -75,15 +75,28 @@ dnl dnl option to disable cookies diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in -index 39d7364..e8d276b 100644 +index 26dbd79..4cbf912 100644 --- mozilla/netwerk/wifi/Makefile.in +++ mozilla/netwerk/wifi/Makefile.in -@@ -41,7 +41,7 @@ CPPSRCS += nsWifiScannerSolaris.cpp +@@ -20,7 +20,7 @@ ifeq ($(OS_ARCH),SunOS) OS_INCLUDES += $(GLIB_CFLAGS) endif -ifdef MOZ_ENABLE_DBUS +ifdef NECKO_WIFI_DBUS - CPPSRCS += nsWifiScannerDBus.cpp OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS) endif + +diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build +index 5e70211..07b01de 100644 +--- mozilla/netwerk/wifi/moz.build ++++ mozilla/netwerk/wifi/moz.build +@@ -43,7 +43,7 @@ elif CONFIG['OS_ARCH'] == 'SunOS': + 'nsWifiScannerSolaris.cpp', + ] + +-if CONFIG['MOZ_ENABLE_DBUS']: ++if CONFIG['NECKO_WIFI_DBUS']: + CPP_SOURCES += [ + 'nsWifiScannerDBus.cpp', + ] Modified: trunk/www/seamonkey/files/patch-bug807492 ============================================================================== --- trunk/www/seamonkey/files/patch-bug807492 Wed Aug 14 20:05:55 2013 (r1315) +++ trunk/www/seamonkey/files/patch-bug807492 Thu Aug 15 17:32:44 2013 (r1316) @@ -1,19 +1,4 @@ -diff --git config/system-headers config/system-headers -index 9bd1efa..1095a01 100644 ---- mozilla/config/system-headers -+++ mozilla/config/system-headers -@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h - gst/app/gstappsrc.h - gst/video/video.h - sys/msg.h - sys/ipc.h - sys/thr.h - sys/user.h - kvm.h - spawn.h -+err.h -+xlocale.h -diff --git configure.in configure.in +JJdiff --git configure.in configure.in index c167461..8346c11 100644 --- mozilla/configure.in +++ mozilla/configure.in @@ -36,21 +21,6 @@ ;; esac fi -diff --git js/src/config/system-headers js/src/config/system-headers -index 9bd1efa..1095a01 100644 ---- mozilla/js/src/config/system-headers -+++ mozilla/js/src/config/system-headers -@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h - gst/app/gstappsrc.h - gst/video/video.h - sys/msg.h - sys/ipc.h - sys/thr.h - sys/user.h - kvm.h - spawn.h -+err.h -+xlocale.h diff --git media/mtransport/objs.mk media/mtransport/objs.mk index f1fc85f..141e8ca 100644 --- mozilla/media/mtransport/objs.mk @@ -581,1288 +551,6 @@ ifeq ($(OS_TARGET),Darwin) LIBS += \ -framework AudioToolbox \ -diff --git media/webrtc/trunk/webrtc/build/common.gypi media/webrtc/trunk/webrtc/build/common.gypi -index 9ca9f7c..d5c4ab9 100644 ---- mozilla/media/webrtc/trunk/webrtc/build/common.gypi -+++ mozilla/media/webrtc/trunk/webrtc/build/common.gypi -@@ -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, - - # Switch between Android audio device OpenSL ES implementation - # and Java Implementation - 'enable_android_opensl%': 0, - }], -+ ['OS=="linux" or OS=="solaris" or os_bsd==1', { -+ 'include_v4l2_video_capture%': 1, -+ }, { -+ 'include_v4l2_video_capture%': 0, -+ }], - ['OS=="ios"', { - 'enable_video%': 0, - 'enable_protobuf%': 0, - 'build_libjpeg%': 0, - 'build_libyuv%': 0, - 'build_libvpx%': 0, - 'include_tests%': 0, - }], -@@ -205,16 +210,28 @@ - 'defines': ['WEBRTC_ARCH_ARM_NEON', - 'WEBRTC_BUILD_NEON_LIBS', - 'WEBRTC_DETECT_ARM_NEON'], - }], - ], - }], - ], - }], -+ ['os_bsd==1', { -+ 'defines': [ -+ 'WEBRTC_BSD', -+ 'WEBRTC_THREAD_RR', -+ ], -+ }], -+ ['OS=="dragonfly" or OS=="netbsd"', { -+ 'defines': [ -+ # doesn't support pthread_condattr_setclock -+ 'WEBRTC_CLOCK_TYPE_REALTIME', -+ ], -+ }], - ['OS=="ios"', { - 'defines': [ - 'WEBRTC_MAC', - 'WEBRTC_IOS', - 'WEBRTC_THREAD_RR', - 'WEBRTC_CLOCK_TYPE_REALTIME', - ], - }], -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 ---- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc -+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc -@@ -41,17 +41,17 @@ bool AudioDeviceUtility::StringCompare( - const char* str1 , const char* str2, - const WebRtc_UWord32 length) - { - return ((_strnicmp(str1, str2, length) == 0) ? true : false); - } - - } // namespace webrtc - --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - // ============================================================================ - // Linux & Mac - // ============================================================================ - - #include // gettimeofday - #include // gettimeofday - #include // strncasecmp -@@ -104,11 +104,11 @@ WebRtc_UWord32 AudioDeviceUtility::GetTimeInMS() - bool AudioDeviceUtility::StringCompare( - const char* str1 , const char* str2, const WebRtc_UWord32 length) - { - return (strncasecmp(str1, str2, length) == 0)?true: false; - } - - } // namespace webrtc - --#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - -diff --git media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc -index bdad224..39e1132 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc -+++ mozilla/media/webrtc/trunk/webrtc/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. - */ - - #include "modules/rtp_rtcp/source/forward_error_correction.h" - - #include - #include -+#include // for abs() - #include - #include - - #include "modules/rtp_rtcp/source/forward_error_correction_internal.h" - #include "modules/rtp_rtcp/source/rtp_utility.h" - #include "system_wrappers/interface/trace.h" - - namespace webrtc { -diff --git media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc -index 298d479..37b70c9 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc -+++ mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc -@@ -13,17 +13,17 @@ - #include - #include // ceil - #include // memcpy - - #if defined(_WIN32) - #include // FILETIME - #include // timeval - #include // timeGetTime --#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - #include // gettimeofday - #include - #endif - #if (defined(_DEBUG) && defined(_WIN32) && (_MSC_VER >= 1400)) - #include - #endif - - #include "system_wrappers/interface/tick_util.h" -@@ -151,17 +151,17 @@ void get_time(WindowsHelpTimer* help_timer, FILETIME& current_time) { - virtual WebRtc_Word64 GetTimeInMS(); - - virtual void CurrentNTP(WebRtc_UWord32& secs, WebRtc_UWord32& frac); - - private: - WindowsHelpTimer* _helpTimer; - }; - --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - // A clock reading times from the POSIX API. - class UnixSystemClock : public RtpRtcpClock { - public: - UnixSystemClock() {} - virtual ~UnixSystemClock() {} - - virtual WebRtc_Word64 GetTimeInMS(); -@@ -209,17 +209,17 @@ void WindowsSystemClock::CurrentNTP(WebRtc_UWord32& secs, - } else if (dtemp < -1) { - dtemp += 1; - secs--; - } - dtemp *= NTP_FRAC; - frac = (WebRtc_UWord32)dtemp; - } - --#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - - WebRtc_Word64 UnixSystemClock::GetTimeInMS() { - return TickTime::MillisecondTimestamp(); - } - - // Use the system time. - void UnixSystemClock::CurrentNTP(WebRtc_UWord32& secs, WebRtc_UWord32& frac) { - double dtemp; -@@ -248,17 +248,17 @@ void UnixSystemClock::CurrentNTP(WebRtc_UWord32& secs, WebRtc_UWord32& frac) { - // Note that this is a POD. Only PODs are allowed to have static storage - // duration according to the Google Style guide. - static WindowsHelpTimer global_help_timer = {0, 0, {{ 0, 0}, 0}, 0}; - #endif - - RtpRtcpClock* GetSystemClock() { - #if defined(_WIN32) - return new WindowsSystemClock(&global_help_timer); --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return new UnixSystemClock(); - #else - return NULL; - #endif - } - - WebRtc_UWord32 GetCurrentRTP(RtpRtcpClock* clock, WebRtc_UWord32 freq) { - const bool use_global_clock = (clock == NULL); -@@ -325,17 +325,17 @@ WebRtc_UWord16 GetPayloadDataLength(const WebRtcRTPHeader* rtp_header, - return static_cast(length); - } - - #if defined(_WIN32) - bool StringCompare(const char* str1, const char* str2, - const WebRtc_UWord32 length) { - return (_strnicmp(str1, str2, length) == 0) ? true : false; - } --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - bool StringCompare(const char* str1, const char* str2, - const WebRtc_UWord32 length) { - return (strncasecmp(str1, str2, length) == 0) ? true : false; - } - #endif - - #if !defined(WEBRTC_LITTLE_ENDIAN) && !defined(WEBRTC_BIG_ENDIAN) - #error Either WEBRTC_LITTLE_ENDIAN or WEBRTC_BIG_ENDIAN must be defined -diff --git media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc -index e50db5d..70ad8a8 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc -+++ mozilla/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc -@@ -13,60 +13,62 @@ - #include - #include - #include - #include - - #if defined(_WIN32) - #include - #include --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - #include - #include - #include - #include -+#include - #include - #include - #include - #include --#include - #include - #include - #ifndef WEBRTC_IOS - #include - #endif - #endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) - - #if defined(WEBRTC_MAC) --#include - #include - #endif -+#if defined(WEBRTC_BSD) || defined(WEBRTC_MAC) -+#include -+#endif - #if defined(WEBRTC_LINUX) - #include - #include - #endif - - #include "common_types.h" - #include "critical_section_wrapper.h" - #include "rw_lock_wrapper.h" - #include "trace.h" - #include "typedefs.h" - #include "udp_socket_manager_wrapper.h" - --#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - #define GetLastError() errno - - #define IFRSIZE ((int)(size * sizeof (struct ifreq))) - - #define NLMSG_OK_NO_WARNING(nlh,len) \ - ((len) >= (int)sizeof(struct nlmsghdr) && \ - (int)(nlh)->nlmsg_len >= (int)sizeof(struct nlmsghdr) && \ - (int)(nlh)->nlmsg_len <= (len)) - --#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - namespace webrtc { - - class SocketFactory : public UdpTransportImpl::SocketFactoryInterface { - public: - UdpSocketWrapper* CreateSocket(const WebRtc_Word32 id, - UdpSocketManager* mgr, - CallbackObj obj, -@@ -2366,17 +2368,17 @@ WebRtc_UWord32 UdpTransport::InetAddrIPV4(const char* ip) - { - return ::inet_addr(ip); - } - - WebRtc_Word32 UdpTransport::InetPresentationToNumeric(WebRtc_Word32 af, - const char* src, - void* dst) - { --#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - const WebRtc_Word32 result = inet_pton(af, src, dst); - return result > 0 ? 0 : -1; - - #elif defined(_WIN32) - SocketAddress temp; - int length=sizeof(SocketAddress); - - if(af == AF_INET) -@@ -2488,17 +2490,17 @@ WebRtc_Word32 UdpTransport::LocalHostAddressIPV6(char n_localIP[16]) - break; - }; - } - freeaddrinfo(result); - WEBRTC_TRACE(kTraceWarning, kTraceTransport, -1, - "getaddrinfo failed to find address"); - return -1; - --#elif defined(WEBRTC_MAC) -+#elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - struct ifaddrs* ptrIfAddrs = NULL; - struct ifaddrs* ptrIfAddrsStart = NULL; - - getifaddrs(&ptrIfAddrsStart); - ptrIfAddrs = ptrIfAddrsStart; - while(ptrIfAddrs) - { - if(ptrIfAddrs->ifa_addr->sa_family == AF_INET6) -@@ -2680,17 +2682,17 @@ WebRtc_Word32 UdpTransport::LocalHostAddress(WebRtc_UWord32& localIP) - } - else - { - WebRtc_Word32 error = WSAGetLastError(); - WEBRTC_TRACE(kTraceWarning, kTraceTransport, -1, - "gethostbyname failed, error:%d", error); - return -1; - } --#elif (defined(WEBRTC_MAC)) -+#elif (defined(WEBRTC_BSD) || defined(WEBRTC_MAC)) - char localname[255]; - if (gethostname(localname, 255) != -1) - { - hostent* localHost; - localHost = gethostbyname(localname); - if(localHost) - { - if(localHost->h_addrtype != AF_INET) -@@ -2819,17 +2821,17 @@ WebRtc_Word32 UdpTransport::IPAddress(const SocketAddress& address, - } - - source_port = address._sockaddr_in6.sin6_port; - } - // Convert port number to network byte order. - sourcePort = htons(source_port); - return 0; - -- #elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+ #elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - WebRtc_Word32 ipFamily = address._sockaddr_storage.sin_family; - const void* ptrNumericIP = NULL; - - if(ipFamily == AF_INET) - { - ptrNumericIP = &(address._sockaddr_in.sin_addr); - } - else if(ipFamily == AF_INET6) -diff --git media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc -index 69a52ec..7ac226c 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc -+++ mozilla/media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc -@@ -14,17 +14,17 @@ - #include - - #include "critical_section_wrapper.h" - #include "trace.h" - - #if defined(_WIN32) - #include - #include --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - #include - #include - #include - #endif - - #if (defined(_DEBUG) && defined(_WIN32)) - #define DEBUG_PRINT(expr) OutputDebugString(##expr) - #define DEBUG_PRINTP(expr, p) \ -@@ -233,17 +233,17 @@ bool RtpDumpImpl::RTCP(const WebRtc_UWord8* packet) const - return is_rtcp; - } - - // TODO (hellner): why is TickUtil not used here? - inline WebRtc_UWord32 RtpDumpImpl::GetTimeInMS() const - { - #if defined(_WIN32) - return timeGetTime(); --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - struct timeval tv; - struct timezone tz; - unsigned long val; - - gettimeofday(&tv, &tz); - val = tv.tv_sec * 1000 + tv.tv_usec / 1000; - return val; - #else -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 653ee16..8d6fd68 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc -+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc -@@ -14,17 +14,23 @@ - #include - #include - #include - #include - #include - #include - - //v4l includes -+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include -+#elif defined(__sun) -+#include -+#else - #include -+#endif - - #include "ref_count.h" - #include "trace.h" - - - namespace webrtc - { - namespace videocapturemodule -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..424ea0a 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc -+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/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. - */ - - #include - #include - #include - #include --#include - #include - #include - #include - #include - -+//v4l includes -+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include -+#elif defined(__sun) -+#include -+#else -+#include -+#endif -+ - #include - - #include "ref_count.h" - #include "trace.h" - #include "thread_wrapper.h" - #include "critical_section_wrapper.h" - #include "video_capture_linux.h" - -diff --git media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc -index e3f7bb5..882cede 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc -+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc -@@ -49,17 +49,17 @@ WebRtc_Word32 DeviceInfoImpl::NumberOfCapabilities( - if (!deviceUniqueIdUTF8) - return -1; - - _apiLock.AcquireLockShared(); - - if (_lastUsedDeviceNameLength == strlen((char*) deviceUniqueIdUTF8)) - { - // Is it the same device that is asked for again. --#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) -+#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - if(strncasecmp((char*)_lastUsedDeviceName, - (char*) deviceUniqueIdUTF8, - _lastUsedDeviceNameLength)==0) - #else - if (_strnicmp((char*) _lastUsedDeviceName, - (char*) deviceUniqueIdUTF8, - _lastUsedDeviceNameLength) == 0) - #endif -@@ -86,17 +86,17 @@ WebRtc_Word32 DeviceInfoImpl::GetCapability(const char* deviceUniqueIdUTF8, - { - WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id, - "deviceUniqueIdUTF8 parameter not set in call to GetCapability"); - return -1; - } - ReadLockScoped cs(_apiLock); - - if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8)) --#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) -+#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - || (strncasecmp((char*)_lastUsedDeviceName, - (char*) deviceUniqueIdUTF8, - _lastUsedDeviceNameLength)!=0)) - #else - || (_strnicmp((char*) _lastUsedDeviceName, - (char*) deviceUniqueIdUTF8, - _lastUsedDeviceNameLength) != 0)) - #endif -@@ -150,17 +150,17 @@ WebRtc_Word32 DeviceInfoImpl::GetBestMatchedCapability( - { - - - if (!deviceUniqueIdUTF8) - return -1; - - ReadLockScoped cs(_apiLock); - if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8)) --#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) -+#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - || (strncasecmp((char*)_lastUsedDeviceName, - (char*) deviceUniqueIdUTF8, - _lastUsedDeviceNameLength)!=0)) - #else - || (_strnicmp((char*) _lastUsedDeviceName, - (char*) deviceUniqueIdUTF8, - _lastUsedDeviceNameLength) != 0)) - #endif -diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi -index 0a9765e..8d4bbf4 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi -+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi -@@ -43,17 +43,17 @@ - 'conditions': [ - ['include_internal_video_capture==0', { - 'sources': [ - 'external/device_info_external.cc', - 'external/video_capture_external.cc', - ], - }, { # include_internal_video_capture == 1 - 'conditions': [ -- ['OS=="linux"', { -+ ['include_v4l2_video_capture==1', { - 'include_dirs': [ - 'linux', - ], - 'sources': [ - 'linux/device_info_linux.cc', - 'linux/device_info_linux.h', - 'linux/video_capture_linux.cc', - 'linux/video_capture_linux.h', -@@ -152,31 +152,35 @@ - 'include_dirs': [ - 'include', - ], - 'sources': [ - 'test/video_capture_unittest.cc', - 'test/video_capture_main_mac.mm', - ], - 'conditions': [ -- ['OS=="mac" or OS=="linux"', { -+ ['OS!="win" and OS!="android"', { - 'cflags': [ - '-Wno-write-strings', - ], - 'ldflags': [ - '-lpthread -lm', - ], - }], -- ['OS=="linux"', { -+ ['include_v4l2_video_capture==1', { - 'libraries': [ -- '-lrt', - '-lXext', - '-lX11', - ], - }], -+ ['OS=="linux"', { -+ 'libraries': [ -+ '-lrt', -+ ], -+ }], - ['OS=="mac"', { - 'dependencies': [ - # Link with a special main for mac so we can use the webcam. - '<(webrtc_root)/test/test.gyp:test_support_main_threaded_mac', - ], - 'xcode_settings': { - # TODO(andrew): CoreAudio and AudioToolbox shouldn't be needed. - 'OTHER_LDFLAGS': [ -diff --git media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h -index 0cd85d0..45591be 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h -@@ -6,17 +6,17 @@ - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_ - #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_ - --#if defined(__linux__) && defined(__ELF__) -+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__) - .section .note.GNU-stack,"",%progbits - #endif - - // Define the macros used in ARM assembly code, so that for Mac or iOS builds - // we add leading underscores for the function names. - #ifdef __APPLE__ - .macro GLOBAL_FUNCTION name - .global _\name -diff --git media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h -index 0cd85d0..45591be 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h -@@ -189,17 +189,17 @@ inline WebRtc_Word64 TickTime::QueryOsForTicks() { - // 0x0fffffff ~3.1 days, the code will not take that long to execute - // so it must have been a wrap around. - if (old > 0xf0000000 && now < 0x0fffffff) { - num_wrap_time_get_time++; - } - } - result.ticks_ = now + (num_wrap_time_get_time << 32); - #endif --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - struct timespec ts; - // TODO(wu): Remove CLOCK_REALTIME implementation. - #ifdef WEBRTC_CLOCK_TYPE_REALTIME - clock_gettime(CLOCK_REALTIME, &ts); - #else - clock_gettime(CLOCK_MONOTONIC, &ts); - #endif - result.ticks_ = 1000000000LL * static_cast(ts.tv_sec) + -@@ -236,34 +236,34 @@ inline WebRtc_Word64 TickTime::MillisecondTimestamp() { - #if _WIN32 - #ifdef USE_QUERY_PERFORMANCE_COUNTER - LARGE_INTEGER qpfreq; - QueryPerformanceFrequency(&qpfreq); - return (ticks * 1000) / qpfreq.QuadPart; - #else - return ticks; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ticks / 1000000LL; - #else - return ticks / 1000LL; - #endif - } - - inline WebRtc_Word64 TickTime::MicrosecondTimestamp() { - WebRtc_Word64 ticks = TickTime::Now().Ticks(); - #if _WIN32 - #ifdef USE_QUERY_PERFORMANCE_COUNTER - LARGE_INTEGER qpfreq; - QueryPerformanceFrequency(&qpfreq); - return (ticks * 1000) / (qpfreq.QuadPart / 1000); - #else - return ticks * 1000LL; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ticks / 1000LL; - #else - return ticks; - #endif - } - - inline WebRtc_Word64 TickTime::Ticks() const { - return ticks_; -@@ -273,33 +273,33 @@ inline WebRtc_Word64 TickTime::MillisecondsToTicks(const WebRtc_Word64 ms) { - #if _WIN32 - #ifdef USE_QUERY_PERFORMANCE_COUNTER - LARGE_INTEGER qpfreq; - QueryPerformanceFrequency(&qpfreq); - return (qpfreq.QuadPart * ms) / 1000; - #else - return ms; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ms * 1000000LL; - #else - return ms * 1000LL; - #endif - } - - inline WebRtc_Word64 TickTime::TicksToMilliseconds(const WebRtc_Word64 ticks) { - #if _WIN32 - #ifdef USE_QUERY_PERFORMANCE_COUNTER - LARGE_INTEGER qpfreq; - QueryPerformanceFrequency(&qpfreq); - return (ticks * 1000) / qpfreq.QuadPart; - #else - return ticks; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ticks / 1000000LL; - #else - return ticks / 1000LL; - #endif - } - - inline TickTime& TickTime::operator+=(const WebRtc_Word64& ticks) { - ticks_ += ticks; -@@ -318,17 +318,17 @@ inline WebRtc_Word64 TickInterval::Milliseconds() const { - #ifdef USE_QUERY_PERFORMANCE_COUNTER - LARGE_INTEGER qpfreq; - QueryPerformanceFrequency(&qpfreq); - return (interval_ * 1000) / qpfreq.QuadPart; - #else - // interval_ is in ms - return interval_; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - // interval_ is in ns - return interval_ / 1000000; - #else - // interval_ is usecs - return interval_ / 1000; - #endif - } - -@@ -337,17 +337,17 @@ inline WebRtc_Word64 TickInterval::Microseconds() const { - #ifdef USE_QUERY_PERFORMANCE_COUNTER - LARGE_INTEGER qpfreq; - QueryPerformanceFrequency(&qpfreq); - return (interval_ * 1000000) / qpfreq.QuadPart; - #else - // interval_ is in ms - return interval_ * 1000LL; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - // interval_ is in ns - return interval_ / 1000; - #else - // interval_ is usecs - return interval_; - #endif - } - -diff --git media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_posix.cc media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_posix.cc -index 05b0e57..993456c 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_posix.cc -+++ mozilla/media/webrtc/trunk/webrtc/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. - */ - - #include "atomic32.h" - - #include - #include --#include - - #include "common_types.h" - - namespace webrtc { - - Atomic32::Atomic32(WebRtc_Word32 initial_value) - : value_(initial_value) { - assert(Is32bitAligned()); -diff --git media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable.cc media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable.cc -index b37d037..fcea221 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable.cc -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable.cc -@@ -3,31 +3,33 @@ - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -+#include "condition_variable_wrapper.h" -+ - #if defined(_WIN32) - #include - #include "condition_variable_win.h" --#include "condition_variable_wrapper.h" --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - #include - #include "condition_variable_posix.h" --#include "condition_variable_wrapper.h" -+#else -+#include // for NULL - #endif - - namespace webrtc { - - ConditionVariableWrapper* ConditionVariableWrapper::CreateConditionVariable() { - #if defined(_WIN32) - return new ConditionVariableWindows; --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ConditionVariablePosix::Create(); - #else - return NULL; - #endif - } - - } // namespace webrtc -diff --git media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc -index 48835ab..16c6033 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc -@@ -74,17 +74,17 @@ void ConditionVariablePosix::SleepCS(CriticalSectionWrapper& crit_sect) { - &crit_sect); - pthread_cond_wait(&cond_, &cs->mutex_); - } - - bool ConditionVariablePosix::SleepCS(CriticalSectionWrapper& crit_sect, - unsigned long max_time_inMS) { - const unsigned long INFINITE = 0xFFFFFFFF; - const int MILLISECONDS_PER_SECOND = 1000; --#ifndef WEBRTC_LINUX -+#if !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - const int MICROSECONDS_PER_MILLISECOND = 1000; - #endif - const int NANOSECONDS_PER_SECOND = 1000000000; - const int NANOSECONDS_PER_MILLISECOND = 1000000; - - CriticalSectionPosix* cs = reinterpret_cast( - &crit_sect); - -diff --git media/webrtc/trunk/webrtc/system_wrappers/source/cpu.cc media/webrtc/trunk/webrtc/system_wrappers/source/cpu.cc -index 3df5d18..4cd3ddf 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu.cc -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu.cc -@@ -9,28 +9,28 @@ - */ - - #include "system_wrappers/interface/cpu_wrapper.h" - - #if defined(_WIN32) - #include "cpu_win.h" - #elif defined(WEBRTC_MAC) - #include "cpu_mac.h" --#elif defined(WEBRTC_ANDROID) -+#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - // Not implemented yet, might be possible to use Linux implementation - #else // defined(WEBRTC_LINUX) - #include "cpu_linux.h" - #endif - - namespace webrtc { - CpuWrapper* CpuWrapper::CreateCpu() { - #if defined(_WIN32) - return new CpuWindows(); - #elif defined(WEBRTC_MAC) - return new CpuWrapperMac(); --#elif defined(WEBRTC_ANDROID) -+#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - return 0; - #else - return new CpuLinux(); - #endif - } - - } // namespace webrtc -diff --git media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc -index e367abf..e14d7af 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc -@@ -7,23 +7,25 @@ - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - #include "system_wrappers/interface/cpu_info.h" - - #if defined(_WIN32) - #include --#elif defined(WEBRTC_MAC) --#include -+#elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - #include -+#include - #elif defined(WEBRTC_ANDROID) - // Not implemented yet, might be possible to use Linux implementation --#else // defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) - #include -+#else // defined(_SC_NPROCESSORS_ONLN) -+#include - #endif - - #include "trace.h" - - namespace webrtc { - - WebRtc_UWord32 CpuInfo::number_of_cores_ = 0; - -@@ -36,29 +38,38 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCores() { - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Available number of cores:%d", number_of_cores_); - - #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) - number_of_cores_ = get_nprocs(); - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Available number of cores:%d", number_of_cores_); - --#elif defined(WEBRTC_MAC) -- int name[] = {CTL_HW, HW_AVAILCPU}; -+#elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC) -+ int name[] = { -+ CTL_HW, -+#ifdef HW_AVAILCPU -+ HW_AVAILCPU, -+#else -+ HW_NCPU, -+#endif -+ }; - int ncpu; - size_t size = sizeof(ncpu); - if (0 == sysctl(name, 2, &ncpu, &size, NULL, 0)) { - number_of_cores_ = static_cast(ncpu); - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Available number of cores:%d", number_of_cores_); - } else { - WEBRTC_TRACE(kTraceError, kTraceUtility, -1, - "Failed to get number of cores"); - number_of_cores_ = 1; - } -+#elif defined(_SC_NPROCESSORS_ONLN) -+ _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN); - #else - WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1, - "No function to get number of cores"); - number_of_cores_ = 1; - #endif - } - return number_of_cores_; - } -diff --git media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc -index 6334490..852ebaa 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc -@@ -54,16 +54,27 @@ - #ifdef WEBRTC_LINUX - #include - #include - #include - #include - #include - #endif - -+#if defined(__NetBSD__) -+#include -+#elif defined(__FreeBSD__) -+#include -+#include -+#endif -+ -+#if defined(WEBRTC_BSD) && !defined(__NetBSD__) -+#include -+#endif -+ - #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" - #include "webrtc/system_wrappers/interface/event_wrapper.h" - #include "webrtc/system_wrappers/interface/trace.h" - - namespace webrtc { - - int ConvertToSystemPriority(ThreadPriority priority, int min_prio, - int max_prio) { -@@ -136,16 +147,30 @@ ThreadPosix::ThreadPosix(ThreadRunFunction func, ThreadObj obj, - } - } - - uint32_t ThreadWrapper::GetThreadId() { - #if defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX) || defined(WEBRTC_GONK) - return static_cast(syscall(__NR_gettid)); - #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - return pthread_mach_thread_np(pthread_self()); -+#elif defined(__NetBSD__) -+ return _lwp_self(); -+#elif defined(__DragonFly__) -+ return lwp_gettid(); -+#elif defined(__OpenBSD__) -+ return reinterpret_cast (pthread_self()); -+#elif defined(__FreeBSD__) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif - #else - return reinterpret_cast(pthread_self()); - #endif - } - - int ThreadPosix::Construct() { - int result = 0; - #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) -@@ -167,17 +192,17 @@ int ThreadPosix::Construct() { - } - - ThreadPosix::~ThreadPosix() { - pthread_attr_destroy(&attr_); - delete event_; - delete crit_state_; - } - --#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) -+#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) - - bool ThreadPosix::Start(unsigned int& thread_id) - { - if (!run_function_) { - return false; - } - int result = pthread_attr_setdetachstate(&attr_, PTHREAD_CREATE_DETACHED); - // Set the stack stack size to 1M. -@@ -232,31 +257,40 @@ bool ThreadPosix::Start(unsigned int& thread_id) - WEBRTC_TRACE(kTraceError, kTraceUtility, -1, - "unable to set thread priority"); - } - return true; - } - - // CPU_ZERO and CPU_SET are not available in NDK r7, so disable - // SetAffinity on Android for now. --#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK))) -+#if defined(__FreeBSD__) || (defined(WEBRTC_LINUX) && \ -+ (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK))) - bool ThreadPosix::SetAffinity(const int* processor_numbers, - const unsigned int amount_of_processors) { - if (!processor_numbers || (amount_of_processors == 0)) { - return false; - } -+#if defined(__FreeBSD__) -+ cpuset_t mask; -+#else - cpu_set_t mask; -+#endif - CPU_ZERO(&mask); - - for (unsigned int processor = 0; - processor < amount_of_processors; - ++processor) { - CPU_SET(processor_numbers[processor], &mask); - } --#if defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK) -+#if defined(__FreeBSD__) -+ const int result = pthread_setaffinity_np(thread_, -+ sizeof(mask), -+ &mask); -+#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK) - // Android. - const int result = syscall(__NR_sched_setaffinity, - pid_, - sizeof(mask), - &mask); - #else - // "Normal" Linux. - const int result = sched_setaffinity(pid_, -@@ -320,16 +353,20 @@ void ThreadPosix::Run() { - pid_ = GetThreadId(); - #endif - // The event the Start() is waiting for. - event_->Set(); - - if (set_thread_name_) { - #ifdef WEBRTC_LINUX - prctl(PR_SET_NAME, (unsigned long)name_, 0, 0, 0); -+#elif defined(__NetBSD__) -+ pthread_setname_np(pthread_self(), "%s", (void *)name_); -+#elif defined(WEBRTC_BSD) -+ pthread_set_name_np(pthread_self(), name_); - #endif - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Thread with name:%s started ", name_); - } else { - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Thread without name started"); - } - bool alive = true; -diff --git media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc -index 2c7e59a..6f23fcb 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc -@@ -49,17 +49,17 @@ TracePosix::~TracePosix() { - WebRtc_Word32 TracePosix::AddTime(char* trace_message, - const TraceLevel level) const { - struct timeval system_time_high_res; - if (gettimeofday(&system_time_high_res, 0) == -1) { - return -1; - } - struct tm buffer; - const struct tm* system_time = -- localtime_r(&system_time_high_res.tv_sec, &buffer); -+ localtime_r((const time_t *)(&system_time_high_res.tv_sec), &buffer); - - const WebRtc_UWord32 ms_time = system_time_high_res.tv_usec / 1000; - WebRtc_UWord32 prev_tickCount = 0; - if (level == kTraceApiCall) { - prev_tickCount = prev_tick_count_; - prev_tick_count_ = ms_time; - } else { - prev_tickCount = prev_api_tick_count_; -diff --git media/webrtc/trunk/webrtc/typedefs.h media/webrtc/trunk/webrtc/typedefs.h -index 6334490..852ebaa 100644 ---- mozilla/media/webrtc/trunk/webrtc/typedefs.h -+++ mozilla/media/webrtc/trunk/webrtc/typedefs.h -@@ -16,17 +16,17 @@ - - // Reserved words definitions - // TODO(andrew): Remove this. - #define G_CONST const - - // For access to standard POSIXish features, use WEBRTC_POSIX instead of a - // more specific macro. - #if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || \ -- defined(WEBRTC_ANDROID) -+ defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - #define WEBRTC_POSIX - #endif - - // Processor architecture detection. For more info on what's defined, see: - // http://msdn.microsoft.com/en-us/library/b0084kay.aspx - // http://www.agner.org/optimize/calling_conventions.pdf - // or with gcc, run: "echo | gcc -E -dM -" - // TODO(andrew): replace WEBRTC_LITTLE_ENDIAN with WEBRTC_ARCH_LITTLE_ENDIAN. -diff --git media/webrtc/trunk/webrtc/video_engine/vie_defines.h media/webrtc/trunk/webrtc/video_engine/vie_defines.h -index 2cc18cc7..2c042a0 100644 ---- mozilla/media/webrtc/trunk/webrtc/video_engine/vie_defines.h -+++ mozilla/media/webrtc/trunk/webrtc/video_engine/vie_defines.h -@@ -168,17 +168,17 @@ inline int ChannelId(const int moduleId) { - - // Example: "Oct 10 2002 12:05:30 r". - #define BUILDINFO BUILDDATE TEXT(" ") BUILDTIME TEXT(" ") BUILDMODE - #define RENDER_MODULE_TYPE kRenderWindows - #endif - - // Linux specific. - #ifndef WEBRTC_ANDROID --#ifdef WEBRTC_LINUX -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - // Build information macros. - #if defined(_DEBUG) - #define BUILDMODE "d" - #elif defined(DEBUG) - #define BUILDMODE "d" - #elif defined(NDEBUG) - #define BUILDMODE "r" - #else -diff --git media/webrtc/trunk/webrtc/voice_engine/voe_network_impl.cc media/webrtc/trunk/webrtc/voice_engine/voe_network_impl.cc -index 174abca..f8a2b2d 100644 ---- mozilla/media/webrtc/trunk/webrtc/voice_engine/voe_network_impl.cc -+++ mozilla/media/webrtc/trunk/webrtc/voice_engine/voe_network_impl.cc -@@ -467,17 +467,17 @@ int VoENetworkImpl::SetSendTOS(int channel, - int DSCP, - int priority, - bool useSetSockopt) - { - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), - "SetSendTOS(channel=%d, DSCP=%d, useSetSockopt=%d)", - channel, DSCP, useSetSockopt); - --#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_MAC) -+#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) && !defined(WEBRTC_MAC) - _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceWarning, - "SetSendTOS() is not supported on this platform"); - return -1; - #endif - - #ifndef WEBRTC_EXTERNAL_TRANSPORT - if (!_shared->statistics().Initialized()) - { -@@ -523,17 +523,17 @@ int VoENetworkImpl::SetSendTOS(int channel, - return -1; - } - if (channelPtr->ExternalTransport()) - { - _shared->SetLastError(VE_EXTERNAL_TRANSPORT_ENABLED, kTraceError, - "SetSendTOS() external transport is enabled"); - return -1; - } --#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - useSetSockopt = true; - WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_shared->instance_id(), -1), - " force useSetSockopt=true since there is no alternative" - " implementation"); - #endif - - return channelPtr->SetSendTOS(DSCP, priority, useSetSockopt); - #else -@@ -546,17 +546,17 @@ int VoENetworkImpl::SetSendTOS(int channel, - int VoENetworkImpl::GetSendTOS(int channel, - int& DSCP, - int& priority, - bool& useSetSockopt) - { - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), - "GetSendTOS(channel=%d)", channel); - --#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_MAC) -+#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) && !defined(WEBRTC_MAC) - _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceWarning, - "GetSendTOS() is not supported on this platform"); - return -1; - #endif - #ifndef WEBRTC_EXTERNAL_TRANSPORT - if (!_shared->statistics().Initialized()) - { - _shared->SetLastError(VE_NOT_INITED, kTraceError); -diff --git media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h -index 7d4c729..4104719 100644 ---- mozilla/media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h -+++ mozilla/media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h -@@ -409,41 +409,43 @@ namespace webrtc - - #else - #define ANDROID_NOT_SUPPORTED(stat) - #endif // #ifdef WEBRTC_LINUX - - // *** WEBRTC_MAC *** - // including iPhone - --#ifdef WEBRTC_MAC -+#if defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include -+#if !defined(WEBRTC_BSD) - #include - #if !defined(WEBRTC_IOS) - #include - #include - #include - #include - #include - #endif -+#endif - - #define DWORD unsigned long int - #define WINAPI - #define LPVOID void * - #define FALSE 0 - #define TRUE 1 - #define SOCKADDR_IN struct sockaddr_in - #define UINT unsigned int -@@ -526,13 +528,13 @@ namespace webrtc - // Defines - // ---------------------------------------------------------------------------- - - #define IPHONE_NOT_SUPPORTED(stat) - #endif - - #else - #define IPHONE_NOT_SUPPORTED(stat) --#endif // #ifdef WEBRTC_MAC -+#endif // #if defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - - - #endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_DEFINES_H 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 --- mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py Added: trunk/www/seamonkey/files/patch-bug834091 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug834091 Thu Aug 15 17:32:44 2013 (r1316) @@ -0,0 +1,35 @@ +commit 8d8975b +Author: Carmen Jiménez Cabezas +Date: Fri Jan 25 15:36:36 2013 -0800 + + Bug 834091: Verify certificate chain for signed B2G apps as of the current time (now) instead of the signing time, r=bsmith + + --HG-- + extra : amend_source : 86d8ca2b28259aaf41983740b809ef8a51befc4f + extra : rebase_source : e5a1c1199756e929f14852f5c83ba28d097449f4 +--- + .../manager/ssl/src/JARSignatureVerification.cpp | 6 +- + security/nss/lib/pkcs7/p7decode.c | 41 +++- + security/nss/lib/pkcs7/secpkcs7.h | 17 ++ + security/nss/lib/smime/smime.def | 6 + + security/patches/README | 4 + + security/patches/bug-834091.patch | 216 +++++++++++++++++++++ + 6 files changed, 281 insertions(+), 9 deletions(-) + +diff --git security/manager/ssl/src/JARSignatureVerification.cpp security/manager/ssl/src/JARSignatureVerification.cpp +index d0a8b98..8e694d3 100644 +--- mozilla/security/manager/ssl/src/JARSignatureVerification.cpp ++++ mozilla/security/manager/ssl/src/JARSignatureVerification.cpp +@@ -586,9 +586,9 @@ + } + + // Verify that the signature file is a valid signature of the SF file +- if (!SEC_PKCS7VerifyDetachedSignatureAtTime(p7_info, certUsageObjectSigner, +- &sfCalculatedDigest.get(), +- HASH_AlgSHA1, false, PR_Now())) { ++ if (!SEC_PKCS7VerifyDetachedSignature(p7_info, certUsageObjectSigner, ++ &sfCalculatedDigest.get(), HASH_AlgSHA1, ++ false)) { + PRErrorCode error = PR_GetError(); + const char * errorName = PR_ErrorToName(error); + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to verify detached signature: %s", Deleted: trunk/www/seamonkey/files/patch-bug844818 ============================================================================== --- trunk/www/seamonkey/files/patch-bug844818 Thu Aug 15 17:32:44 2013 (r1315) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,126 +0,0 @@ -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/webrtc/modules/audio_device/audio_device.gypi media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi -index 8457737..dfc83ff 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi -+++ mozilla/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 ---- 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, Added: trunk/www/seamonkey/files/patch-bug876156 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug876156 Thu Aug 15 17:32:44 2013 (r1316) @@ -0,0 +1,13 @@ +diff --git mfbt/Atomics.h mfbt/Atomics.h +index d79af6c..40b9336 100644 +--- mozilla/mfbt/Atomics.h ++++ mozilla/mfbt/Atomics.h +@@ -35,7 +35,7 @@ + */ + # if !defined(__linux__) && !defined(__OpenBSD__) && \ + (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \ +- __has_include() ++ __has_include_next() + # define MOZ_HAVE_CXX11_ATOMICS + # endif + /* Modified: trunk/www/seamonkey/files/patch-bug893397 ============================================================================== --- trunk/www/seamonkey/files/patch-bug893397 Wed Aug 14 20:05:55 2013 (r1315) +++ trunk/www/seamonkey/files/patch-bug893397 Thu Aug 15 17:32:44 2013 (r1316) @@ -11,21 +11,21 @@ NECKO_WIFI=1 ;; Linux) -diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in +diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build index 07b01de..11706af 100644 ---- mozilla/netwerk/wifi/Makefile.in -+++ mozilla/netwerk/wifi/Makefile.in -@@ -32,6 +32,10 @@ CPPSRCS += nsWifiScannerMac.cpp - CMMSRCS = osx_corewlan.mm - endif - -+ifeq ($(OS_ARCH),FreeBSD) -+CPPSRCS += nsWifiScannerFreeBSD.cpp -+endif -+ - ifneq (,$(filter WINNT,$(OS_ARCH))) - CPPSRCS += nsWifiScannerWin.cpp - endif +--- mozilla/netwerk/wifi/moz.build ++++ mozilla/netwerk/wifi/moz.build +@@ -34,6 +34,10 @@ if CONFIG['OS_ARCH'] == 'Darwin': + CMMSRCS += [ + 'osx_corewlan.mm', + ] ++elif CONFIG['OS_ARCH'] == 'FreeBSD': ++ CPP_SOURCES += [ ++ 'nsWifiScannerFreeBSD.cpp', ++ ] + elif CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsWifiScannerWin.cpp', diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp new file mode 100644 index 0000000..80d4cb6 Deleted: trunk/www/seamonkey/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp Thu Aug 15 17:32:44 2013 (r1315) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- mozilla/js/src/methodjit/MethodJIT.cpp~ -+++ mozilla/js/src/methodjit/MethodJIT.cpp -@@ -171,7 +171,7 @@ - - JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); - --#if defined(__linux__) && defined(JS_CPU_X64) -+#if defined(__ELF__) && defined(JS_CPU_X64) - # define SYMBOL_STRING_RELOC(name) #name "@plt" - #else - # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) -@@ -149,7 +149,7 @@ - - #if defined(XP_MACOSX) - # define HIDE_SYMBOL(name) ".private_extern _" #name --#elif defined(__linux__) -+#elif defined(__ELF__) - # define HIDE_SYMBOL(name) ".hidden" #name - #else - # define HIDE_SYMBOL(name) Deleted: trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h Thu Aug 15 17:32:44 2013 (r1315) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,17 +0,0 @@ ---- mozilla/media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h.orig 2012-12-09 16:28:45.641625374 +0100 -+++ mozilla/media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h 2012-12-09 19:09:11.664625374 +0100 -@@ -490,10 +490,10 @@ - # define GTEST_ENV_HAS_TR1_TUPLE_ 1 - # endif - --// C++11 specifies that provides std::tuple. Users can't use --// gtest in C++11 mode until their standard library is at least that --// compliant. --# if GTEST_LANG_CXX11 -+// C++11 specifies that provides std::tuple. Use that if gtest is used -+// in C++11 mode and libstdc++ isn't very old (binaries targeting OS X 10.6 -+// can build with clang but need to use gcc4.2's libstdc++). -+# if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325) - # define GTEST_ENV_HAS_STD_TUPLE_ 1 - # endif -