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

Commit 6e4761d

Browse files
Add third_party/libpng repository and roll buildroot (#24616)
1 parent 7d27757 commit 6e4761d

File tree

5 files changed

+30
-10
lines changed

5 files changed

+30
-10
lines changed

DEPS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ allowed_hosts = [
9898
]
9999

100100
deps = {
101-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '47043991a50e1cfda66766009885197a05bb29f1',
101+
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'd05290fdfb0b8d2aad3c60bf0b4a76f368616452',
102102

103103
# Fuchsia compatibility
104104
#
@@ -364,6 +364,9 @@ deps = {
364364
'src/third_party/libjpeg-turbo':
365365
Var('fuchsia_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
366366

367+
'src/third_party/libpng':
368+
Var('flutter_git') + '/third_party/libpng' + '@' + 'f46faec244dbda5f1d2a5bc370cf83125d6ffab1',
369+
367370
'src/third_party/libwebp':
368371
Var('chromium_git') + '/webm/libwebp.git' + '@' + '0.6.0',
369372

ci/licenses_golden/licenses_third_party

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 54de652d00d625718e51e472314c598d
1+
Signature: 1d37f1b1764e5561a17007b9cd135f4c
22

33
UNUSED LICENSES:
44

@@ -22056,7 +22056,6 @@ POSSIBILITY OF SUCH DAMAGE.
2205622056
LIBRARY: libpng
2205722057
ORIGIN: ../../../third_party/libpng/LICENSE
2205822058
TYPE: LicenseType.libpng
22059-
FILE: ../../../third_party/libpng/contrib/intel/intel_sse.patch
2206022059
FILE: ../../../third_party/libpng/pngprefix.h
2206122060
----------------------------------------------------------------------------------------------------
2206222061
<THIS BLOCK INTENTIONALLY LEFT BLANK>
@@ -22069,9 +22068,9 @@ TYPE: LicenseType.libpng
2206922068
FILE: ../../../third_party/libpng/arm/arm_init.c
2207022069
FILE: ../../../third_party/libpng/arm/filter_neon.S
2207122070
FILE: ../../../third_party/libpng/arm/filter_neon_intrinsics.c
22072-
FILE: ../../../third_party/libpng/contrib/intel/filter_sse2_intrinsics.c
22073-
FILE: ../../../third_party/libpng/contrib/intel/intel_init.c
22074-
FILE: ../../../third_party/libpng/contrib/intel/intel_sse.patch
22071+
FILE: ../../../third_party/libpng/arm/palette_neon_intrinsics.c
22072+
FILE: ../../../third_party/libpng/intel/filter_sse2_intrinsics.c
22073+
FILE: ../../../third_party/libpng/intel/intel_init.c
2207522074
FILE: ../../../third_party/libpng/png.c
2207622075
FILE: ../../../third_party/libpng/pngconf.h
2207722076
FILE: ../../../third_party/libpng/pngdebug.h

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 697bebe56b09b4db22b6b675536566df
1+
Signature: f2b15cda839d356d1d2a906e432770d6
22

tools/licenses/lib/main.dart

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,8 @@ class _RepositoryLibPngLicenseFile extends _RepositorySingleLicenseFile {
318318

319319
static void _verifyLicense(fs.TextFile io) {
320320
final String contents = io.readString();
321-
if (!contents.contains('COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:') ||
322-
!contents.contains('png') ||
323-
!contents.contains('END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.'))
321+
if (!contents.contains(RegExp('COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:?')) ||
322+
!contents.contains('png'))
324323
throw 'unexpected libpng license file contents:\n----8<----\n$contents\n----<8----';
325324
}
326325

@@ -1628,6 +1627,24 @@ class _RepositoryLibPngDirectory extends _RepositoryDirectory {
16281627
return _RepositoryLibPngLicenseFile(this, entry);
16291628
return super.createFile(entry);
16301629
}
1630+
1631+
static final RegExp skipFileTypes = RegExp(r'\.(?:jpg|png|dfa|in|3|5)$');
1632+
1633+
@override
1634+
bool shouldRecurse(fs.IoNode entry) {
1635+
return entry.name != 'contrib' // not linked in
1636+
&& entry.name != 'mips' // not linked in
1637+
&& entry.name != 'powerpc' // not linked in
1638+
&& entry.name != 'projects' // not linked in
1639+
&& entry.name != 'scripts' // not linked in
1640+
&& entry.name != 'tests' // not linked in
1641+
&& entry.name != 'ANNOUNCE'
1642+
&& entry.name != 'CHANGES'
1643+
&& entry.name != 'TODO'
1644+
&& entry.name != 'TRADEMARK'
1645+
&& !entry.name.contains(skipFileTypes)
1646+
&& super.shouldRecurse(entry);
1647+
}
16311648
}
16321649

16331650
class _RepositoryLibWebpDirectory extends _RepositoryDirectory {

tools/licenses/lib/patterns.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ final List<RegExp> copyrightStatementPatterns = <RegExp>[
9191
RegExp(r'^Based on .+, written by .+, [0-9]+\.$', caseSensitive: false),
9292
RegExp(r'^(?:Based on the )?x86 SIMD extension for IJG JPEG library(?: - version [0-9.]+|,)?$'),
9393
RegExp(r'^This software originally derived from .+\.$'),
94+
RegExp(r'^Derived from [a-z._/]+$'),
9495
RegExp(r'^Derived from .+, which was$'),
9596
RegExp(r'^ *This is part of .+, a .+ library\.$'),
9697
RegExp(r'^This file is part of [^ ]+\.$'),

0 commit comments

Comments
 (0)