diff --git a/media/libnestegg/include/moz.build b/media/libnestegg/include/moz.build index 7f3d65fb9286..07e672aa864c 100644 --- a/media/libnestegg/include/moz.build +++ b/media/libnestegg/include/moz.build @@ -5,6 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. EXPORTS.nestegg += [ - 'nestegg.h', + 'nestegg/nestegg.h', ] diff --git a/media/libnestegg/include/nestegg.h b/media/libnestegg/include/nestegg/nestegg.h similarity index 100% rename from media/libnestegg/include/nestegg.h rename to media/libnestegg/include/nestegg/nestegg.h diff --git a/media/libnestegg/moz.yaml b/media/libnestegg/moz.yaml index 341581247b70..2f2ed385f323 100644 --- a/media/libnestegg/moz.yaml +++ b/media/libnestegg/moz.yaml @@ -1,23 +1,45 @@ -# Version of this schema schema: 1 bugzilla: - # Bugzilla product and component for this directory and subdirectories - product: "Core" + product: Core component: "Audio/Video: Playback" -# The source from this directory was copied from the cubeb -# git repository using the update.sh script. The only changes -# made were those applied by update.sh and the addition of -# Makefile.in build files for the Mozilla build system. - origin: - name: "nestegg" + name: nestegg description: "WebM demuxer" + url: https://github.com/mozilla/nestegg + license: ISC + release: commit ec6adfbbf979678e3058cc4695257366f39e290b (2021-08-13T20:05:30Z). + revision: ec6adfbbf979678e3058cc4695257366f39e290b - url: "https://github.com/kinetiknz/nestegg" - license: "ISC" +vendoring: + url: https://github.com/mozilla/nestegg + source-hosting: github + vendor-directory: media/libnestegg + skip-vendoring-steps: + - update-moz-build + exclude: + - .github + - configure.ac + - docs + - INSTALL + - m4 + - Makefile.am + - nestegg.pc.in + - nestegg-uninstalled.pc.in + - test + - TODO + keep: + - include/moz.build + - src/moz.build - # update.sh will update this value - release: "ec6adfbbf979678e3058cc4695257366f39e290b (2021-08-14 08:05:30 +1200)" +updatebot: + maintainer-phab: kinetik + maintainer-bz: kinetik@flim.org + fuzzy-query: media + tasks: + - type: vendoring + branch: master + enabled: True + frequency: every diff --git a/media/libnestegg/update.sh b/media/libnestegg/update.sh deleted file mode 100755 index 4be49f5a9ee8..000000000000 --- a/media/libnestegg/update.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# Usage: sh update.sh - -set -e - -[[ -n "$1" ]] || ( echo "syntax: $0 update_src_directory"; exit 1 ) -[[ -e "$1/src/nestegg.c" ]] || ( echo "$1: nestegg not found"; exit 1 ) - -cp $1/include/nestegg/nestegg.h include -cp $1/src/nestegg.c src -cp $1/LICENSE . -cp $1/README.md . -cp $1/AUTHORS . - -if [ -d $1/.git ]; then - rev=$(cd $1 && git rev-parse --verify HEAD) - date=$(cd $1 && git show -s --format=%ci HEAD) - dirty=$(cd $1 && git diff-index --name-only HEAD) - set +e - pre_rev=$(grep -o '[[:xdigit:]]\{40\}' moz.yaml) - commits=$(cd $1 && git log --pretty=format:'%h - %s' $pre_rev..$rev) - set -e -fi - -if [ -n "$rev" ]; then - version=$rev - if [ -n "$dirty" ]; then - version=$version-dirty - echo "WARNING: updating from a dirty git repository." - fi - sed -i.bak -e "s/^ *release:.*/ release: \"$version ($date)\"/" moz.yaml - if [[ ! "$( grep "$version" moz.yaml )" ]]; then - echo "Updating moz.yaml failed." - exit 1 - fi - rm moz.yaml.bak - [[ -n "$commits" ]] && echo -e "Pick commits:\n$commits" -else - echo "Remember to update moz.yaml with the version details." -fi