Bug 1360060 - P2: Add patch to libcubeb/update.sh r?kinetik draft
authorDan Glastonbury <dglastonbury@mozilla.com>
Wed, 24 May 2017 20:48:00 +1000
changeset 590145 55ca24589b69240037f79fb5ba391cc98cb4393a
parent 590144 36c53bef6e6edd7815024163675b809a42937f43
child 590146 8166bcf9ab704bccc329fc4dc22cfa762a51bb99
push id62606
push userbmo:dglastonbury@mozilla.com
push dateWed, 07 Jun 2017 07:13:29 +0000
reviewerskinetik
bugs1360060
milestone55.0a1
Bug 1360060 - P2: Add patch to libcubeb/update.sh r?kinetik MozReview-Commit-ID: CPSGDKtrJZI
media/libcubeb/prefer-pulse-rust.patch
media/libcubeb/update.sh
new file mode 100644
--- /dev/null
+++ b/media/libcubeb/prefer-pulse-rust.patch
@@ -0,0 +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)
++    pulse_rust_init,
++#endif
+ #if defined(USE_PULSE)
+     pulse_init,
+ #endif
--- a/media/libcubeb/update.sh
+++ b/media/libcubeb/update.sh
@@ -63,10 +63,13 @@ if [ -n "$rev" ]; then
     echo "WARNING: updating from a dirty git repository."
   fi
   sed -i.bak -e "/The git commit ID used was/ s/[0-9a-f]\{40\}\(-dirty\)\{0,1\} .\{1,100\}/$version ($date)/" README_MOZILLA
   rm README_MOZILLA.bak
 else
   echo "Remember to update README_MOZILLA with the version details."
 fi
 
-echo "Applying a patch on top of $rev"
+echo "Applying disable-assert.patch on top of $rev"
 patch -p3 < disable-assert.patch
+
+echo "Applying prefer-pulse-rust.patch on top of $rev"
+patch -p3 < prefer-pulse-rust.patch