Bug 1300219 - Update mp4parse vendoring script for v0.5.0. r=kinetik

This release splits the capi into a separate crate and adds
mp4parse_is_fragmented() for vp9 support.

MozReview-Commit-ID: JkwylmdfPa9

--HG--
extra : rebase_source : b74b7e20aaf49fe1b2b7121562352c755db3aff3
This commit is contained in:
Ralph Giles 2016-09-02 14:04:38 -07:00
Родитель 7d3cd9e160
Коммит 3985298455
2 изменённых файлов: 44 добавлений и 19 удалений

Просмотреть файл

@ -1,29 +1,42 @@
--- a/media/libstagefright/binding/mp4parse/Cargo.toml
+++ b/media/libstagefright/binding/mp4parse/Cargo.toml
@@ -17,23 +17,9 @@ exclude = [
diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
index 5092cd7..ecbc8c0 100644
--- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
@@ -17,14 +17,9 @@ exclude = [
"*.mp4",
]
-build = "build.rs"
-
-[dependencies]
[dependencies]
"mp4parse" = {version = "0.5.0", path = "../mp4parse"}
-[build-dependencies]
-rusty-cheddar = "0.3.2"
-
[features]
fuzz = ["mp4parse/fuzz"]
diff --git a/media/libstagefright/binding/mp4parse/Cargo.toml b/media/libstagefright/binding/mp4parse/Cargo.toml
index ff9422c..814c4c6 100644
--- a/media/libstagefright/binding/mp4parse/Cargo.toml
+++ b/media/libstagefright/binding/mp4parse/Cargo.toml
@@ -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 }
-
-[dev-dependencies]
-test-assembler = "0.1.2"
-
-[build-dependencies]
-rusty-cheddar = "0.3.2"
-
+byteorder = { version = "0.5.0", path = "../byteorder" }
[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.
[profile.release]
debug-assertions = true
+
+[dependencies]
+byteorder = { path = "../byteorder" }

Просмотреть файл

@ -2,7 +2,7 @@
# Script to update mp4parse-rust sources to latest upstream
# Default version.
VER=v0.4.0
VER=v0.5.0
# Accept version or commit from the command line.
if test -n "$1"; then
@ -14,15 +14,27 @@ rm -rf _upstream
git clone https://github.com/mozilla/mp4parse-rust _upstream/mp4parse
pushd _upstream/mp4parse
git checkout ${VER}
echo "Verifying sources..."
pushd mp4parse
cargo test
popd
echo "Constructing C api header..."
pushd mp4parse_capi
cargo build
echo "Verifying sources..."
cargo test
popd
popd
rm -rf mp4parse
mkdir -p mp4parse/src
cp _upstream/mp4parse/Cargo.toml mp4parse/
cp _upstream/mp4parse/build.rs mp4parse/
cp _upstream/mp4parse/src/*.rs mp4parse/src/
cp _upstream/mp4parse/include/mp4parse.h include/
cp _upstream/mp4parse/mp4parse/Cargo.toml mp4parse/
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.