Bug 1306164 - Drop byteorder from mp4parse update script. r?kinetik draft
authorRalph Giles <giles@mozilla.com>
Thu, 29 Sep 2016 15:28:31 -0700
changeset 419192 b643a77273a58975a752526bf50e5ba9115b9117
parent 419033 9baec74b3db1bf005c66ae2f50bafbdb02c3be38
child 532530 89c00355cfa91d124b16cb422c6022445bc2f402
push id30882
push userbmo:giles@thaumas.net
push dateThu, 29 Sep 2016 22:33:26 +0000
reviewerskinetik
bugs1306164, 1298422
milestone52.0a1
Bug 1306164 - Drop byteorder from mp4parse update script. r?kinetik The byteorder dependency was moved to $topsrcdir/third_party/rust/ in bug 1298422 but this import script wasn't updated. MozReview-Commit-ID: CzoxsFPYpIm
media/libstagefright/binding/mp4parse-cargo.patch
media/libstagefright/binding/update-rust.sh
--- a/media/libstagefright/binding/mp4parse-cargo.patch
+++ b/media/libstagefright/binding/mp4parse-cargo.patch
@@ -24,17 +24,17 @@ index ff9422c..814c4c6 100644
 @@ -18,17 +18,11 @@ exclude = [
  ]
  
  [dependencies]
 -byteorder = "0.5.0"
 -afl = { version = "0.1.1", optional = true }
 -afl-plugin = { version = "0.1.1", optional = true }
 -abort_on_panic = { version = "1.0.0", optional = true }
-+byteorder = { version = "0.5.0", path = "../byteorder" }
++byteorder = "0.5.0"
  
  [dev-dependencies]
  test-assembler = "0.1.2"
  
 -[features]
 -fuzz = ["afl", "afl-plugin", "abort_on_panic"]
 -
  # Somewhat heavy-handed, but we want at least -Z force-overflow-checks=on.
--- a/media/libstagefright/binding/update-rust.sh
+++ b/media/libstagefright/binding/update-rust.sh
@@ -31,27 +31,17 @@ cp _upstream/mp4parse/mp4parse/Cargo.tom
 cp _upstream/mp4parse/mp4parse/src/*.rs mp4parse/src/
 rm -rf mp4parse_capi
 mkdir -p mp4parse_capi/src
 cp _upstream/mp4parse/mp4parse_capi/Cargo.toml mp4parse_capi/
 cp _upstream/mp4parse/mp4parse_capi/build.rs mp4parse_capi/
 cp _upstream/mp4parse/mp4parse_capi/include/mp4parse.h include/
 cp _upstream/mp4parse/mp4parse_capi/src/*.rs mp4parse_capi/src/
 
-# TODO: download deps from crates.io.
-
-git clone https://github.com/BurntSushi/byteorder _upstream/byteorder
-pushd _upstream/byteorder
-git checkout 0.5.3
-popd
-rm -rf mp4parse/src/byteorder
-mkdir mp4parse/src/byteorder
-cp _upstream/byteorder/Cargo.toml byteorder/
-cp _upstream/byteorder/src/lib.rs byteorder/src/
-cp _upstream/byteorder/src/new.rs byteorder/src/
+# TODO: update vendored dependencies in $topsrcdir/third_party/rust
 
 echo "Applying patches..."
 patch -p4 < mp4parse-cargo.patch
 
 echo "Cleaning up..."
 rm -rf _upstream
 
 echo "Updated to ${VER}."