Skip to content

Commit

Permalink
CP: Roll libwebp to 1.3.1 (#45675) (#45688)
Browse files Browse the repository at this point in the history
  • Loading branch information
godofredoc authored Sep 12, 2023
1 parent b8d3581 commit fec13df
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 7 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '6e71c38443c0bf9d8954c87bf69bb4e019f44f94',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '3d9ce3f1306efea7c7514b3e0ad4ff203c65e76d',

# Fuchsia compatibility
#
Expand Down Expand Up @@ -597,7 +597,7 @@ deps = {
Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',

'src/third_party/libwebp':
Var('chromium_git') + '/webm/libwebp.git' + '@' + '7dfde712a477e420968732161539011e0fd446cf', # 1.2.0
Var('chromium_git') + '/webm/libwebp.git' + '@' + '2af26267cdfcb63a88e5c74a85927a12d6ca1d76', # 1.3.1

'src/third_party/wuffs':
Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61',
Expand Down
8 changes: 5 additions & 3 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -2336,20 +2336,22 @@
../../../third_party/libtess2/Example
../../../third_party/libtess2/README.md
../../../third_party/libtess2/alg_outline.md
../../../third_party/libwebp/.cmake-format.py
../../../third_party/libwebp/.git
../../../third_party/libwebp/.gitattributes
../../../third_party/libwebp/.gitignore
../../../third_party/libwebp/.mailmap
../../../third_party/libwebp/.style.yapf
../../../third_party/libwebp/AUTHORS
../../../third_party/libwebp/Android.mk
../../../third_party/libwebp/CMakeLists.txt
../../../third_party/libwebp/CONTRIBUTING.md
../../../third_party/libwebp/ChangeLog
../../../third_party/libwebp/Makefile.vc
../../../third_party/libwebp/NEWS
../../../third_party/libwebp/PATENTS
../../../third_party/libwebp/README
../../../third_party/libwebp/README.mux
../../../third_party/libwebp/README.webp_js
../../../third_party/libwebp/PRESUBMIT.py
../../../third_party/libwebp/README.md
../../../third_party/libwebp/build.gradle
../../../third_party/libwebp/cmake
../../../third_party/libwebp/codereview.settings
Expand Down
105 changes: 103 additions & 2 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: d9a7c0a4880c064a4e9208b5b4492141
Signature: b870e52f58ff7edb46cc6381cbd217dc

====================================================================================================
LIBRARY: angle
Expand Down Expand Up @@ -35584,7 +35584,10 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
LIBRARY: libwebp
ORIGIN: ../../../third_party/libwebp/COPYING
TYPE: LicenseType.bsd
FILE: ../../../third_party/libwebp/.pylintrc
FILE: ../../../third_party/libwebp/extras/webp_quality.c
FILE: ../../../third_party/libwebp/sharpyuv/libsharpyuv.pc.in
FILE: ../../../third_party/libwebp/sharpyuv/libsharpyuv.rc
FILE: ../../../third_party/libwebp/src/demux/libwebpdemux.pc.in
FILE: ../../../third_party/libwebp/src/demux/libwebpdemux.rc
FILE: ../../../third_party/libwebp/src/libwebp.pc.in
Expand Down Expand Up @@ -48277,6 +48280,43 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: libwebp
ORIGIN: ../../../third_party/libwebp/src/dsp/lossless_sse41.c + ../../../third_party/libwebp/COPYING
TYPE: LicenseType.bsd
FILE: ../../../third_party/libwebp/src/dsp/lossless_sse41.c
----------------------------------------------------------------------------------------------------
Copyright 2021 Google Inc. 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 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.
====================================================================================================

====================================================================================================
LIBRARY: angle
ORIGIN: ../../../third_party/angle/include/angle_cl.h + ../../../third_party/angle/LICENSE
Expand Down Expand Up @@ -48744,6 +48784,67 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: libwebp
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv.c + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv.h + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_cpu.c + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_cpu.h + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_csp.c + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_csp.h + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_dsp.c + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_dsp.h + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_gamma.c + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_gamma.h + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_neon.c + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/sharpyuv/sharpyuv_sse2.c + ../../../third_party/libwebp/COPYING
ORIGIN: ../../../third_party/libwebp/src/dsp/cpu.h + ../../../third_party/libwebp/COPYING
TYPE: LicenseType.bsd
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv.c
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv.h
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_cpu.c
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_cpu.h
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_csp.c
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_csp.h
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_dsp.c
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_dsp.h
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_gamma.c
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_gamma.h
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_neon.c
FILE: ../../../third_party/libwebp/sharpyuv/sharpyuv_sse2.c
FILE: ../../../third_party/libwebp/src/dsp/cpu.h
----------------------------------------------------------------------------------------------------
Copyright 2022 Google Inc. 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 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.
====================================================================================================

====================================================================================================
LIBRARY: angle
ORIGIN: ../../../third_party/angle/include/platform/autogen/FeaturesD3D_autogen.h + ../../../third_party/angle/LICENSE
Expand Down Expand Up @@ -66343,4 +66444,4 @@ freely, subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution.
====================================================================================================

Total license count: 886
Total license count: 888

0 comments on commit fec13df

Please sign in to comment.