From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 21 22:05:13 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 97054398 for ; Fri, 21 Jun 2013 22:05:13 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id AD35B1C0A for ; Fri, 21 Jun 2013 22:05:12 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r5LM55d5035761 for ; Fri, 21 Jun 2013 22:05:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r5LM50e7031345 for freebsd-gecko@freebsd.org; Fri, 21 Jun 2013 22:05:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 21 Jun 2013 22:05:00 GMT Message-Id: <201306212205.r5LM50e7031345@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] r1270 - in trunk/www: firefox firefox-nightly firefox-nightly/files seamonkey 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: Fri, 21 Jun 2013 22:05:13 -0000 Author: jbeich Date: Fri Jun 21 22:04:59 2013 New Revision: 1270 Log: update Added: trunk/www/seamonkey/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm Deleted: trunk/www/firefox-nightly/files/patch-bug844818 trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h trunk/www/seamonkey/files/patch-bug685258 trunk/www/seamonkey/files/patch-bug780432 trunk/www/seamonkey/files/patch-bug824317 trunk/www/seamonkey/files/patch-bug836824 trunk/www/seamonkey/files/patch-clang33 trunk/www/seamonkey/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c Modified: trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-bug807492 trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo trunk/www/seamonkey/files/extra-bug780531 trunk/www/seamonkey/files/patch-bug807492 trunk/www/seamonkey/files/patch-bug826985 Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/firefox-nightly/Makefile.hgrev Fri Jun 21 22:04:59 2013 (r1270) @@ -1 +1 @@ -HGREV= 134789:68760713a30f +HGREV= 135870:7ba8c86f1a56 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/firefox-nightly/distinfo Fri Jun 21 22:04:59 2013 (r1270) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/68760713a30f.tar.bz2) = 8e8a46924f49d8a21bda71157326fbd6bd9affc1b8f3a9cabed777b4d0641b7e -SIZE (firefox-nightly/68760713a30f.tar.bz2) = 112736843 +SHA256 (firefox-nightly/7ba8c86f1a56.tar.bz2) = dd1ffa666ed7b3e2f6d85e980b8172615536eb938080d45b1327a9b3530bf84e +SIZE (firefox-nightly/7ba8c86f1a56.tar.bz2) = 113520736 Modified: trunk/www/firefox-nightly/files/patch-bug807492 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug807492 Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/firefox-nightly/files/patch-bug807492 Fri Jun 21 22:04:59 2013 (r1270) @@ -1,19 +1,4 @@ -diff --git config/system-headers config/system-headers -index 9bd1efa..1095a01 100644 ---- config/system-headers -+++ 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 --- configure.in +++ configure.in @@ -36,21 +21,6 @@ ;; esac fi -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 -@@ -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 --- 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 ---- media/webrtc/trunk/webrtc/build/common.gypi -+++ 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 ---- media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc -+++ 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 ---- media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc -+++ 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 ---- media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc -+++ 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 ---- media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc -+++ 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 ---- media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc -+++ 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 ---- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc -+++ 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 ---- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc -+++ 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 ---- media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc -+++ 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 ---- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi -+++ 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 ---- media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h -+++ 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 ---- media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h -+++ 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 ---- media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_posix.cc -+++ 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 ---- media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable.cc -+++ 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 ---- media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc -+++ 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 ---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu.cc -+++ 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 ---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc -+++ 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 ---- media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc -+++ 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 ---- media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc -+++ 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 ---- media/webrtc/trunk/webrtc/typedefs.h -+++ 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 ---- media/webrtc/trunk/webrtc/video_engine/vie_defines.h -+++ 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 ---- media/webrtc/trunk/webrtc/voice_engine/voe_network_impl.cc -+++ 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 ---- media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h -+++ 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 --- media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py Deleted: trunk/www/firefox-nightly/files/patch-bug844818 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug844818 Fri Jun 21 22:04:59 2013 (r1269) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,214 +0,0 @@ -diff --git configure.in configure.in -index f1111a0..2e83433 100644 ---- configure.in -+++ configure.in -@@ -9132,6 +9132,18 @@ if test -n "$ARM_ARCH"; then - 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 ssse3/sse4.1 code if toolchain doesn't support - if test -z "$HAVE_TOOLCHAIN_SUPPORT_SSSE3" || 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 5dc16e0..a1ed9e7 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi -+++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi -@@ -45,11 +45,11 @@ - 'dummy/audio_device_utility_dummy.h', - ], - 'conditions': [ -- ['OS=="linux"', { -+ ['include_alsa_audio==1 or include_pulse_audio==1', { - 'include_dirs': [ - 'linux', - ], -- }], # OS==linux -+ }], # include_alsa_audio==1 or include_pulse_audio==1 - ['OS=="ios"', { - 'include_dirs': [ - 'ios', -@@ -78,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', - 'ios/audio_device_ios.cc', -@@ -126,28 +120,42 @@ - }, - }], - ['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', { -+ 'cflags_mozilla': [ -+ '$(MOZ_ALSA_CFLAGS)', -+ ], -+ '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', { -+ 'cflags_mozilla': [ -+ '$(MOZ_PULSEAUDIO_CFLAGS)', -+ ], -+ '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" or OS=="ios"', { -diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -index 444340f..629ed3b 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -+++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -@@ -16,7 +16,9 @@ - #include - #include - --#if defined(_WIN32) -+#if defined(WEBRTC_DUMMY_AUDIO_BUILD) -+// do not include platform specific headers -+#elif defined(_WIN32) - #include "audio_device_utility_win.h" - #include "audio_device_wave_win.h" - #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) -diff --git media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc -index 8f3c7c8..a2339fb 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc -+++ media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc -@@ -27,7 +27,7 @@ - - #include "latebindingsymboltable_linux.h" - --#ifdef WEBRTC_LINUX -+#ifdef WEBRTC_POSIX - #include - #endif - -@@ -37,7 +37,7 @@ using namespace webrtc; - namespace webrtc_adm_linux { - - inline static const char *GetDllError() { --#ifdef WEBRTC_LINUX -+#ifdef WEBRTC_POSIX - char *err = dlerror(); - if (err) { - return err; -@@ -50,7 +50,7 @@ inline static const char *GetDllError() { - } - - DllHandle InternalLoadDll(const char dll_name[]) { --#ifdef WEBRTC_LINUX -+#ifdef WEBRTC_POSIX - DllHandle handle = dlopen(dll_name, RTLD_NOW); - #else - #error Not implemented -@@ -63,7 +63,7 @@ DllHandle InternalLoadDll(const char dll_name[]) { - } - - void InternalUnloadDll(DllHandle handle) { --#ifdef WEBRTC_LINUX -+#ifdef WEBRTC_POSIX - if (dlclose(handle) != 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, - "%d", GetDllError()); -@@ -76,7 +76,7 @@ void InternalUnloadDll(DllHandle handle) { - static bool LoadSymbol(DllHandle handle, - const char *symbol_name, - void **symbol) { --#ifdef WEBRTC_LINUX -+#ifdef WEBRTC_POSIX - *symbol = dlsym(handle, symbol_name); - char *err = dlerror(); - if (err) { -@@ -101,7 +101,7 @@ bool InternalLoadSymbols(DllHandle handle, - int num_symbols, - const char *const symbol_names[], - void *symbols[]) { --#ifdef WEBRTC_LINUX -+#ifdef WEBRTC_POSIX - // Clear any old errors. - dlerror(); - #endif -diff --git media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h -index 91d25aa..500725f 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h -+++ media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h -@@ -42,7 +42,7 @@ - - namespace webrtc_adm_linux { - --#ifdef WEBRTC_LINUX -+#ifdef WEBRTC_POSIX - typedef void *DllHandle; - - const DllHandle kInvalidDllHandle = NULL; -diff --git media/webrtc/webrtc_config.gypi media/webrtc/webrtc_config.gypi -index d464265..af7d538 100644 ---- media/webrtc/webrtc_config.gypi -+++ media/webrtc/webrtc_config.gypi -@@ -14,7 +14,6 @@ - 'include_internal_video_render': 0, - 'clang_use_chrome_plugins': 0, - 'enable_protobuf': 0, -- 'include_pulse_audio': 0, - 'include_tests': 0, - 'enable_android_opensl': 1, - # use_system_lib* still seems to be in use in trunk/build Deleted: trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h ============================================================================== --- trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h Fri Jun 21 22:04:59 2013 (r1269) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,17 +0,0 @@ ---- media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h.orig 2012-12-09 16:28:45.641625374 +0100 -+++ 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 - Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/firefox/Makefile Fri Jun 21 22:04:59 2013 (r1270) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 22.0b5 +DISTVERSION= 22.0b6 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -14,7 +14,7 @@ BUILD_DEPENDS= nspr>=4.9.6:${PORTSDIR}/devel/nspr \ nss>=3.14.3:${PORTSDIR}/security/nss \ - sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -92,7 +92,6 @@ post-patch: @${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \ - -e '/^SQLITE_VERSION/s/=.*/=3.7.14.1/' \ ${WRKSRC}/configure.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/firefox/distinfo Fri Jun 21 22:04:59 2013 (r1270) @@ -1,2 +1,2 @@ -SHA256 (firefox-22.0b5.source.tar.bz2) = dffa84a9802c6360208fc02a78f04b4c5a4527f360bcbd412db35f6f6b965661 -SIZE (firefox-22.0b5.source.tar.bz2) = 111748130 +SHA256 (firefox-22.0b6.source.tar.bz2) = 94e8fa2e0beaebe61edcc8adcb2827cbdfbba5098fa49c91dd4cb72f3f61fe4b +SIZE (firefox-22.0b6.source.tar.bz2) = 111424221 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/seamonkey/Makefile Fri Jun 21 22:04:59 2013 (r1270) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/seamonkey/Makefile 310240 2013-01-11 16:48:10Z flo $ PORTNAME= seamonkey -DISTVERSION= 2.18b4 +DISTVERSION= 2.19b1 CATEGORIES?= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ @@ -12,14 +12,14 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9.6:${PORTSDIR}/devel/nspr \ nss>=3.14.3:${PORTSDIR}/security/nss \ - sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip EM_VERSION= 1.5.1 -L_VERSION= 2.3b1 +L_VERSION= 2.4b1 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 @@ -56,6 +56,10 @@ MAILNEWS_DESC?= Mail and News modules .include "${.CURDIR}/../../www/firefox/Makefile.options" + +# OSS is gone after bug 852401 +OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//} + .include .if ${PORT_OPTIONS:MCHATZILLA} @@ -119,7 +123,6 @@ post-patch: @${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \ - -e '/^SQLITE_VERSION/s/=.*/=3.7.14.1/' \ ${MOZSRC}/configure.in ${WRKSRC}/configure.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/suite/app/nsSuiteApp.cpp Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/seamonkey/distinfo Fri Jun 21 22:04:59 2013 (r1270) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.18b4.source.tar.bz2) = b84b908bfebffc1088a5f2f40048664d6444a3785394cc1a64950dcf057fd30d -SIZE (seamonkey-2.18b4.source.tar.bz2) = 129351650 +SHA256 (seamonkey-2.19b1.source.tar.bz2) = 7d615d18ad977a663167bdf24e94a84e03c15d3b4b458c048108686600c7c220 +SIZE (seamonkey-2.19b1.source.tar.bz2) = 136053830 SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0 SIZE (enigmail-1.5.1.tar.gz) = 1213954 Modified: trunk/www/seamonkey/files/extra-bug780531 ============================================================================== --- trunk/www/seamonkey/files/extra-bug780531 Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/seamonkey/files/extra-bug780531 Fri Jun 21 22:04:59 2013 (r1270) @@ -1,13 +1,24 @@ --- mozilla/configure.in~ +++ mozilla/configure.in -@@ -5151,8 +5148,8 @@ fi +@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - AC_SUBST(MOZ_WEBRTC) - --case "$target_cpu" in --arm*) + dnl Use integers over floats for audio on B2G and Android, because audio + dnl backends for those platforms don't support floats. +-if test "$OS_TARGET" = "Android"; then +case "$target" in -+arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) ++*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) MOZ_SAMPLE_TYPE_S16=1 AC_DEFINE(MOZ_SAMPLE_TYPE_S16) AC_SUBST(MOZ_SAMPLE_TYPE_S16) +-else ++;; ++*) + MOZ_SAMPLE_TYPE_FLOAT32=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) + AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) +-fi ++;; ++esac + + dnl ======================================================== + dnl = Disable Speech API code Deleted: trunk/www/seamonkey/files/patch-bug685258 ============================================================================== --- trunk/www/seamonkey/files/patch-bug685258 Fri Jun 21 22:04:59 2013 (r1269) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,17 +0,0 @@ -# HG changeset patch -# User Oleg Romashin -# Parent a2291c212856ad27622416e83c8311b6a33b52f1 -Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf - -diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp ---- mozilla/content/media/AudioStream.cpp -+++ mozilla/content/media/AudioStream.cpp -@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo - mFormat = aFormat; - - if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), -- NULL, -+ "Mozilla", - SA_MODE_WRONLY, - SA_PCM_FORMAT_S16_NE, - aRate, Deleted: trunk/www/seamonkey/files/patch-bug780432 ============================================================================== --- trunk/www/seamonkey/files/patch-bug780432 Fri Jun 21 22:04:59 2013 (r1269) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,17 +0,0 @@ -diff --git media/libsydneyaudio/src/Makefile.in media/libsydneyaudio/src/Makefile.in -index 8dda8ce..b19641d 100644 ---- mozilla/media/libsydneyaudio/src/Makefile.in -+++ mozilla/media/libsydneyaudio/src/Makefile.in -@@ -68,6 +68,12 @@ ifdef MOZ_ALSA - $(NULL) - endif - -+ifdef MOZ_PULSEAUDIO -+CSRCS = \ -+ sydney_audio_pulseaudio.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),WINNT) - OS_LIBS += winmm.lib - endif Modified: trunk/www/seamonkey/files/patch-bug807492 ============================================================================== --- trunk/www/seamonkey/files/patch-bug807492 Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/seamonkey/files/patch-bug807492 Fri Jun 21 22:04:59 2013 (r1270) @@ -17,42 +17,14 @@ index c167461..8346c11 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -1413,16 +1413,27 @@ if test "$GNU_CC"; then - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -mssse3" - AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) - [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], - AC_MSG_RESULT([no])) - CFLAGS=$_SAVE_CFLAGS - AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) - -+ # Check for -msse4.1 on $CC -+ AC_MSG_CHECKING([if toolchain supports -msse4.1 option]) -+ HAVE_TOOLCHAIN_SUPPORT_MSSE4_1= -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS -msse4.1" -+ AC_TRY_COMPILE([asm ("pmulld %xmm6,%xmm0");],,AC_MSG_RESULT([yes]) -+ [HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=1], -+ AC_MSG_RESULT([no])) -+ CFLAGS=$_SAVE_CFLAGS -+ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1) -+ - # Turn on GNU-specific warnings: - # -Wall - turn on a lot of warnings - # -Wpointer-arith - good to have - # -Wdeclaration-after-statement - MSVC doesn't like these - # -Werror=return-type - catches missing returns, zero false positives - # -Wtype-limits - catches overflow bugs, few false positives - # -Wempty-body - catches bugs, e.g. "if (c); foo();", few false positives - # -@@ -5203,17 +5214,17 @@ dnl Turn off webrtc for OS's we don't ha - dnl --enable-webrtc to override. Can disable for everything in - dnl the master list above. - if test -n "$MOZ_WEBRTC"; then - case "$target" in +@@ -5258,17 +5258,17 @@ if test -n "$MOZ_WEBRTC"; then *-android*|*-linuxandroid*) - dnl Make sure doesn't get matched by *-linux* - MOZ_WEBRTC= + if test -n "$MOZ_B2G"; then + MOZ_WEBRTC=1 + else + dnl Make sure doesn't get matched by *-linux* + MOZ_WEBRTC= + fi ;; - *-linux*|*-mingw*|*-darwin*) + *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) @@ -64,28 +36,6 @@ ;; esac fi -@@ -8997,16 +9008,21 @@ elif test "${OS_TARGET}" = "Android"; th - EXTRA_GYP_DEFINES="-D gtest_target_type=executable -D android_toolchain=${android_toolchain} -G os=android " - if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then - EXTRA_GYP_DEFINES+=" -D armv7=0 " - else - EXTRA_GYP_DEFINES+=" -D armv7=1 " - fi - 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" -+fi -+ - 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 -D build_with_chromium=0 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi" - - GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} -D target_arch=${WEBRTC_TARGET_ARCH} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" diff --git js/src/config/system-headers js/src/config/system-headers index 9bd1efa..1095a01 100644 --- mozilla/js/src/config/system-headers @@ -367,12 +317,12 @@ if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0)))) ABORT(R_NO_MEMORY); -@@ -93,28 +101,28 @@ mbslen(const char *s, size_t *ncharsp) - #else +@@ -94,28 +102,28 @@ mbslen(const char *s, size_t *ncharsp) /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */ /* null-checking setlocale is required because Android */ char *locale = setlocale(LC_CTYPE, 0); - if (!locale || !strcasestr(locale, "UTF-8")) + /* some systems use "utf8" instead of "UTF-8" like Fedora 17 */ + if (!locale || (!strcasestr(locale, "UTF-8") && !strcasestr(locale, "UTF8"))) ABORT(R_NOT_FOUND); #endif @@ -394,12 +344,12 @@ +#endif /* HAVE_XLOCALE */ { if (nbytes == (size_t)-1) /* should never happen */ { - assert(0); ABORT(R_INTERNAL); } if (nbytes == (size_t)-2) /* encoding error */ { - assert(0); ABORT(R_BAD_DATA); + } + diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp index 3cc8e1c..74016c6 100644 --- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp @@ -631,106 +581,6 @@ ifeq ($(OS_TARGET),Darwin) LIBS += \ -framework AudioToolbox \ -diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi -index 6ca2f70..5d261cb 100644 ---- 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. - ['use_aura==1 and OS=="win"', { - 'use_ash%': 1, - }], - ['use_ash==1', { - 'use_aura%': 1, - }], -+ -+ # A flag for BSD platforms -+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or \ -+ OS=="openbsd"', { -+ 'os_bsd%': 1, -+ }, { -+ 'os_bsd%': 0, -+ }], - ], - }, - # Copy conditionally-set variables out one scope. - 'chromeos%': '<(chromeos)', - 'use_aura%': '<(use_aura)', - 'use_ash%': '<(use_ash)', -+ 'os_bsd%': '<(os_bsd)', - 'use_openssl%': '<(use_openssl)', - 'use_ibus%': '<(use_ibus)', - 'enable_viewport%': '<(enable_viewport)', - 'enable_hidpi%': '<(enable_hidpi)', - 'enable_touch_ui%': '<(enable_touch_ui)', - 'android_upstream_bringup%': '<(android_upstream_bringup)', - 'buildtype%': '<(buildtype)', - -@@ -114,17 +123,17 @@ - # Set default value of toolkit_views based on OS. - ['OS=="win" or chromeos==1 or use_aura==1', { - 'toolkit_views%': 1, - }, { - 'toolkit_views%': 0, - }], - - # Set toolkit_uses_gtk for the Chromium browser on Linux. -- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', { -+ ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_aura==0', { - 'toolkit_uses_gtk%': 1, - }, { - 'toolkit_uses_gtk%': 0, - }], - - # Enable HiDPI on Mac OS and Chrome OS. - ['OS=="mac" or chromeos==1', { - 'enable_hidpi%': 1, -@@ -139,16 +148,17 @@ - - # Copy conditionally-set variables out one scope. - 'chromeos%': '<(chromeos)', - 'host_arch%': '<(host_arch)', - 'toolkit_views%': '<(toolkit_views)', - 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', - 'use_aura%': '<(use_aura)', - 'use_ash%': '<(use_ash)', -+ 'os_bsd%': '<(os_bsd)', - 'use_openssl%': '<(use_openssl)', - 'use_ibus%': '<(use_ibus)', - 'enable_viewport%': '<(enable_viewport)', - 'enable_hidpi%': '<(enable_hidpi)', - 'enable_touch_ui%': '<(enable_touch_ui)', - 'android_upstream_bringup%': '<(android_upstream_bringup)', - 'android_build_type%': '<(android_build_type)', - -@@ -397,25 +407,18 @@ - - # A flag for POSIX platforms - ['OS=="win"', { - 'os_posix%': 0, - }, { - 'os_posix%': 1, - }], - -- # A flag for BSD platforms -- ['OS=="freebsd" or OS=="openbsd"', { -- 'os_bsd%': 1, -- }, { -- 'os_bsd%': 0, -- }], -- - # NSS usage. -- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', { -+ ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_openssl==0', { - 'use_nss%': 1, - }, { - 'use_nss%': 0, - }], - - # Flags to use X11 on non-Mac POSIX platforms - ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { - 'use_glib%': 0, 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 @@ -758,9 +608,9 @@ 'include_tests%': 0, }], @@ -205,16 +210,28 @@ - 'defines': ['WEBRTC_ARCH_ARM_NEON',], - }, { - 'defines': ['WEBRTC_DETECT_ARM_NEON',], + 'defines': ['WEBRTC_ARCH_ARM_NEON', + 'WEBRTC_BUILD_NEON_LIBS', + 'WEBRTC_DETECT_ARM_NEON'], }], ], }], @@ -1636,7 +1486,7 @@ WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", number_of_cores_); - #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) + #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_); @@ -1710,7 +1560,7 @@ } uint32_t ThreadWrapper::GetThreadId() { - #if defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX) + #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()); @@ -1735,7 +1585,7 @@ int ThreadPosix::Construct() { int result = 0; - #if !defined(WEBRTC_ANDROID) + #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) @@ -167,17 +192,17 @@ int ThreadPosix::Construct() { } @@ -1764,9 +1614,9 @@ // 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))) +-#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK))) +#if defined(__FreeBSD__) || (defined(WEBRTC_LINUX) && \ -+ (!defined(WEBRTC_ANDROID))) ++ (!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)) { @@ -1784,12 +1634,12 @@ ++processor) { CPU_SET(processor_numbers[processor], &mask); } --#if defined(WEBRTC_ANDROID) +-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK) +#if defined(__FreeBSD__) + const int result = pthread_setaffinity_np(thread_, + sizeof(mask), + &mask); -+#elif defined(WEBRTC_ANDROID) ++#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK) // Android. const int result = syscall(__NR_sched_setaffinity, pid_, @@ -2013,58 +1863,14 @@ #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 ---- 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 - # in the file PATENTS. All contributing project authors may - # be found in the AUTHORS file in the root of the source tree. - - { - 'variables': { - 'use_system_libjpeg%': 0, -+ 'yuv_disable_asm%': 0, - }, - 'targets': [ - { - 'target_name': 'libyuv', - 'type': 'static_library', - # 'type': 'shared_library', - 'conditions': [ - ['use_system_libjpeg==0', { -@@ -45,16 +46,21 @@ - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'include', - '.', - ], - }, - 'conditions': [ -+ ['yuv_disable_asm==1', { -+ 'defines': [ -+ 'YUV_DISABLE_ASM', -+ ], -+ }], - ['build_with_mozilla==1', { - 'include_dirs': [ - '$(DEPTH)/dist/include', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '$(DEPTH)/dist/include', - ], 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 +++ mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -@@ -4,16 +4,17 @@ - - # Python 2.5 needs this for the with statement. - from __future__ import with_statement +@@ -1,16 +1,17 @@ + # Copyright (c) 2012 Mozilla Foundation. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. import collections import gyp Deleted: trunk/www/seamonkey/files/patch-bug824317 ============================================================================== --- trunk/www/seamonkey/files/patch-bug824317 Fri Jun 21 22:04:59 2013 (r1269) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ -diff --git a/xpcom/string/public/nsAlgorithm.h b/xpcom/string/public/nsAlgorithm.h -index fa50194a..c5f5737 100644 ---- mozilla/xpcom/string/public/nsAlgorithm.h -+++ mozilla/xpcom/string/public/nsAlgorithm.h -@@ -42,7 +42,10 @@ NS_MAX( const T& a, const T& b ) - return a > b ? a : b; - } - --#if defined(_MSC_VER) && (_MSC_VER < 1600) -+#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || \ -+ ((defined(__GLIBCXX__) && __GLIBCXX__ < 20121005) && \ -+ (defined(_GLIBCXX_USE_LONG_LONG) && \ -+ (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC))) - namespace std { - inline - long long Modified: trunk/www/seamonkey/files/patch-bug826985 ============================================================================== --- trunk/www/seamonkey/files/patch-bug826985 Thu Jun 13 15:35:57 2013 (r1269) +++ trunk/www/seamonkey/files/patch-bug826985 Fri Jun 21 22:04:59 2013 (r1270) @@ -16,16 +16,16 @@ index 55e4cd1..76567b3 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -5250,6 +5250,9 @@ if test -n "$MOZ_WEBRTC"; then +@@ -5294,6 +5294,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VP8_ENCODER=1 MOZ_VP8_ERROR_CONCEALMENT=1 + dnl with libv4l2 we can support more cameras + PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2) + - dnl OpenSLES is only available in Android 2.3 and later; we'll change this - dnl hard dependency to a dynamic load with graceful runtime failure before - dnl we make --enable-webrtc on by default in Android (bug 815905) + if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then + dnl OpenSLES is only available in Android 2.3 and later; we'll change this + dnl hard dependency to a dynamic load with graceful runtime failure before @@ -8981,6 +8984,10 @@ elif test "${OS_TARGET}" = "Android"; then fi fi Deleted: trunk/www/seamonkey/files/patch-bug836824 ============================================================================== --- trunk/www/seamonkey/files/patch-bug836824 Fri Jun 21 22:04:59 2013 (r1269) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,33 +0,0 @@ -commit 35107a0 (HEAD) -Author: Paul Adenot -Date: Mon Feb 4 20:21:19 2013 +0100 - - Bug 836824 - libsoundtouch fails to build due to __get_cpuid() invocation, if you don't have xcode command line tools. r= ---- - media/libsoundtouch/moz-libsoundtouch.patch | 24 ++++++++++++++++++++++++ - media/libsoundtouch/src/cpu_detect_x86.cpp | 5 ++++- - 2 files changed, 28 insertions(+), 1 deletion(-) - -diff --git media/libsoundtouch/src/cpu_detect_x86.cpp media/libsoundtouch/src/cpu_detect_x86.cpp -index a42008e..7a31aa9 100644 ---- mozilla/media/libsoundtouch/src/cpu_detect_x86.cpp -+++ mozilla/media/libsoundtouch/src/cpu_detect_x86.cpp -@@ -101,7 +101,7 @@ uint detectCPUextensions(void) - - uint res = 0; - --#if defined(__GNUC__) -+#if defined(__GNUC__) && defined(HAVE_CPUID_H) - // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support. - uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable. - -@@ -112,6 +112,9 @@ uint detectCPUextensions(void) - if (edx & bit_SSE) res = res | SUPPORT_SSE; - if (edx & bit_SSE2) res = res | SUPPORT_SSE2; - -+#elif defined(__GNUC__) -+ // No cpuid.h --> no cpuid support -+ return 0; - #else - // Window / VS version of cpuid. Notice that Visual Studio 2005 or later required - // for __cpuid intrinsic support. Deleted: trunk/www/seamonkey/files/patch-clang33 ============================================================================== --- trunk/www/seamonkey/files/patch-clang33 Fri Jun 21 22:04:59 2013 (r1269) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,79 +0,0 @@ ---- mozilla/js/src/jscompartment.h~ -+++ mozilla/js/src/jscompartment.h -@@ -596,12 +596,12 @@ class js::AutoDebugModeGC - // The DEBUG_MODE_GC reason forces the collector to always throw - // everything away, as required for debug mode transitions. - if (needGC) -- GC(rt, GC_NORMAL, gcreason::DEBUG_MODE_GC); -+ GC(rt, GC_NORMAL, js::gcreason::DEBUG_MODE_GC); - } - -- void scheduleGC(Zone *zone) { -+ void scheduleGC(JS::Zone *zone) { - JS_ASSERT(!rt->isHeapBusy()); -- PrepareZoneForGC(zone); -+ js::PrepareZoneForGC(zone); - needGC = true; - } - }; ---- mozilla/js/src/jspropertycacheinlines.h~ -+++ mozilla/js/src/jspropertycacheinlines.h -@@ -32,7 +32,7 @@ JS_ALWAYS_INLINE void - js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject **obj, - JSObject **pobj, PropertyCacheEntry **entry, PropertyName **name) - { -- AutoAssertNoGC nogc; -+ js::AutoAssertNoGC nogc; - - JS_ASSERT(this == &cx->propertyCache()); - -@@ -65,7 +65,7 @@ JS_ALWAYS_INLINE bool - js::PropertyCache::testForSet(JSContext *cx, jsbytecode *pc, JSObject *obj, - PropertyCacheEntry **entryp, JSObject **obj2p, PropertyName **namep) - { -- AutoAssertNoGC nogc; -+ js::AutoAssertNoGC nogc; - - JS_ASSERT(this == &cx->propertyCache()); - ---- mozilla/js/src/vm/ObjectImpl-inl.h~ -+++ mozilla/js/src/vm/ObjectImpl-inl.h -@@ -164,9 +164,9 @@ js::ObjectImpl::initializeSlotRange(uint - JSRuntime *rt = runtime(); - uint32_t offset = start; - for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++) -- sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, UndefinedValue()); -+ sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, js::UndefinedValue()); - for (HeapSlot *sp = slotsStart; sp < slotsEnd; sp++) -- sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, UndefinedValue()); -+ sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, js::UndefinedValue()); - } - - inline bool -@@ -321,7 +321,7 @@ js::ObjectImpl::sizeOfThis() const - js::ObjectImpl::readBarrier(ObjectImpl *obj) - { - #ifdef JSGC_INCREMENTAL -- Zone *zone = obj->zone(); -+ JS::Zone *zone = obj->zone(); - if (zone->needsBarrier()) { - MOZ_ASSERT(!zone->rt->isHeapBusy()); - JSObject *tmp = obj->asObjectPtr(); -@@ -335,7 +335,7 @@ inline void - js::ObjectImpl::privateWriteBarrierPre(void **old) - { - #ifdef JSGC_INCREMENTAL -- Zone *zone = this->zone(); -+ JS::Zone *zone = this->zone(); - if (zone->needsBarrier()) { - if (*old && getClass()->trace) - getClass()->trace(zone->barrierTracer(), this->asObjectPtr()); -@@ -362,7 +362,7 @@ js::ObjectImpl::writeBarrierPre(ObjectIm - if (uintptr_t(obj) < 32) - return; - -- Zone *zone = obj->zone(); -+ JS::Zone *zone = obj->zone(); - if (zone->needsBarrier()) { - MOZ_ASSERT(!zone->rt->isHeapBusy()); - JSObject *tmp = obj->asObjectPtr(); Deleted: trunk/www/seamonkey/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c Fri Jun 21 22:04:59 2013 (r1269) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c~ -+++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c -@@ -446,6 +446,10 @@ static void audio_callback(void* data) - printf("!"); /* not enough audio data */ - #endif - bytes = bytes-bytes_to_copy; -+ struct timespec ts = {0, 1000000}; -+ pthread_mutex_unlock(&s->mutex); -+ nanosleep(&ts, NULL); -+ pthread_mutex_lock(&s->mutex); - break; - } - free(s->bl_head); Added: trunk/www/seamonkey/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm Fri Jun 21 22:04:59 2013 (r1270) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/components/osfile/osfile_unix_allthreads.jsm.orig 2013-05-11 21:19:53.000000000 +0200 ++++ mozilla/toolkit/components/osfile/osfile_unix_allthreads.jsm 2013-06-02 17:15:05.000000000 +0200 +@@ -40,7 +40,7 @@ if (typeof Components != "undefined") { + // Open libc + let libc; + let libc_candidates = [ "libSystem.B.dylib", +- "libc.so.6", ++ "libc.so.7", + "libc.so" ]; + for (let i = 0; i < libc_candidates.length; ++i) { + try {