Skip to content

Commit

Permalink
Bug 1763991: Let Updatebot update libvpx r=bryce
Browse files Browse the repository at this point in the history
  • Loading branch information
tomrittervg committed Apr 20, 2022
1 parent dace73a commit 5f0238c
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 82 deletions.
31 changes: 31 additions & 0 deletions media/libvpx/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Copyright (c) 2010, The WebM Project authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

* Neither the name of Google, nor the WebM Project, nor the names
of its contributors may be used to endorse or promote products
derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

17 changes: 12 additions & 5 deletions media/libvpx/README_MOZILLA
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
The source from this directory was copied from the libvpx
git repository using the update.py script. The only changes
made were those applied by update.py and the addition of
moz.build and Makefile.in build files for the
Mozilla build system.
git repository. The only changes made are those in the
included patch files and the addition of moz.build and
Makefile.in build files for the Mozilla build system.

The libvpx git repository is:

https://chromium.googlesource.com/webm/libvpx

The git commit ID used was v1.11.0
See moz.yaml for the current in-tree version.

To update run

$ ./mach vendor media/libvpx/moz.yaml --patch-mode=none
$ hg commit -m "Update libvpx"
$ ./mach vendor media/libvpx/moz.yaml --patch-mode=only
$ hg commit -m "Apply local patches to libvpx"

70 changes: 70 additions & 0 deletions media/libvpx/moz.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Version of this schema
schema: 1

bugzilla:
# Bugzilla product and component for this directory and subdirectories
product: Core
component: "Audio/Video"

# Document the source of externally hosted code
origin:

# Short name of the package/library
name: libvpx

description: VP8/VP9 Codec SDK

# Full URL for the package's homepage/etc
# Usually different from repository url
url: https://chromium.googlesource.com/webm/libvpx

# Human-readable identifier for this version/release
# Generally "version NNN", "tag SSS", "bookmark SSS"
release: 626ff35955c2c35b806b3e0ecf551a1a8611cdbf (Wed Oct 06 17:41:19 2021).

# Revision to pull in
# Must be a long or short commit SHA (long preferred)
revision: 626ff35955c2c35b806b3e0ecf551a1a8611cdbf

# The package's license, where possible using the mnemonic from
# https://spdx.org/licenses/
# Multiple licenses can be specified (as a YAML list)
# A "LICENSE" file must exist containing the full license text
license: BSD-3-Clause

license-file: LICENSE

updatebot:
maintainer-phab: bryce
maintainer-bz: [email protected]
tasks:
- type: vendoring
enabled: true
frequency: release

vendoring:
url: https://chromium.googlesource.com/webm/libvpx
source-hosting: googlesource
vendor-directory: media/libvpx/libvpx/
skip-vendoring-steps: ['update-moz-build']

exclude:
- .gitattributes
- .gitignore
- third_party/libwebm
- tools/

patches:
- bug1137614.patch
- input_frame_validation.patch
- input_frame_validation_vp9.patch
- rename_duplicate_files.patch
- win64_build_fix.patch

update-actions:
- action: move-file
from: '{vendor_dir}/vpx_dsp/x86/loopfilter_sse2.c'
to: '{vendor_dir}/vpx_dsp/x86/loopfilter_intrin_sse2.c'
- action: run-script
script: '{yaml_dir}/generate_sources_mozbuild.sh'
cwd: '{yaml_dir}'
77 changes: 0 additions & 77 deletions media/libvpx/update.py

This file was deleted.

0 comments on commit 5f0238c

Please sign in to comment.