Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 63dd195

Browse files
committed
Move libpng to //flutter/third_party/libpng
1 parent 585e3ed commit 63dd195

File tree

10 files changed

+223
-216
lines changed

10 files changed

+223
-216
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ deps = {
636636
'src/flutter/third_party/libjpeg-turbo/src':
637637
Var('flutter_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
638638

639-
'src/third_party/libpng':
639+
'src/flutter/third_party/libpng':
640640
Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
641641

642642
'src/flutter/third_party/libwebp':
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
group("libpng") {
6+
public_deps = [ "//flutter/third_party/libpng" ]
7+
}

ci/licenses.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ function verify_licenses() (
162162

163163
local actualLicenseCount
164164
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
165-
local expectedLicenseCount=113 # When changing this number: Update the error message below as well describing the newly expected license types.
165+
local expectedLicenseCount=114 # When changing this number: Update the error message below as well describing the newly expected license types.
166166

167167
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
168168
echo "=============================== ERROR ==============================="

ci/licenses_golden/excluded_files

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,28 @@
651651
../../../flutter/third_party/libjpeg-turbo/src/simd/CMakeLists.txt
652652
../../../flutter/third_party/libjpeg-turbo/src/structure.txt
653653
../../../flutter/third_party/libjpeg-turbo/src/wrjpgcom.1
654+
../../../flutter/third_party/libpng/.git
655+
../../../flutter/third_party/libpng/.travis.yml
656+
../../../flutter/third_party/libpng/ANNOUNCE
657+
../../../flutter/third_party/libpng/AUTHORS
658+
../../../flutter/third_party/libpng/CHANGES
659+
../../../flutter/third_party/libpng/CMakeLists.txt
660+
../../../flutter/third_party/libpng/INSTALL
661+
../../../flutter/third_party/libpng/Makefile.in
662+
../../../flutter/third_party/libpng/README
663+
../../../flutter/third_party/libpng/TODO
664+
../../../flutter/third_party/libpng/TRADEMARK
665+
../../../flutter/third_party/libpng/aclocal.m4
666+
../../../flutter/third_party/libpng/contrib
667+
../../../flutter/third_party/libpng/libpng-manual.txt
668+
../../../flutter/third_party/libpng/libpng.3
669+
../../../flutter/third_party/libpng/libpngpf.3
670+
../../../flutter/third_party/libpng/mips
671+
../../../flutter/third_party/libpng/png.5
672+
../../../flutter/third_party/libpng/powerpc
673+
../../../flutter/third_party/libpng/projects
674+
../../../flutter/third_party/libpng/scripts
675+
../../../flutter/third_party/libpng/tests
654676
../../../flutter/third_party/libtess2/.git
655677
../../../flutter/third_party/libtess2/.gitignore
656678
../../../flutter/third_party/libtess2/Contrib/nanosvg.c
@@ -2877,28 +2899,6 @@
28772899
../../../third_party/libcxxabi/src/demangle/README.txt
28782900
../../../third_party/libcxxabi/test
28792901
../../../third_party/libcxxabi/www
2880-
../../../third_party/libpng/.git
2881-
../../../third_party/libpng/.travis.yml
2882-
../../../third_party/libpng/ANNOUNCE
2883-
../../../third_party/libpng/AUTHORS
2884-
../../../third_party/libpng/CHANGES
2885-
../../../third_party/libpng/CMakeLists.txt
2886-
../../../third_party/libpng/INSTALL
2887-
../../../third_party/libpng/Makefile.in
2888-
../../../third_party/libpng/README
2889-
../../../third_party/libpng/TODO
2890-
../../../third_party/libpng/TRADEMARK
2891-
../../../third_party/libpng/aclocal.m4
2892-
../../../third_party/libpng/contrib
2893-
../../../third_party/libpng/libpng-manual.txt
2894-
../../../third_party/libpng/libpng.3
2895-
../../../third_party/libpng/libpngpf.3
2896-
../../../third_party/libpng/mips
2897-
../../../third_party/libpng/png.5
2898-
../../../third_party/libpng/powerpc
2899-
../../../third_party/libpng/projects
2900-
../../../third_party/libpng/scripts
2901-
../../../third_party/libpng/tests
29022902
../../../third_party/perfetto/.clang-format
29032903
../../../third_party/perfetto/.clang-tidy
29042904
../../../third_party/perfetto/.git

ci/licenses_golden/licenses_flutter

Lines changed: 181 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1112,6 +1112,186 @@ See the License for the specific language governing permissions and
11121112
limitations under the License.
11131113
====================================================================================================
11141114

1115+
====================================================================================================
1116+
LIBRARY: libpng
1117+
ORIGIN: ../../../flutter/third_party/libpng/LICENSE
1118+
ORIGIN: ../../../flutter/third_party/libpng/png.h
1119+
TYPE: LicenseType.libpng
1120+
FILE: ../../../flutter/third_party/libpng/arm/arm_init.c
1121+
FILE: ../../../flutter/third_party/libpng/arm/filter_neon.S
1122+
FILE: ../../../flutter/third_party/libpng/arm/filter_neon_intrinsics.c
1123+
FILE: ../../../flutter/third_party/libpng/arm/palette_neon_intrinsics.c
1124+
FILE: ../../../flutter/third_party/libpng/config.h.in
1125+
FILE: ../../../flutter/third_party/libpng/example.c
1126+
FILE: ../../../flutter/third_party/libpng/intel/filter_sse2_intrinsics.c
1127+
FILE: ../../../flutter/third_party/libpng/intel/intel_init.c
1128+
FILE: ../../../flutter/third_party/libpng/libpng.pc.in
1129+
FILE: ../../../flutter/third_party/libpng/png.c
1130+
FILE: ../../../flutter/third_party/libpng/png.h
1131+
FILE: ../../../flutter/third_party/libpng/pngbar.jpg
1132+
FILE: ../../../flutter/third_party/libpng/pngbar.png
1133+
FILE: ../../../flutter/third_party/libpng/pngconf.h
1134+
FILE: ../../../flutter/third_party/libpng/pngdebug.h
1135+
FILE: ../../../flutter/third_party/libpng/pngerror.c
1136+
FILE: ../../../flutter/third_party/libpng/pngget.c
1137+
FILE: ../../../flutter/third_party/libpng/pnginfo.h
1138+
FILE: ../../../flutter/third_party/libpng/pnglibconf.h
1139+
FILE: ../../../flutter/third_party/libpng/pngmem.c
1140+
FILE: ../../../flutter/third_party/libpng/pngnow.png
1141+
FILE: ../../../flutter/third_party/libpng/pngpread.c
1142+
FILE: ../../../flutter/third_party/libpng/pngprefix.h
1143+
FILE: ../../../flutter/third_party/libpng/pngpriv.h
1144+
FILE: ../../../flutter/third_party/libpng/pngread.c
1145+
FILE: ../../../flutter/third_party/libpng/pngrio.c
1146+
FILE: ../../../flutter/third_party/libpng/pngrtran.c
1147+
FILE: ../../../flutter/third_party/libpng/pngrutil.c
1148+
FILE: ../../../flutter/third_party/libpng/pngset.c
1149+
FILE: ../../../flutter/third_party/libpng/pngstruct.h
1150+
FILE: ../../../flutter/third_party/libpng/pngtest.c
1151+
FILE: ../../../flutter/third_party/libpng/pngtest.png
1152+
FILE: ../../../flutter/third_party/libpng/pngtrans.c
1153+
FILE: ../../../flutter/third_party/libpng/pngusr.dfa
1154+
FILE: ../../../flutter/third_party/libpng/pngwio.c
1155+
FILE: ../../../flutter/third_party/libpng/pngwrite.c
1156+
FILE: ../../../flutter/third_party/libpng/pngwtran.c
1157+
FILE: ../../../flutter/third_party/libpng/pngwutil.c
1158+
----------------------------------------------------------------------------------------------------
1159+
COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
1160+
=========================================
1161+
1162+
PNG Reference Library License version 2
1163+
---------------------------------------
1164+
1165+
* Copyright (c) 1995-2019 The PNG Reference Library Authors.
1166+
* Copyright (c) 2018-2019 Cosmin Truta.
1167+
* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
1168+
* Copyright (c) 1996-1997 Andreas Dilger.
1169+
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
1170+
1171+
The software is supplied "as is", without warranty of any kind,
1172+
express or implied, including, without limitation, the warranties
1173+
of merchantability, fitness for a particular purpose, title, and
1174+
non-infringement. In no event shall the Copyright owners, or
1175+
anyone distributing the software, be liable for any damages or
1176+
other liability, whether in contract, tort or otherwise, arising
1177+
from, out of, or in connection with the software, or the use or
1178+
other dealings in the software, even if advised of the possibility
1179+
of such damage.
1180+
1181+
Permission is hereby granted to use, copy, modify, and distribute
1182+
this software, or portions hereof, for any purpose, without fee,
1183+
subject to the following restrictions:
1184+
1185+
1. The origin of this software must not be misrepresented; you
1186+
must not claim that you wrote the original software. If you
1187+
use this software in a product, an acknowledgment in the product
1188+
documentation would be appreciated, but is not required.
1189+
1190+
2. Altered source versions must be plainly marked as such, and must
1191+
not be misrepresented as being the original software.
1192+
1193+
3. This Copyright notice may not be removed or altered from any
1194+
source or altered source distribution.
1195+
1196+
1197+
PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
1198+
-----------------------------------------------------------------------
1199+
1200+
libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
1201+
Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
1202+
derived from libpng-1.0.6, and are distributed according to the same
1203+
disclaimer and license as libpng-1.0.6 with the following individuals
1204+
added to the list of Contributing Authors:
1205+
1206+
Simon-Pierre Cadieux
1207+
Eric S. Raymond
1208+
Mans Rullgard
1209+
Cosmin Truta
1210+
Gilles Vollant
1211+
James Yu
1212+
Mandar Sahastrabuddhe
1213+
Google Inc.
1214+
Vadim Barkov
1215+
1216+
and with the following additions to the disclaimer:
1217+
1218+
There is no warranty against interference with your enjoyment of
1219+
the library or against infringement. There is no warranty that our
1220+
efforts or the library will fulfill any of your particular purposes
1221+
or needs. This library is provided with all faults, and the entire
1222+
risk of satisfactory quality, performance, accuracy, and effort is
1223+
with the user.
1224+
1225+
Some files in the "contrib" directory and some configure-generated
1226+
files that are distributed with libpng have other copyright owners, and
1227+
are released under other open source licenses.
1228+
1229+
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
1230+
Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
1231+
libpng-0.96, and are distributed according to the same disclaimer and
1232+
license as libpng-0.96, with the following individuals added to the
1233+
list of Contributing Authors:
1234+
1235+
Tom Lane
1236+
Glenn Randers-Pehrson
1237+
Willem van Schaik
1238+
1239+
libpng versions 0.89, June 1996, through 0.96, May 1997, are
1240+
Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
1241+
and are distributed according to the same disclaimer and license as
1242+
libpng-0.88, with the following individuals added to the list of
1243+
Contributing Authors:
1244+
1245+
John Bowler
1246+
Kevin Bracey
1247+
Sam Bushell
1248+
Magnus Holmgren
1249+
Greg Roelofs
1250+
Tom Tanner
1251+
1252+
Some files in the "scripts" directory have other copyright owners,
1253+
but are released under this license.
1254+
1255+
libpng versions 0.5, May 1995, through 0.88, January 1996, are
1256+
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
1257+
1258+
For the purposes of this copyright and license, "Contributing Authors"
1259+
is defined as the following set of individuals:
1260+
1261+
Andreas Dilger
1262+
Dave Martindale
1263+
Guy Eric Schalnat
1264+
Paul Schmidt
1265+
Tim Wegner
1266+
1267+
The PNG Reference Library is supplied "AS IS". The Contributing
1268+
Authors and Group 42, Inc. disclaim all warranties, expressed or
1269+
implied, including, without limitation, the warranties of
1270+
merchantability and of fitness for any purpose. The Contributing
1271+
Authors and Group 42, Inc. assume no liability for direct, indirect,
1272+
incidental, special, exemplary, or consequential damages, which may
1273+
result from the use of the PNG Reference Library, even if advised of
1274+
the possibility of such damage.
1275+
1276+
Permission is hereby granted to use, copy, modify, and distribute this
1277+
source code, or portions hereof, for any purpose, without fee, subject
1278+
to the following restrictions:
1279+
1280+
1. The origin of this source code must not be misrepresented.
1281+
1282+
2. Altered versions must be plainly marked as such and must not
1283+
be misrepresented as being the original source.
1284+
1285+
3. This Copyright notice may not be removed or altered from any
1286+
source or altered source distribution.
1287+
1288+
The Contributing Authors and Group 42, Inc. specifically permit,
1289+
without fee, and encourage the use of this source code as a component
1290+
to supporting the PNG file format in commercial products. If you use
1291+
this source code in a product, acknowledgment is not required but would
1292+
be appreciated.
1293+
====================================================================================================
1294+
11151295
====================================================================================================
11161296
LIBRARY: libjpeg-turbo
11171297
ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/rdcolmap.c
@@ -11908,4 +12088,4 @@ TO DO
1190812088
Please send bug reports, offers of help, etc. to [email protected].
1190912089
====================================================================================================
1191012090

11911-
Total license count: 113
12091+
Total license count: 114

0 commit comments

Comments
 (0)