Skip to content

Commit

Permalink
Backed out 3 changesets (bug 1729481) for causing build bustages. CLO…
Browse files Browse the repository at this point in the history
…SED TREE

Backed out changeset fb80cde944e6 (bug 1729481)
Backed out changeset 40fc34344f2f (bug 1729481)
Backed out changeset f219caf475fc (bug 1729481)
  • Loading branch information
Marian-Vasile Laza committed Sep 17, 2021
1 parent 63be5b5 commit feeff68
Show file tree
Hide file tree
Showing 65 changed files with 10,997 additions and 20 deletions.
Empty file.
5 changes: 0 additions & 5 deletions media/libdav1d/moz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ vendoring:
exclude:
- build/.gitattributes
- build/.gitignore
- doc
- examples
- package
- tests
- tools

update-actions:
- action: copy-file
Expand Down
19 changes: 4 additions & 15 deletions python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,16 +239,8 @@ def get_attribute_label(node):
while isinstance(subtarget, ast.Attribute):
label = subtarget.attr + ("." if label else "") + label
subtarget = subtarget.value

if isinstance(subtarget, ast.Name):
label = subtarget.id + "." + label
elif isinstance(subtarget, ast.Subscript) and isinstance(subtarget.value, ast.Name):
label = subtarget.value.id + "." + label
else:
raise Exception(
"Unxpected subtarget of type %s found in get_attribute_label. label=%s"
% (subtarget, label)
)
assert isinstance(subtarget, ast.Name)
label = subtarget.id + "." + label

return label

Expand All @@ -263,13 +255,10 @@ def ast_get_source_segment(code, node):
):
return ast.original_get_source_segment(code, node)

if caller.function == "assignment_node_to_source_filename_list":
if caller.function == "log":
return ""

raise Exception(
"ast_get_source_segment is not available with this Python version. (ver=%s.%s, caller=%s)"
% (sys.version_info.major, sys.version_info.minor, caller.function)
)
raise Exception("ast_get_source_segment is not available with this Python version.")


# Overwrite it so we don't accidently use it
Expand Down
19 changes: 19 additions & 0 deletions third_party/dav1d/doc/Doxyfile.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
PROJECT_NAME = dav1d
OUTPUT_DIRECTORY = @DOXYGEN_OUTPUT@
STRIP_FROM_PATH = @DOXYGEN_STRIP@
OUTPUT_LANGUAGE = English
TAB_SIZE = 4
EXTRACT_ALL = YES
OPTIMIZE_OUTPUT_FOR_C = YES
DOXYFILE_ENCODING = UTF-8
TYPEDEF_HIDES_STRUCT = YES

QUIET = YES
WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES

INPUT = @DOXYGEN_INPUT@
FILE_PATTERNS = *.h

GENERATE_HTML = YES
GENERATE_LATEX = NO
108 changes: 108 additions & 0 deletions third_party/dav1d/doc/PATENTS
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
Alliance for Open Media Patent License 1.0

1. License Terms.

1.1. Patent License. Subject to the terms and conditions of this License, each
Licensor, on behalf of itself and successors in interest and assigns,
grants Licensee a non-sublicensable, perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable (except as expressly stated in this
License) patent license to its Necessary Claims to make, use, sell, offer
for sale, import or distribute any Implementation.

1.2. Conditions.

1.2.1. Availability. As a condition to the grant of rights to Licensee to make,
sell, offer for sale, import or distribute an Implementation under
Section 1.1, Licensee must make its Necessary Claims available under
this License, and must reproduce this License with any Implementation
as follows:

a. For distribution in source code, by including this License in the
root directory of the source code with its Implementation.

b. For distribution in any other form (including binary, object form,
and/or hardware description code (e.g., HDL, RTL, Gate Level Netlist,
GDSII, etc.)), by including this License in the documentation, legal
notices, and/or other written materials provided with the
Implementation.

1.2.2. Additional Conditions. This license is directly from Licensor to
Licensee. Licensee acknowledges as a condition of benefiting from it
that no rights from Licensor are received from suppliers, distributors,
or otherwise in connection with this License.

1.3. Defensive Termination. If any Licensee, its Affiliates, or its agents
initiates patent litigation or files, maintains, or voluntarily
participates in a lawsuit against another entity or any person asserting
that any Implementation infringes Necessary Claims, any patent licenses
granted under this License directly to the Licensee are immediately
terminated as of the date of the initiation of action unless 1) that suit
was in response to a corresponding suit regarding an Implementation first
brought against an initiating entity, or 2) that suit was brought to
enforce the terms of this License (including intervention in a third-party
action by a Licensee).

1.4. Disclaimers. The Reference Implementation and Specification are provided
"AS IS" and without warranty. The entire risk as to implementing or
otherwise using the Reference Implementation or Specification is assumed
by the implementer and user. Licensor expressly disclaims any warranties
(express, implied, or otherwise), including implied warranties of
merchantability, non-infringement, fitness for a particular purpose, or
title, related to the material. IN NO EVENT WILL LICENSOR BE LIABLE TO
ANY OTHER PARTY FOR LOST PROFITS OR ANY FORM OF INDIRECT, SPECIAL,
INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER FROM ANY CAUSES OF
ACTION OF ANY KIND WITH RESPECT TO THIS LICENSE, WHETHER BASED ON BREACH
OF CONTRACT, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE, AND WHETHER OR
NOT THE OTHER PARTRY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

2. Definitions.

2.1. Affiliate. “Affiliate” means an entity that directly or indirectly
Controls, is Controlled by, or is under common Control of that party.

2.2. Control. “Control” means direct or indirect control of more than 50% of
the voting power to elect directors of that corporation, or for any other
entity, the power to direct management of such entity.

2.3. Decoder. "Decoder" means any decoder that conforms fully with all
non-optional portions of the Specification.

2.4. Encoder. "Encoder" means any encoder that produces a bitstream that can
be decoded by a Decoder only to the extent it produces such a bitstream.

2.5. Final Deliverable. “Final Deliverable” means the final version of a
deliverable approved by the Alliance for Open Media as a Final
Deliverable.

2.6. Implementation. "Implementation" means any implementation, including the
Reference Implementation, that is an Encoder and/or a Decoder. An
Implementation also includes components of an Implementation only to the
extent they are used as part of an Implementation.

2.7. License. “License” means this license.

2.8. Licensee. “Licensee” means any person or entity who exercises patent
rights granted under this License.

2.9. Licensor. "Licensor" means (i) any Licensee that makes, sells, offers
for sale, imports or distributes any Implementation, or (ii) a person
or entity that has a licensing obligation to the Implementation as a
result of its membership and/or participation in the Alliance for Open
Media working group that developed the Specification.

2.10. Necessary Claims. "Necessary Claims" means all claims of patents or
patent applications, (a) that currently or at any time in the future,
are owned or controlled by the Licensor, and (b) (i) would be an
Essential Claim as defined by the W3C Policy as of February 5, 2004
(https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential)
as if the Specification was a W3C Recommendation; or (ii) are infringed
by the Reference Implementation.

2.11. Reference Implementation. “Reference Implementation” means an Encoder
and/or Decoder released by the Alliance for Open Media as a Final
Deliverable.

2.12. Specification. “Specification” means the specification designated by
the Alliance for Open Media as a Final Deliverable for which this
License was issued.

Binary file added third_party/dav1d/doc/dav1d_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions third_party/dav1d/doc/dav1d_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 43 additions & 0 deletions third_party/dav1d/doc/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Copyright © 2018, VideoLAN and dav1d 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:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
#
# 2. 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.
#
# 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 OWNER 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.

doxygen = find_program('doxygen', required: false)
dot = find_program('dot', required: false)

if doxygen.found() and dot.found()
conf_data = configuration_data()
conf_data.set('DOXYGEN_INPUT', join_paths(dav1d_src_root, 'include/dav1d'))
conf_data.set('DOXYGEN_STRIP', join_paths(dav1d_src_root, 'include'))
conf_data.set('DOXYGEN_OUTPUT', meson.current_build_dir())
doxyfile = configure_file(input: 'Doxyfile.in',
output: 'Doxyfile',
configuration: conf_data)

custom_target('doc',
build_by_default: false,
command: [doxygen, doxyfile],
output: ['html']
)
endif

Loading

0 comments on commit feeff68

Please sign in to comment.