Bug 1372057 - Limit pulse-rust to nightly builds. r=kinetik
authorDan Glastonbury <dan.glastonbury@gmail.com>
Mon, 12 Jun 2017 11:26:33 +1000
changeset 413908 70bfa8c83b16b1e3dd4477a6f9aa7c8d03ea6072
parent 413907 401127e8ba3bf0890d843c33173f9d1fb182e643
child 413909 f1ecd59649e4253c42aec200da396fc4591f27cd
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik
bugs1372057
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1372057 - Limit pulse-rust to nightly builds. r=kinetik MozReview-Commit-ID: Ev4GSuEN5Xa
media/libcubeb/prefer-pulse-rust.patch
media/libcubeb/src/cubeb.c
--- a/media/libcubeb/prefer-pulse-rust.patch
+++ b/media/libcubeb/prefer-pulse-rust.patch
@@ -1,14 +1,14 @@
 diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c
 index 1db59240e335..241f3cfed041 100644
 --- a/media/libcubeb/src/cubeb.c
 +++ b/media/libcubeb/src/cubeb.c
 @@ -166,6 +166,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
       * to override all other choices
       */
      init_oneshot,
-+#if defined(USE_PULSE_RUST)
++#if defined(NIGHTLY_BUILD) && defined(USE_PULSE_RUST)
 +    pulse_rust_init,
 +#endif
  #if defined(USE_PULSE)
      pulse_init,
  #endif
--- a/media/libcubeb/src/cubeb.c
+++ b/media/libcubeb/src/cubeb.c
@@ -161,17 +161,17 @@ cubeb_init(cubeb ** context, char const 
   }
 
   int (* default_init[])(cubeb **, char const *) = {
     /*
      * init_oneshot must be at the top to allow user
      * to override all other choices
      */
     init_oneshot,
-#if defined(USE_PULSE_RUST)
+#if defined(NIGHTLY_BUILD) && defined(USE_PULSE_RUST)
     pulse_rust_init,
 #endif
 #if defined(USE_PULSE)
     pulse_init,
 #endif
 #if defined(USE_JACK)
     jack_init,
 #endif