Attachment #183457 for bug #219963




.elif ${gecko_ARGS:Mfirefox}

_GECKO_DEFAULT_VERSION=	52
_GECKO_VERSIONS=		52 55
_GECKO_TYPE=	firefox

# Dependence lines for different Firefox versions
52_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
55_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox

.if exists(${LOCALBASE}/bin/firefox)
_GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	55.0b1
DISTVERSIONSUFFIX=.source
PORTEPOCH=	1
CATEGORIES=	www ipv6
MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source

MAINTAINER=	gecko@FreeBSD.org
COMMENT=	Web browser based on the browser portion of Mozilla

BUILD_DEPENDS=	nspr>=4.14:devel/nspr \
		nss>=3.31:security/nss \
		libevent>=2.0.22:devel/libevent \
		harfbuzz>=1.4.6:print/harfbuzz \
		graphite2>=1.3.10:graphics/graphite2 \
		png>=1.6.28:graphics/png \
		libvorbis>=1.3.5,3:audio/libvorbis \
		libvpx>=1.5.0:multimedia/libvpx \
		sqlite3>=3.19.2:databases/sqlite3 \
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
		v4l_compat>0:multimedia/v4l_compat \
		autoconf-2.13:devel/autoconf213 \


OPTIONS_DEFINE=		RUST
OPTIONS_DEFAULT=	BUNDLED_CAIRO
OPTIONS_EXCLUDE=	GNOMEUI
# XXX lang/rust and devel/cargo currently build only on these platforms
OPTIONS_DEFAULT_amd64=	RUST
OPTIONS_DEFAULT_i386=	RUST

Lines 1-3 Link Here

(-)b/www/firefox/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1496961575	1	TIMESTAMP = 1497363179
2	SHA256 (firefox-54.0.source.tar.xz) = 08a9ff6870d904a2af1d03c17c6c44f67413608efb66bb280894d7b92c336a77	2	SHA256 (firefox-55.0b1.source.tar.xz) = 5424250111c6a1124325ba88481d28f37a90c771e66bb7bf3c05f7a0bd7a4d04
3	SIZE (firefox-54.0.source.tar.xz) = 229178564	3	SIZE (firefox-55.0b1.source.tar.xz) = 236308400




 
 static int
 validate_stream_params(cubeb_stream_params * input_stream_params,
@@ -155,6 +158,10 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
 #if defined(USE_KAI)
       init_oneshot = kai_init;
 #endif
+    } else if (!strcmp(backend_name, "oss")) {
+#if defined(USE_OSS)
+      init_oneshot = oss_init;
+#endif
     } else {
       /* Already set */
     }
@@ -196,6 +203,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
 #if defined(USE_KAI)
     kai_init,
 #endif

+    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
 
     /* Correct read size to the other stream available frames */
     if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
@@ -372,8 +421,8 @@ alsa_process_stream(cubeb_stream * stm)
     long drain_frames = avail - stm->bufframes;
     double drain_time = (double) drain_frames / stm->params.rate;

+  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
   assert((nfds_t) r == stm->nfds);
 
   if (alsa_register_stream(ctx, stm) != 0) {
@@ -1048,7 +1156,7 @@ alsa_stream_destroy(cubeb_stream * stm)
   pthread_mutex_lock(&stm->mutex);
   if (stm->pcm) {

index b139b8f497fd..d1f8a223c6d8 100755
--- media/libcubeb/update.sh
+++ media/libcubeb/update.sh
@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src
 cp $1/src/cubeb_mixer.cpp src
 cp $1/src/cubeb_mixer.h src
 cp $1/src/cubeb_opensl.c src
+cp $1/src/cubeb_oss.c src
 cp $1/src/cubeb_osx_run_loop.h src
 cp $1/src/cubeb_panner.cpp src
 cp $1/src/cubeb_panner.h src
diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
index 3e5450f5d63a..dd45427f655a 100644
--- media/webrtc/signaling/test/common.build
+++ media/webrtc/signaling/test/common.build
@@ -99,8 +99,8 @@ USE_LIBS += ['mozglue']
 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
 OS_LIBS += CONFIG['REALTIME_LIBS']
 
-if CONFIG['MOZ_ALSA']:
-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+if CONFIG['MOZ_OSS']:
+    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
 
 if CONFIG['MOZ_SYSTEM_JPEG']:
     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
diff --git toolkit/library/moz.build toolkit/library/moz.build
index a61c689c83c3..7764df6f8a6b 100644
--- toolkit/library/moz.build




commit 40744bcfbf86
Author: Iaroslav (yarik) Sheptykin <yarik.sheptykin@googlemail.com>
Date:   Sat Jun 10 19:59:16 2017 +0200

    Bug 1371927: Build KeyedStackCapture only if profiler enabled. r=gfritzsche
    
    MozReview-Commit-ID: 9IoVY2K5hXc
---
 toolkit/components/telemetry/HangReports.cpp        | 6 +++---
 toolkit/components/telemetry/KeyedStackCapturer.cpp | 3 ---
 toolkit/components/telemetry/KeyedStackCapturer.h   | 4 ----
 toolkit/components/telemetry/Telemetry.cpp          | 5 ++++-
 toolkit/components/telemetry/moz.build              | 7 ++++++-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git toolkit/components/telemetry/HangReports.cpp toolkit/components/telemetry/HangReports.cpp
index a093405fe7a9..da9e117b2524 100644
--- toolkit/components/telemetry/HangReports.cpp
+++ toolkit/components/telemetry/HangReports.cpp
@@ -11,9 +11,6 @@ namespace Telemetry {
 
 using namespace HangMonitor;
 
-/** The maximum number of stacks that we're keeping for hang reports. */
-const size_t kMaxHangStacksKept = 50;
-
 // This utility function generates a string key that is used to index the annotations
 // in a hash map from |HangReports::AddHang|.
 nsresult
@@ -36,6 +33,9 @@ ComputeAnnotationsKey(const HangAnnotationsPtr& aAnnotations, nsAString& aKeyOut
 }
 
 #if defined(MOZ_GECKO_PROFILER)
+/** The maximum number of stacks that we're keeping for hang reports. */
+const size_t kMaxHangStacksKept = 50;
+
 void
 HangReports::AddHang(const Telemetry::ProcessedStack& aStack,
                      uint32_t aDuration,
diff --git toolkit/components/telemetry/KeyedStackCapturer.cpp toolkit/components/telemetry/KeyedStackCapturer.cpp
index 25479485fcd9..6b6431a44978 100644
--- toolkit/components/telemetry/KeyedStackCapturer.cpp
+++ toolkit/components/telemetry/KeyedStackCapturer.cpp
@@ -12,8 +12,6 @@
 
 namespace {
 
-#if defined(MOZ_GECKO_PROFILER)
-
 /** Defines the size of the keyed stack dictionary. */
 const uint8_t kMaxKeyLength = 50;
 
@@ -161,7 +159,6 @@ KeyedStackCapturer::Clear()
   mStackInfos.Clear();
   mStacks.Clear();
 }
-#endif
 
 } // namespace Telemetry
 } // namespace mozilla
diff --git toolkit/components/telemetry/KeyedStackCapturer.h toolkit/components/telemetry/KeyedStackCapturer.h
index 77f17a613948..f554787b5934 100644
--- toolkit/components/telemetry/KeyedStackCapturer.h
+++ toolkit/components/telemetry/KeyedStackCapturer.h
@@ -6,8 +6,6 @@
 #ifndef KeyedStackCapturer_h__
 #define KeyedStackCapturer_h__
 
-#ifdef MOZ_GECKO_PROFILER
-
 #include "Telemetry.h"
 #include "nsString.h"
 #include "nsClassHashtable.h"
@@ -74,6 +72,4 @@ private:
 } // namespace Telemetry
 } // namespace mozilla
 
-#endif // MOZ_GECKO_PROFILER
-
 #endif // KeyedStackCapturer_h__
diff --git toolkit/components/telemetry/Telemetry.cpp toolkit/components/telemetry/Telemetry.cpp
index 4864f400a21a..a81975873d02 100644
--- toolkit/components/telemetry/Telemetry.cpp
+++ toolkit/components/telemetry/Telemetry.cpp
@@ -99,10 +99,13 @@ using Telemetry::Common::AutoHashtable;
 using mozilla::dom::Promise;
 using mozilla::dom::AutoJSAPI;
 using mozilla::Telemetry::HangReports;
-using mozilla::Telemetry::KeyedStackCapturer;
 using mozilla::Telemetry::CombinedStacks;
 using mozilla::Telemetry::ComputeAnnotationsKey;
 
+#if defined(MOZ_GECKO_PROFILER)
+using mozilla::Telemetry::KeyedStackCapturer;
+#endif
+
 /**
  * IOInterposeObserver recording statistics of main-thread I/O during execution,
  * aimed at consumption by TelemetryImpl
diff --git toolkit/components/telemetry/moz.build toolkit/components/telemetry/moz.build
index c8d5b177d205..30c8914c4055 100644
--- toolkit/components/telemetry/moz.build
+++ toolkit/components/telemetry/moz.build
@@ -57,7 +57,6 @@ SOURCES += [
     'HangReports.cpp',
     'ipc/TelemetryIPC.cpp',
     'ipc/TelemetryIPCAccumulator.cpp',
-    'KeyedStackCapturer.cpp',
     'Telemetry.cpp',
     'TelemetryCommon.cpp',
     'TelemetryEvent.cpp',
@@ -66,6 +65,12 @@ SOURCES += [
     'WebrtcTelemetry.cpp',
 ]
 
+# KeyedStackCapturer entirely relies on profiler to be enabled.
+if CONFIG['MOZ_GECKO_PROFILER']:
+    SOURCES += [
+      'KeyedStackCapturer.cpp'
+    ]
+
 EXTRA_COMPONENTS += [
     'TelemetryStartup.js',
     'TelemetryStartup.manifest'

Lines 1-13 Link Here

(-)b/www/firefox/files/patch-bug702179 (-9 / +8 lines)
1	--- js/src/moz.build.orig 2015-12-16 12:32:04.574425000 +0100	1	Don't build static JS lib to make sure DTrace probes are picked up.
2	+++ js/src/moz.build 2015-12-16 12:32:09.032032000 +0100	2
3	@@ -671,10 +671,6 @@ CFLAGS += CONFIG['MOZ_ICU_CFLAGS']	3	--- js/src/build/moz.build.orig 2017-04-16 18:00:50 UTC
4	CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']	4	+++ js/src/build/moz.build
5	LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']	5	@@ -71,7 +71,3 @@ if CONFIG['OS_ARCH'] == 'SunOS':
		6	]
6		7
		8	OS_LIBS += CONFIG['REALTIME_LIBS']
		9	-
7	-NO_EXPAND_LIBS = True	10	-NO_EXPAND_LIBS = True
8	-	11	-
9	-DIST_INSTALL = True	12	-DIST_INSTALL = True
10	-
11	# Prepare self-hosted JS code for embedding
12	GENERATED_FILES += ['selfhosted.out.h']
13	selfhosted = GENERATED_FILES['selfhosted.out.h']




     # basic stuff for everything
     'include_internal_video_render': 0,
     'clang_use_chrome_plugins': 0,
diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
index b483cd1..f1dd1f0 100644
--- media/webrtc/signaling/test/common.build
+++ media/webrtc/signaling/test/common.build
@@ -99,6 +99,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
 
 USE_LIBS += ['mozglue']
 
+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
 OS_LIBS += CONFIG['REALTIME_LIBS']
 
diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
index 239a292..bab496c 100644
--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc

Lines 261-267 index 9297e4d6f501..d8e273887e4b 100644 Link Here

(-)b/www/firefox/files/patch-bug847568 (-1 / +1 lines)
261	+option('--with-system-harfbuzz',	261	+option('--with-system-harfbuzz',
262	+ help="Use system harfbuzz (located with pkgconfig)")	262	+ help="Use system harfbuzz (located with pkgconfig)")
263	+	263	+
264	+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.3',	264	+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.6',
265	+ when='--with-system-harfbuzz')	265	+ when='--with-system-harfbuzz')
266	+	266	+
267	+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))	267	+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))




diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
index 88bba9baa401..99f240952dfe 100644
--- dom/system/OSFileConstants.cpp
+++ dom/system/OSFileConstants.cpp
@@ -16,14 +16,17 @@
 #include "dirent.h"
 #include "poll.h"
 #include "sys/stat.h"
-#if defined(ANDROID)
+#if defined(XP_LINUX)
 #include <sys/vfs.h>
 #define statvfs statfs
+#define f_frsize f_bsize
 #else
 #include "sys/statvfs.h"
+#endif // defined(XP_LINUX)
+#if !defined(ANDROID)
 #include "sys/wait.h"
 #include <spawn.h>
-#endif // defined(ANDROID)
+#endif // !defined(ANDROID)
 #endif // defined(XP_UNIX)
 
 #if defined(XP_LINUX)
@@ -699,7 +702,7 @@ static const dom::ConstantSpec gLibcProperties[] =
 
   { "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
 
-  { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) },
+  { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) },
   { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) },
 
 #endif // defined(XP_UNIX)
diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
index a028dda7d5ec..f5c632e3d7e5 100644
--- toolkit/components/osfile/modules/osfile_unix_back.jsm
+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
@@ -228,8 +228,8 @@
          let statvfs = new SharedAll.HollowStructure("statvfs",
            Const.OSFILE_SIZEOF_STATVFS);
 
-         statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
-                        "f_bsize", Type.unsigned_long.implementation);
+         statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
+                        "f_frsize", Type.unsigned_long.implementation);
          statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
                         "f_bavail", Type.fsblkcnt_t.implementation);
 
diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
index bd60d4d8419c..a8cd6b546b0e 100644
--- toolkit/components/osfile/modules/osfile_unix_front.jsm
+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
@@ -399,7 +399,7 @@
        throw_on_negative("statvfs",  (UnixFile.statvfs || UnixFile.statfs)(sourcePath, fileSystemInfoPtr));
 
        let bytes = new Type.uint64_t.implementation(
-                        fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
+                        fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
 
        return bytes.value;
      };




--- python/futures/concurrent/futures/process.py.orig	2017-04-11 04:15:19 UTC
+++ python/futures/concurrent/futures/process.py
@@ -247,7 +247,11 @@ def _check_system_limits():
     _system_limits_checked = True
     try:
         import os
-        nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
+        if sys.platform.startswith('freebsd'):
+            # sem(4) confuses sysconf(3) on FreeBSD < 11.1
+            nsems_max = -1
+        else:
+            nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
     except (AttributeError, ValueError):
         # sysconf not available or setting not available
         return




Revert bug 1284816, bug 1341967, bug 1336153 to postpone bustage on non-x86 archs.

diff --git browser/confvars.sh browser/confvars.sh
index d8dcd99c2757..740d9d3e5fcf 100755

     if not rustc_info:
         die(dedent('''\
         Rust compiler not found.
@@ -97,6 +110,9 @@ def rust_compiler(rustc_info, cargo_info):
 
     return True
 
+set_define('MOZ_RUST', rust_compiler)
+set_config('MOZ_RUST', rust_compiler)
+
 @template
 def rust_triple_alias(host_or_target):
     """Template defining the alias used for rustc's --target flag.
@@ -227,7 +243,8 @@ set_config('RUST_HOST_TARGET', rust_host_triple)
 
 @depends(rust_target_triple)
 def rust_target_env_name(triple):
-    return triple.upper().replace('-','_')
+    if triple:
+        return triple.upper().replace('-','_')
 
 # We need this to form various Cargo environment variables, as there is no
 # uppercase function in make, and we don't want to shell out just for
@@ -235,5 +252,6 @@ def rust_target_env_name(triple):
 set_config('RUST_TARGET_ENV_NAME', rust_target_env_name)
 
 # Until we remove all the other Rust checks in old-configure.
+add_old_configure_assignment('MOZ_RUST', rust_compiler)
 add_old_configure_assignment('RUSTC', rustc)
 add_old_configure_assignment('RUST_TARGET', rust_target_triple)
diff --git config/rules.mk config/rules.mk
index 94cc5556e3d0..7b143ebc5146 100644
--- config/rules.mk
+++ config/rules.mk
@@ -900,6 +900,7 @@ endif
 
 $(foreach file,$(DUMP_SYMS_TARGETS),$(eval $(call syms_template,$(file),$(file)_syms.track)))
 
+ifdef MOZ_RUST
 cargo_host_flag := --target=$(RUST_HOST_TARGET)
 cargo_target_flag := --target=$(RUST_TARGET)
 
@@ -1055,6 +1056,7 @@ force-cargo-host-program-build:
 
 $(HOST_RUST_PROGRAMS): force-cargo-host-program-build
 endif # HOST_RUST_PROGRAMS
+endif # MOZ_RUST
 
 $(SOBJS):
 	$(REPORT_BUILD)
diff --git dom/media/MediaPrefs.h dom/media/MediaPrefs.h
index 4dcc659222a4..559334d89fd1 100644
--- dom/media/MediaPrefs.h
+++ dom/media/MediaPrefs.h
@@ -183,7 +183,7 @@ private:
   DECL_MEDIA_PREF("media.ogg.flac.enabled",                   FlacInOgg, bool, false);
   DECL_MEDIA_PREF("media.flac.enabled",                       FlacEnabled, bool, true);
 

   DECL_MEDIA_PREF("media.rust.test_mode",                     RustTestMode, bool, false);
 #endif
 
diff --git dom/media/gtest/moz.build dom/media/gtest/moz.build
index c66ac4a9437f..e2203c0a4321 100644
--- dom/media/gtest/moz.build
+++ dom/media/gtest/moz.build
@@ -22,7 +22,6 @@ UNIFIED_SOURCES += [
     'TestMozPromise.cpp',
     'TestMP3Demuxer.cpp',
     'TestMP4Demuxer.cpp',
-    'TestRust.cpp',
     'TestTrackEncoder.cpp',
     'TestVideoSegment.cpp',
     'TestVideoUtils.cpp',
@@ -36,6 +35,9 @@ if CONFIG['MOZ_WEBM_ENCODER']:
         'TestWebMWriter.cpp',
     ]
 
+if CONFIG['MOZ_RUST']:
+    UNIFIED_SOURCES += ['TestRust.cpp',]
+
 TEST_HARNESS_FILES.gtest += [
     '../test/gizmo-frag.mp4',
     '../test/gizmo.mp4',
diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build
index c65b53b80f63..8953f646e831 100644
--- media/libcubeb/src/moz.build
+++ media/libcubeb/src/moz.build
@@ -32,7 +32,8 @@ if CONFIG['MOZ_PULSEAUDIO']:
         'cubeb_pulse.c',
     ]
     DEFINES['USE_PULSE'] = True
-    DEFINES['USE_PULSE_RUST'] = True
+    if CONFIG['MOZ_RUST']:
+        DEFINES['USE_PULSE_RUST'] = True
 
 if CONFIG['MOZ_JACK']:
     SOURCES += [
diff --git media/libstagefright/binding/DecoderData.cpp media/libstagefright/binding/DecoderData.cpp
index 109ea329d154..a06e533b1e62 100644
--- media/libstagefright/binding/DecoderData.cpp

+#endif // MOZ_RUST_MP4PARSE
 
 using namespace stagefright;
 using mozilla::media::TimeUnit;
@@ -177,6 +179,7 @@ MP4VideoInfo::Update(const MetaData* aMetaData, const char* aMimeType)
   FindData(aMetaData, kKeyAVCC, mExtraData);
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 static void
 UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig,
                          const mp4parse_sinf_info& aSinf)
@@ -263,6 +266,7 @@ MP4VideoInfo::Update(const mp4parse_track_info* track,
     mExtraData->AppendElements(video->extra_data.data, video->extra_data.length);
   }
 }

index 5c3810d99a38..5d14dfd8b8a9 100644
--- media/libstagefright/binding/MP4Metadata.cpp
+++ media/libstagefright/binding/MP4Metadata.cpp
@@ -20,14 +20,18 @@
 #include "mp4_demuxer/MP4Metadata.h"
 #include "mp4_demuxer/Stream.h"
 #include "MediaPrefs.h"

+#endif // MOZ_RUST_MP4PARSE
 
 using namespace stagefright;
 using mozilla::media::TimeUnit;
@@ -105,6 +109,7 @@ private:
   bool mCanSeek;
 };
 

 // Wrap an mp4_demuxer::Stream to remember the read offset.
 
 class RustStreamAdaptor {
@@ -151,6 +156,7 @@ private:
   RustStreamAdaptor mRustSource;
   mozilla::UniquePtr<mp4parse_parser, FreeMP4Parser> mRustParser;
 };
+#endif // MOZ_RUST_MP4PARSE
 
 class IndiceWrapperStagefright : public IndiceWrapper {
 public:
@@ -187,6 +193,7 @@ IndiceWrapperStagefright::GetIndice(size_t aIndex, Index::Indice& aIndice) const
   return true;
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 // the owner of mIndice is rust mp4 paser, so lifetime of this class
 // SHOULD NOT longer than rust parser.
 class IndiceWrapperRust : public IndiceWrapper
@@ -232,9 +239,11 @@ IndiceWrapperRust::GetIndice(size_t aIndex, Index::Indice& aIndice) const
   aIndice.sync = indice->sync;
   return true;
 }
+#endif // MOZ_RUST_MP4PARSE
 
 MP4Metadata::MP4Metadata(Stream* aSource)
  : mStagefright(MakeUnique<MP4MetadataStagefright>(aSource))
+#ifdef MOZ_RUST_MP4PARSE
  , mRust(MakeUnique<MP4MetadataRust>(aSource))
  , mPreferRust(MediaPrefs::EnableRustMP4Parser())
  , mReportedAudioTrackTelemetry(false)
@@ -242,6 +251,7 @@ MP4Metadata::MP4Metadata(Stream* aSource)
 #ifndef RELEASE_OR_BETA
  , mRustTestMode(MediaPrefs::RustTestMode())
 #endif

 {
 }
 
@@ -274,8 +284,11 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
   MP4Metadata::ResultAndTrackCount numTracks =
     mStagefright->GetNumberTracks(aType);
 
+#ifdef MOZ_RUST_MP4PARSE
   if (!mRust) {
+#endif // MOZ_RUST_MP4PARSE
     return numTracks;
+#ifdef MOZ_RUST_MP4PARSE
   }
@@ -211,10 +219,12 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
     mPreferRust = true;
     return numTracksRust;
   }
+#endif // MOZ_RUST_MP4PARSE
 
   MP4Metadata::ResultAndTrackCount numTracksRust =
@@ -350,8 +363,10 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
   // Same non-error numbers, just return any.
   // (Choosing Rust here, in case it carries a warning, we'd want to know that.)
   return numTracksRust;
+#endif // MOZ_RUST_MP4PARSE
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 bool MP4Metadata::ShouldPreferRust() const {
   if (!mRust) {
     return false;
@@ -389,6 +404,7 @@ bool MP4Metadata::ShouldPreferRust() const {
   // Otherwise, fall back.
   return false;
 }
+#endif // MOZ_RUST_MP4PARSE
 
 static const char*
 GetDifferentField(const mozilla::TrackInfo& info,
@@ -443,6 +459,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
   MP4Metadata::ResultAndTrackInfo info =
     mStagefright->GetTrackInfo(aType, aTrackNumber);
 
+#ifdef MOZ_RUST_MP4PARSE
   if (!mRust) {
     return info;
   }
@@ -514,6 +531,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
   if (mPreferRust) {
     return infoRust;
   }

 
   return info;
 }
@@ -528,6 +546,7 @@ MP4Metadata::ResultAndCryptoFile
 MP4Metadata::Crypto() const
 {
   MP4Metadata::ResultAndCryptoFile crypto = mStagefright->Crypto();
+#ifdef MOZ_RUST_MP4PARSE
   MP4Metadata::ResultAndCryptoFile rustCrypto = mRust->Crypto();
 
 #ifndef RELEASE_OR_BETA
@@ -548,6 +567,7 @@ MP4Metadata::Crypto() const
   if (mPreferRust) {
     return rustCrypto;
   }

 
   return crypto;
 }
@@ -556,17 +576,22 @@ MP4Metadata::ResultAndIndice
 MP4Metadata::GetTrackIndice(mozilla::TrackID aTrackID)
 {
   FallibleTArray<Index::Indice> indiceSF;
+#ifdef MOZ_RUST_MP4PARSE
   if (!mPreferRust
 #ifndef RELEASE_OR_BETA
       || mRustTestMode
 #endif
      ) {
+#endif // MOZ_RUST_MP4PARSE
     MediaResult rv = mStagefright->ReadTrackIndex(indiceSF, aTrackID);
     if (NS_FAILED(rv)) {
       return {Move(rv), nullptr};
     }
+#ifdef MOZ_RUST_MP4PARSE
   }
+#endif // MOZ_RUST_MP4PARSE
 
+#ifdef MOZ_RUST_MP4PARSE
   mp4parse_byte_data indiceRust = {};
   if (mPreferRust
 #ifndef RELEASE_OR_BETA
@@ -592,13 +617,18 @@ MP4Metadata::GetTrackIndice(mozilla::TrackID aTrackID)
     }
   }
 #endif
+#endif // MOZ_RUST_MP4PARSE
 
   UniquePtr<IndiceWrapper> indice;
+#ifdef MOZ_RUST_MP4PARSE
   if (mPreferRust) {
     indice = mozilla::MakeUnique<IndiceWrapperRust>(indiceRust);
   } else {
+#endif // MOZ_RUST_MP4PARSE
     indice = mozilla::MakeUnique<IndiceWrapperStagefright>(indiceSF);
+#ifdef MOZ_RUST_MP4PARSE
   }
+#endif // MOZ_RUST_MP4PARSE
 
   return {NS_OK, Move(indice)};
 }
@@ -856,6 +886,7 @@ MP4MetadataStagefright::Metadata(Stream* aSource)
   return {NS_OK, Move(buffer)};
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 bool
 RustStreamAdaptor::Read(uint8_t* buffer, uintptr_t size, size_t* bytes_read)
 {
@@ -1152,5 +1183,6 @@ MP4MetadataRust::Metadata(Stream* aSource)
   MOZ_ASSERT(false, "Not yet implemented");
   return {NS_ERROR_NOT_IMPLEMENTED, nullptr};
 }
+#endif // MOZ_RUST_MP4PARSE
 

index 492c9c1c1bc3..e16dbbd1155e 100644
--- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
+++ media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
@@ -13,7 +13,9 @@
 #include "MediaInfo.h"
 #include "MediaResult.h"
 #include "Stream.h"
+#ifdef MOZ_RUST_MP4PARSE
 #include "mp4parse.h"
+#endif // MOZ_RUST_MP4PARSE
 
 namespace mp4_demuxer {
 
@@ -82,6 +84,7 @@ public:
 
 private:
   UniquePtr<MP4MetadataStagefright> mStagefright;

   UniquePtr<MP4MetadataRust> mRust;
   mutable bool mPreferRust;
   mutable bool mReportedAudioTrackTelemetry;
@@ -90,6 +93,7 @@ private:
   mutable bool mRustTestMode;
 #endif
   bool ShouldPreferRust() const;

 };
 
 } // namespace mp4_demuxer
diff --git media/libstagefright/gtest/moz.build media/libstagefright/gtest/moz.build
index be4d56fc93f7..66fdd365f8f3 100644
--- media/libstagefright/gtest/moz.build
+++ media/libstagefright/gtest/moz.build
@@ -38,12 +38,13 @@ TEST_HARNESS_FILES.gtest += [
     'test_case_1351094.mp4',
 ]
 
-UNIFIED_SOURCES += ['TestMP4Rust.cpp',]
-TEST_HARNESS_FILES.gtest += [
-    '../../../dom/media/test/street.mp4',
-]
-LOCAL_INCLUDES += [
-    '../binding/include',
-]
+if CONFIG['MOZ_RUST']:
+    UNIFIED_SOURCES += ['TestMP4Rust.cpp',]
+    TEST_HARNESS_FILES.gtest += [
+        '../../../dom/media/test/street.mp4',
+    ]
+    LOCAL_INCLUDES += [
+        '../binding/include',
+    ]
 
 FINAL_LIBRARY = 'xul-gtest'
diff --git media/libstagefright/moz.build media/libstagefright/moz.build
index af5d1194d621..6725a0179989 100644
--- media/libstagefright/moz.build
+++ media/libstagefright/moz.build
@@ -83,9 +83,10 @@ SOURCES += [
     'system/core/libutils/VectorImpl.cpp',
 ]
 
-EXPORTS += [
-    'binding/include/mp4parse.h',
-]
+if CONFIG['MOZ_RUST']:
+    EXPORTS += [
+        'binding/include/mp4parse.h',
+    ]
 
 UNIFIED_SOURCES += [
     'binding/Adts.cpp',
diff --git mobile/android/confvars.sh mobile/android/confvars.sh
index e79b6f5c0707..eb62763acaf7 100644
--- mobile/android/confvars.sh

 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
 
diff --git netwerk/base/moz.build netwerk/base/moz.build
index 61d022a9660e..e5ca1d77d859 100644
--- netwerk/base/moz.build
+++ netwerk/base/moz.build
@@ -256,7 +256,7 @@ UNIFIED_SOURCES += [
     'TLSServerSocket.cpp',
 ]
 
-if CONFIG['MOZ_RUST_URLPARSE']:
+if CONFIG['MOZ_RUST'] and CONFIG['MOZ_RUST_URLPARSE']:
     EXPORTS.mozilla.net += [ 'RustURL.h' ]
     UNIFIED_SOURCES += [ 'RustURL.cpp' ]
 
diff --git netwerk/base/nsStandardURL.cpp netwerk/base/nsStandardURL.cpp
index 608b918a4ecf..20bcdeb34ab8 100644
--- netwerk/base/nsStandardURL.cpp
+++ netwerk/base/nsStandardURL.cpp
@@ -858,6 +858,7 @@ nsStandardURL::BuildNormalizedSpec(const char *spec)
         if (!SegmentIs(spec, mScheme, "resource") &&
             !SegmentIs(spec, mScheme, "chrome")) {
             nsAutoCString ipString;
+#ifdef MOZ_RUST
             if (encHost.Length() > 0 &&
                 encHost.First() == '[' && encHost.Last() == ']' &&
                 ValidIPv6orHostname(encHost.get(), encHost.Length())) {
@@ -866,7 +867,9 @@ nsStandardURL::BuildNormalizedSpec(const char *spec)
                     return rv;
                 }
                 encHost = ipString;
-            } else if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {
+            } else
+#endif
+            if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {
                 encHost = ipString;
             }
         }
@@ -2112,6 +2115,7 @@ nsStandardURL::SetHost(const nsACString &input)
 
     if (!SegmentIs(mScheme, "resource") && !SegmentIs(mScheme, "chrome")) {
         nsAutoCString ipString;
+#ifdef MOZ_RUST
         if (hostBuf.Length() > 0 &&
             hostBuf.First() == '[' && hostBuf.Last() == ']' &&
             ValidIPv6orHostname(hostBuf.get(), hostBuf.Length())) {
@@ -2120,7 +2124,9 @@ nsStandardURL::SetHost(const nsACString &input)
                 return rv;
             }
             hostBuf = ipString;
-        } else if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {
+        } else
+#endif
+        if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {
           hostBuf = ipString;
         }
     }
diff --git old-configure.in old-configure.in
index 717a94fcc692..54b29d737cc1 100644
--- old-configure.in
+++ old-configure.in
@@ -2330,9 +2330,14 @@ if test -n "$MOZ_MULET"; then
 fi
 
 # Propagate feature switches for code written in rust from confvars.sh
-if test -n "$MOZ_RUST_URLPARSE"; then
-    AC_DEFINE(MOZ_RUST_URLPARSE)
-    AC_SUBST(MOZ_RUST_URLPARSE)
+if test -n "$MOZ_RUST"; then
+    if test -n "$MOZ_RUST_MP4PARSE"; then
+        AC_DEFINE(MOZ_RUST_MP4PARSE)
+    fi
+    if test -n "$MOZ_RUST_URLPARSE"; then
+        AC_DEFINE(MOZ_RUST_URLPARSE)
+        AC_SUBST(MOZ_RUST_URLPARSE)
+    fi
 fi
 
 AC_SUBST(MOZ_PHOENIX)
diff --git toolkit/components/telemetry/Histograms.json toolkit/components/telemetry/Histograms.json
index 061c55f6a5b6..e49dfd176952 100644
--- toolkit/components/telemetry/Histograms.json
+++ toolkit/components/telemetry/Histograms.json
@@ -8320,7 +8320,8 @@
     "expires_in_version": "60",
     "kind": "boolean",
     "bug_numbers": [1220885],
-    "description": "Whether the rust mp4 demuxer successfully parsed a stream segment."
+    "description": "Whether the rust mp4 demuxer successfully parsed a stream segment.",
+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_RUST_MP4PARSE_ERROR_CODE": {
     "record_in_processes": ["main", "content"],
@@ -8329,7 +8330,8 @@
     "kind": "enumerated",
     "n_values": 32,
     "bug_numbers": [1238420],

+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": {
     "record_in_processes": ["main", "content"],
@@ -8337,7 +8339,8 @@
     "expires_in_version": "60",
     "kind": "boolean",
     "bug_numbers": [1231169],
-    "description": "Whether rust and stagefight mp4 parser audio track results match."

+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": {
     "record_in_processes": ["main", "content"],
@@ -8345,7 +8348,8 @@
     "expires_in_version": "60",
     "kind": "boolean",
     "bug_numbers": [1231169],
-    "description": "Whether rust and stagefight mp4 parser video track results match."

+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_WMF_DECODE_ERROR": {
     "record_in_processes": ["main", "content", "gpu"],
diff --git toolkit/library/gtest/moz.build toolkit/library/gtest/moz.build
index 69a8fb1f4893..c684f48e456e 100644
--- toolkit/library/gtest/moz.build
+++ toolkit/library/gtest/moz.build
@@ -7,7 +7,6 @@
 FINAL_TARGET = 'dist/bin/gtest'
 
 USE_LIBS += [
-    'gkrust-gtest',
     'static:xul',
     # xul-gtest is an intermediate static library. It is used as FINAL_TARGET
     # for gtest code.
@@ -21,6 +20,11 @@ USE_LIBS += [
 # before StaticXULComponentStart.
 Libxul('xul-gtest-real')
 
+if CONFIG['MOZ_RUST']:
+    USE_LIBS += [
+        'gkrust-gtest',
+    ]
+
 DIRS += [
     'static',
 ]
diff --git toolkit/library/moz.build toolkit/library/moz.build
index 650f6eaba980..191e90ceb09a 100644
--- toolkit/library/moz.build
+++ toolkit/library/moz.build
@@ -63,7 +63,7 @@ def Libxul(name):
 
     # This option should go away in bug 1290972, but we need to wait until
     # Rust 1.12 has been released.
-    if CONFIG['OS_ARCH'] == 'Darwin':
+    if CONFIG['MOZ_RUST'] and CONFIG['OS_ARCH'] == 'Darwin':
         LDFLAGS += ['-Wl,-no_compact_unwind']
 
 Libxul('xul')
@@ -343,4 +343,5 @@ USE_LIBS += ['StaticXULComponentsEnd']
 # The above library needs to be last for C++ purposes.  This library,
 # however, is entirely composed of Rust code, and needs to come after
 # all the C++ code so any possible C++ -> Rust calls can be resolved.
-USE_LIBS += ['gkrust']
+if CONFIG['MOZ_RUST']:
+    USE_LIBS += ['gkrust']
diff --git toolkit/moz.configure toolkit/moz.configure
index ac9d123224ce..e90da70f0fa5 100644
--- toolkit/moz.configure
+++ toolkit/moz.configure
@@ -88,8 +88,7 @@ include('../js/moz.configure')
 
 # Rust
 # ==============================================================
-include('../build/moz.configure/rust.configure',
-        when='--enable-compile-environment')
+include('../build/moz.configure/rust.configure')
 
 
 # L10N
@@ -623,13 +622,13 @@ id_and_secret_keyfile('Leanplum SDK')
 option('--enable-stylo', nargs='?', choices=('build',),
        help='Include Stylo in the build and/or enable it at runtime')
 
-@depends('--enable-stylo')
-def stylo_config(value):
+@depends('--enable-stylo', '--enable-rust')
+def stylo_config(value, rust_enabled):
     build_stylo = None
     enable_stylo = None
 
     # The default is to not build Stylo at all.
-    if value.origin == 'default':
+    if not rust_enabled or value.origin == 'default':
         pass
     elif value == 'build':
         build_stylo = True
@@ -769,12 +768,14 @@ set_config('SERVO_TARGET_DIR', servo_target_dir)
 option('--enable-webrender', nargs='?', choices=('build',),
        help='Include WebRender in the build and/or enable it at runtime')
 
-@depends('--enable-webrender', milestone)
-def webrender(value, milestone):
+@depends('--enable-webrender', '--enable-rust', milestone)
+def webrender(value, rust_enabled, milestone):
     build_webrender = None
     enable_webrender = None
 
-    if value.origin == 'default':
+    if not rust_enabled:
+        pass
+    elif value.origin == 'default':
         # if nothing is specified, default to just building on Nightly
         build_webrender = milestone.is_nightly
     elif value == 'build':
diff --git toolkit/toolkit.mozbuild toolkit/toolkit.mozbuild
index b845aab48023..9215afc6dd2d 100644
--- toolkit/toolkit.mozbuild
+++ toolkit/toolkit.mozbuild
@@ -133,16 +133,23 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:
 
 DIRS += [
     '/devtools',
-    '/toolkit/library',
-    '/toolkit/library/gtest/rust',
-    '/toolkit/library/rust',
-    '/toolkit/library/StaticXULComponentsEnd',
     '/services',
     '/startupcache',
     '/js/ductwork/debugger',
     '/other-licenses/snappy',
 ]
 
+if CONFIG['MOZ_RUST']:
+    DIRS += [
+        '/toolkit/library/gtest/rust',
+        '/toolkit/library/rust',
+    ]
+
+DIRS += [
+    '/toolkit/library/StaticXULComponentsEnd',
+    '/toolkit/library',
+]
+
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     DIRS += ['/toolkit/system/gnome']
 
diff --git toolkit/xre/nsAppRunner.cpp toolkit/xre/nsAppRunner.cpp
index 667c2eb1b365..6fb6cf102baa 100644
--- toolkit/xre/nsAppRunner.cpp
+++ toolkit/xre/nsAppRunner.cpp
@@ -227,11 +227,13 @@
 extern uint32_t gRestartMode;
 extern void InstallSignalHandlers(const char *ProgramName);
 
+#ifdef MOZ_RUST
 // This workaround is fixed in Rust 1.19. For details, see bug 1358151.
 // Implementation in toolkit/library/rust/shared/lib.rs
 extern "C" {
   void rust_init_please_remove_this_after_updating_rust_1_19();
 }
+#endif
 
 #define FILE_COMPATIBILITY_INFO NS_LITERAL_CSTRING("compatibility.ini")
 #define FILE_INVALIDATE_CACHES NS_LITERAL_CSTRING(".purgecaches")
@@ -3122,8 +3124,10 @@ XREMain::XRE_mainInit(bool* aExitFlag)
     return 1;
   *aExitFlag = false;
 
+#ifdef MOZ_RUST
   // This workaround is fixed in Rust 1.19. For details, see bug 1358151.
   rust_init_please_remove_this_after_updating_rust_1_19();
+#endif
 
   atexit(UnexpectedExit);
   auto expectedShutdown = mozilla::MakeScopeExit([&] {
diff --git xpcom/base/nsDebugImpl.cpp xpcom/base/nsDebugImpl.cpp
index e6bb623c258b..c49d61dce605 100644
--- xpcom/base/nsDebugImpl.cpp
+++ xpcom/base/nsDebugImpl.cpp
@@ -148,14 +148,20 @@ nsDebugImpl::Abort(const char* aFile, int32_t aLine)
   return NS_OK;
 }
 
+#ifdef MOZ_RUST
 // From toolkit/library/rust/lib.rs
 extern "C" void intentional_panic(const char* message);
+#endif
 
 NS_IMETHODIMP
 nsDebugImpl::RustPanic(const char* aMessage)
 {
+#ifdef MOZ_RUST
   intentional_panic(aMessage);
   return NS_OK;
+#else
+  return NS_ERROR_NOT_IMPLEMENTED;
+#endif
 }
 
 NS_IMETHODIMP
diff --git xpcom/rust/nsstring/gtest/moz.build xpcom/rust/nsstring/gtest/moz.build
index 197411678815..5bed9e57e57d 100644
--- xpcom/rust/nsstring/gtest/moz.build
+++ xpcom/rust/nsstring/gtest/moz.build
@@ -4,8 +4,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
-    'Test.cpp'
-]
+if CONFIG['MOZ_RUST']:
+    UNIFIED_SOURCES += [
+        'Test.cpp'
+    ]
 
 FINAL_LIBRARY = 'xul-gtest'




--- third_party/python/futures/concurrent/futures/process.py.orig	2017-04-11 04:15:19 UTC
+++ third_party/python/futures/concurrent/futures/process.py
@@ -247,7 +247,11 @@ def _check_system_limits():
     _system_limits_checked = True
     try:
         import os
-        nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
+        if sys.platform.startswith('freebsd'):
+            # sem(4) confuses sysconf(3) on FreeBSD < 11.1
+            nsems_max = -1
+        else:
+            nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
     except (AttributeError, ValueError):
         # sysconf not available or setting not available
         return

Return to bug 219963

Lines 37-48 RUN_DEPENDS+= libxul>=45:www/libxul Link Here

(-)b/Mk/Uses/gecko.mk (-2 / +2 lines)
37	.elif ${gecko_ARGS:Mfirefox}	37	.elif ${gecko_ARGS:Mfirefox}
38		38
39	_GECKO_DEFAULT_VERSION= 52	39	_GECKO_DEFAULT_VERSION= 52
40	_GECKO_VERSIONS= 52 54	40	_GECKO_VERSIONS= 52 55
41	_GECKO_TYPE= firefox	41	_GECKO_TYPE= firefox
42		42
43	# Dependence lines for different Firefox versions	43	# Dependence lines for different Firefox versions
44	52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr	44	52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
45	54_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox	45	55_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
46		46
47	.if exists(${LOCALBASE}/bin/firefox)	47	.if exists(${LOCALBASE}/bin/firefox)
48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null	48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null

Lines 2-26 Link Here

(-)b/www/firefox/Makefile (-5 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 54.0	5	DISTVERSION= 55.0b1
6	DISTVERSIONSUFFIX=.source	6	DISTVERSIONSUFFIX=.source
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= www ipv6	8	CATEGORIES= www ipv6
9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \	9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
10	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source	10	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source
11		11
12	MAINTAINER= gecko@FreeBSD.org	12	MAINTAINER= gecko@FreeBSD.org
13	COMMENT= Web browser based on the browser portion of Mozilla	13	COMMENT= Web browser based on the browser portion of Mozilla
14		14
15	BUILD_DEPENDS= nspr>=4.14:devel/nspr \	15	BUILD_DEPENDS= nspr>=4.14:devel/nspr \
16	nss>=3.30.2:security/nss \	16	nss>=3.31:security/nss \
17	libevent>=2.0.22:devel/libevent \	17	libevent>=2.0.22:devel/libevent \
18	harfbuzz>=1.4.3:print/harfbuzz \	18	harfbuzz>=1.4.6:print/harfbuzz \
19	graphite2>=1.3.10:graphics/graphite2 \	19	graphite2>=1.3.10:graphics/graphite2 \
20	png>=1.6.28:graphics/png \	20	png>=1.6.28:graphics/png \
21	libvorbis>=1.3.5,3:audio/libvorbis \	21	libvorbis>=1.3.5,3:audio/libvorbis \
22	libvpx>=1.5.0:multimedia/libvpx \	22	libvpx>=1.5.0:multimedia/libvpx \
23	sqlite3>=3.17.0:databases/sqlite3 \	23	sqlite3>=3.19.2:databases/sqlite3 \
24	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \	24	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
25	v4l_compat>0:multimedia/v4l_compat \	25	v4l_compat>0:multimedia/v4l_compat \
26	autoconf-2.13:devel/autoconf213 \	26	autoconf-2.13:devel/autoconf213 \
Lines 46-51 MOZ_OPTIONS= --enable-application=browser \ Link Here
46		46
47	OPTIONS_DEFINE= RUST	47	OPTIONS_DEFINE= RUST
48	OPTIONS_DEFAULT= BUNDLED_CAIRO	48	OPTIONS_DEFAULT= BUNDLED_CAIRO
		49	OPTIONS_EXCLUDE= GNOMEUI
49	# XXX lang/rust and devel/cargo currently build only on these platforms	50	# XXX lang/rust and devel/cargo currently build only on these platforms
50	OPTIONS_DEFAULT_amd64= RUST	51	OPTIONS_DEFAULT_amd64= RUST
51	OPTIONS_DEFAULT_i386= RUST	52	OPTIONS_DEFAULT_i386= RUST

Lines 122-128 index 57bcb4c13652..68be024f4a68 100644 Link Here

(-)b/www/firefox/files/patch-bug1021761 (-22 / +18 lines)
122		122
123	static int	123	static int
124	validate_stream_params(cubeb_stream_params * input_stream_params,	124	validate_stream_params(cubeb_stream_params * input_stream_params,
125	@@ -138,6 +141,9 @@ cubeb_init(cubeb ** context, char const * context_name)	125	@@ -155,6 +158,10 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
		126	#if defined(USE_KAI)
		127	init_oneshot = kai_init;
		128	#endif
		129	+ } else if (!strcmp(backend_name, "oss")) {
		130	+#if defined(USE_OSS)
		131	+ init_oneshot = oss_init;
		132	+#endif
		133	} else {
		134	/* Already set */
		135	}
		136	@@ -196,6 +203,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
126	#if defined(USE_KAI)	137	#if defined(USE_KAI)
127	kai_init,	138	kai_init,
128	#endif	139	#endif
Lines 246-252 index 05ad27fef53b..3ea78e994f59 100644 Link Here
246	+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);	257	+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
247		258
248	/* Correct read size to the other stream available frames */	259	/* Correct read size to the other stream available frames */
249	if (stm->other_stream && got > stm->other_stream->bufframes) {	260	if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
250	@@ -372,8 +421,8 @@ alsa_process_stream(cubeb_stream * stm)	261	@@ -372,8 +421,8 @@ alsa_process_stream(cubeb_stream * stm)
251	long drain_frames = avail - stm->bufframes;	262	long drain_frames = avail - stm->bufframes;
252	double drain_time = (double) drain_frames / stm->params.rate;	263	double drain_time = (double) drain_frames / stm->params.rate;
Lines 579-585 index 05ad27fef53b..3ea78e994f59 100644 Link Here
579	+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);	590	+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
580	assert((nfds_t) r == stm->nfds);	591	assert((nfds_t) r == stm->nfds);
581		592
582	r = pthread_cond_init(&stm->cond, NULL);	593	if (alsa_register_stream(ctx, stm) != 0) {
583	@@ -1048,7 +1156,7 @@ alsa_stream_destroy(cubeb_stream * stm)	594	@@ -1048,7 +1156,7 @@ alsa_stream_destroy(cubeb_stream * stm)
584	pthread_mutex_lock(&stm->mutex);	595	pthread_mutex_lock(&stm->mutex);
585	if (stm->pcm) {	596	if (stm->pcm) {
Lines 1182-1210 diff --git media/libcubeb/update.sh media/libcubeb/update.sh Link Here
1182	index b139b8f497fd..d1f8a223c6d8 100755	1193	index b139b8f497fd..d1f8a223c6d8 100755
1183	--- media/libcubeb/update.sh	1194	--- media/libcubeb/update.sh
1184	+++ media/libcubeb/update.sh	1195	+++ media/libcubeb/update.sh
1185	@@ -17,6 +17,7 @@ cp $1/src/cubeb_audiounit.cpp src	1196	@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src
1186	cp $1/src/cubeb_osx_run_loop.h src	1197	cp $1/src/cubeb_mixer.cpp src
1187	cp $1/src/cubeb_jack.cpp src	1198	cp $1/src/cubeb_mixer.h src
1188	cp $1/src/cubeb_opensl.c src	1199	cp $1/src/cubeb_opensl.c src
1189	+cp $1/src/cubeb_oss.c src	1200	+cp $1/src/cubeb_oss.c src
1190	cp $1/src/cubeb_array_queue.h src	1201	cp $1/src/cubeb_osx_run_loop.h src
1191	cp $1/src/cubeb_panner.cpp src	1202	cp $1/src/cubeb_panner.cpp src
1192	cp $1/src/cubeb_panner.h src	1203	cp $1/src/cubeb_panner.h src
1193	diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
1194	index 3e5450f5d63a..dd45427f655a 100644
1195	--- media/webrtc/signaling/test/common.build
1196	+++ media/webrtc/signaling/test/common.build
1197	@@ -99,8 +99,8 @@ USE_LIBS += ['mozglue']
1198	OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
1199	OS_LIBS += CONFIG['REALTIME_LIBS']
1200
1201	-if CONFIG['MOZ_ALSA']:
1202	- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
1203	+if CONFIG['MOZ_OSS']:
1204	+ OS_LIBS += CONFIG['MOZ_OSS_LIBS']
1205
1206	if CONFIG['MOZ_SYSTEM_JPEG']:
1207	OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
1208	diff --git toolkit/library/moz.build toolkit/library/moz.build	1204	diff --git toolkit/library/moz.build toolkit/library/moz.build
1209	index a61c689c83c3..7764df6f8a6b 100644	1205	index a61c689c83c3..7764df6f8a6b 100644
1210	--- toolkit/library/moz.build	1206	--- toolkit/library/moz.build

Added Link Here

(-)b/www/firefox/files/patch-bug1371927 (+124 lines)
1	commit 40744bcfbf86
2	Author: Iaroslav (yarik) Sheptykin <yarik.sheptykin@googlemail.com>
3	Date: Sat Jun 10 19:59:16 2017 +0200
4
5	Bug 1371927: Build KeyedStackCapture only if profiler enabled. r=gfritzsche
6
7	MozReview-Commit-ID: 9IoVY2K5hXc
8	---
9	toolkit/components/telemetry/HangReports.cpp \| 6 +++---
10	toolkit/components/telemetry/KeyedStackCapturer.cpp \| 3 ---
11	toolkit/components/telemetry/KeyedStackCapturer.h \| 4 ----
12	toolkit/components/telemetry/Telemetry.cpp \| 5 ++++-
13	toolkit/components/telemetry/moz.build \| 7 ++++++-
14	5 files changed, 13 insertions(+), 12 deletions(-)
15
16	diff --git toolkit/components/telemetry/HangReports.cpp toolkit/components/telemetry/HangReports.cpp
17	index a093405fe7a9..da9e117b2524 100644
18	--- toolkit/components/telemetry/HangReports.cpp
19	+++ toolkit/components/telemetry/HangReports.cpp
20	@@ -11,9 +11,6 @@ namespace Telemetry {
21
22	using namespace HangMonitor;
23
24	-/** The maximum number of stacks that we're keeping for hang reports. */
25	-const size_t kMaxHangStacksKept = 50;
26	-
27	// This utility function generates a string key that is used to index the annotations
28	// in a hash map from \|HangReports::AddHang\|.
29	nsresult
30	@@ -36,6 +33,9 @@ ComputeAnnotationsKey(const HangAnnotationsPtr& aAnnotations, nsAString& aKeyOut
31	}
32
33	#if defined(MOZ_GECKO_PROFILER)
34	+/** The maximum number of stacks that we're keeping for hang reports. */
35	+const size_t kMaxHangStacksKept = 50;
36	+
37	void
38	HangReports::AddHang(const Telemetry::ProcessedStack& aStack,
39	uint32_t aDuration,
40	diff --git toolkit/components/telemetry/KeyedStackCapturer.cpp toolkit/components/telemetry/KeyedStackCapturer.cpp
41	index 25479485fcd9..6b6431a44978 100644
42	--- toolkit/components/telemetry/KeyedStackCapturer.cpp
43	+++ toolkit/components/telemetry/KeyedStackCapturer.cpp
44	@@ -12,8 +12,6 @@
45
46	namespace {
47
48	-#if defined(MOZ_GECKO_PROFILER)
49	-
50	/** Defines the size of the keyed stack dictionary. */
51	const uint8_t kMaxKeyLength = 50;
52
53	@@ -161,7 +159,6 @@ KeyedStackCapturer::Clear()
54	mStackInfos.Clear();
55	mStacks.Clear();
56	}
57	-#endif
58
59	} // namespace Telemetry
60	} // namespace mozilla
61	diff --git toolkit/components/telemetry/KeyedStackCapturer.h toolkit/components/telemetry/KeyedStackCapturer.h
62	index 77f17a613948..f554787b5934 100644
63	--- toolkit/components/telemetry/KeyedStackCapturer.h
64	+++ toolkit/components/telemetry/KeyedStackCapturer.h
65	@@ -6,8 +6,6 @@
66	#ifndef KeyedStackCapturer_h__
67	#define KeyedStackCapturer_h__
68
69	-#ifdef MOZ_GECKO_PROFILER
70	-
71	#include "Telemetry.h"
72	#include "nsString.h"
73	#include "nsClassHashtable.h"
74	@@ -74,6 +72,4 @@ private:
75	} // namespace Telemetry
76	} // namespace mozilla
77
78	-#endif // MOZ_GECKO_PROFILER
79	-
80	#endif // KeyedStackCapturer_h__
81	diff --git toolkit/components/telemetry/Telemetry.cpp toolkit/components/telemetry/Telemetry.cpp
82	index 4864f400a21a..a81975873d02 100644
83	--- toolkit/components/telemetry/Telemetry.cpp
84	+++ toolkit/components/telemetry/Telemetry.cpp
85	@@ -99,10 +99,13 @@ using Telemetry::Common::AutoHashtable;
86	using mozilla::dom::Promise;
87	using mozilla::dom::AutoJSAPI;
88	using mozilla::Telemetry::HangReports;
89	-using mozilla::Telemetry::KeyedStackCapturer;
90	using mozilla::Telemetry::CombinedStacks;
91	using mozilla::Telemetry::ComputeAnnotationsKey;
92
93	+#if defined(MOZ_GECKO_PROFILER)
94	+using mozilla::Telemetry::KeyedStackCapturer;
95	+#endif
96	+
97	/**
98	* IOInterposeObserver recording statistics of main-thread I/O during execution,
99	* aimed at consumption by TelemetryImpl
100	diff --git toolkit/components/telemetry/moz.build toolkit/components/telemetry/moz.build
101	index c8d5b177d205..30c8914c4055 100644
102	--- toolkit/components/telemetry/moz.build
103	+++ toolkit/components/telemetry/moz.build
104	@@ -57,7 +57,6 @@ SOURCES += [
105	'HangReports.cpp',
106	'ipc/TelemetryIPC.cpp',
107	'ipc/TelemetryIPCAccumulator.cpp',
108	- 'KeyedStackCapturer.cpp',
109	'Telemetry.cpp',
110	'TelemetryCommon.cpp',
111	'TelemetryEvent.cpp',
112	@@ -66,6 +65,12 @@ SOURCES += [
113	'WebrtcTelemetry.cpp',
114	]
115
116	+# KeyedStackCapturer entirely relies on profiler to be enabled.
117	+if CONFIG['MOZ_GECKO_PROFILER']:
118	+ SOURCES += [
119	+ 'KeyedStackCapturer.cpp'
120	+ ]
121	+
122	EXTRA_COMPONENTS += [
123	'TelemetryStartup.js',
124	'TelemetryStartup.manifest'

Lines 51-68 index b483cd1..f1dd1f0 100644 Link Here

(-)b/www/firefox/files/patch-bug826985 (-12 lines)
51	# basic stuff for everything	51	# basic stuff for everything
52	'include_internal_video_render': 0,	52	'include_internal_video_render': 0,
53	'clang_use_chrome_plugins': 0,	53	'clang_use_chrome_plugins': 0,
54	diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
55	index b483cd1..f1dd1f0 100644
56	--- media/webrtc/signaling/test/common.build
57	+++ media/webrtc/signaling/test/common.build
58	@@ -99,6 +99,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
59
60	USE_LIBS += ['mozglue']
61
62	+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
63	OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
64	OS_LIBS += CONFIG['REALTIME_LIBS']
65
66	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	54	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
67	index 239a292..bab496c 100644	55	index 239a292..bab496c 100644
68	--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc	56	--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc

Removed Link Here

(-)a/www/firefox/files/patch-bug981348 (-61 lines)
1	diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
2	index 88bba9baa401..99f240952dfe 100644
3	--- dom/system/OSFileConstants.cpp
4	+++ dom/system/OSFileConstants.cpp
5	@@ -16,14 +16,17 @@
6	#include "dirent.h"
7	#include "poll.h"
8	#include "sys/stat.h"
9	-#if defined(ANDROID)
10	+#if defined(XP_LINUX)
11	#include <sys/vfs.h>
12	#define statvfs statfs
13	+#define f_frsize f_bsize
14	#else
15	#include "sys/statvfs.h"
16	+#endif // defined(XP_LINUX)
17	+#if !defined(ANDROID)
18	#include "sys/wait.h"
19	#include <spawn.h>
20	-#endif // defined(ANDROID)
21	+#endif // !defined(ANDROID)
22	#endif // defined(XP_UNIX)
23
24	#if defined(XP_LINUX)
25	@@ -699,7 +702,7 @@ static const dom::ConstantSpec gLibcProperties[] =
26
27	{ "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
28
29	- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) },
30	+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) },
31	{ "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) },
32
33	#endif // defined(XP_UNIX)
34	diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
35	index a028dda7d5ec..f5c632e3d7e5 100644
36	--- toolkit/components/osfile/modules/osfile_unix_back.jsm
37	+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
38	@@ -228,8 +228,8 @@
39	let statvfs = new SharedAll.HollowStructure("statvfs",
40	Const.OSFILE_SIZEOF_STATVFS);
41
42	- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
43	- "f_bsize", Type.unsigned_long.implementation);
44	+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
45	+ "f_frsize", Type.unsigned_long.implementation);
46	statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
47	"f_bavail", Type.fsblkcnt_t.implementation);
48
49	diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
50	index bd60d4d8419c..a8cd6b546b0e 100644
51	--- toolkit/components/osfile/modules/osfile_unix_front.jsm
52	+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
53	@@ -399,7 +399,7 @@
54	throw_on_negative("statvfs", (UnixFile.statvfs \|\| UnixFile.statfs)(sourcePath, fileSystemInfoPtr));
55
56	let bytes = new Type.uint64_t.implementation(
57	- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
58	+ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
59
60	return bytes.value;
61	};

Removed Link Here

(-)a/www/firefox/files/patch-python_futures_concurrent_futures_process.py (-15 lines)
1	--- python/futures/concurrent/futures/process.py.orig 2017-04-11 04:15:19 UTC
2	+++ python/futures/concurrent/futures/process.py
3	@@ -247,7 +247,11 @@ def _check_system_limits():
4	_system_limits_checked = True
5	try:
6	import os
7	- nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
8	+ if sys.platform.startswith('freebsd'):
9	+ # sem(4) confuses sysconf(3) on FreeBSD < 11.1
10	+ nsems_max = -1
11	+ else:
12	+ nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
13	except (AttributeError, ValueError):
14	# sysconf not available or setting not available
15	return

Added Link Here

(-)b/www/firefox/files/patch-third__party_python_futures_concurrent_futures_process.py (+15 lines)
1	--- third_party/python/futures/concurrent/futures/process.py.orig 2017-04-11 04:15:19 UTC
2	+++ third_party/python/futures/concurrent/futures/process.py
3	@@ -247,7 +247,11 @@ def _check_system_limits():
4	_system_limits_checked = True
5	try:
6	import os
7	- nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
8	+ if sys.platform.startswith('freebsd'):
9	+ # sem(4) confuses sysconf(3) on FreeBSD < 11.1
10	+ nsems_max = -1
11	+ else:
12	+ nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
13	except (AttributeError, ValueError):
14	# sysconf not available or setting not available
15	return