Skip to content

Commit a1e22a3

Browse files
committed
Merge pull request godotengine#111572 from DeeJayLSP/freetype-update
Update missing info from FreeType 2.14.1
2 parents 6b8fa2f + b6ed41e commit a1e22a3

File tree

2 files changed

+27
-22
lines changed

2 files changed

+27
-22
lines changed

COPYRIGHT.txt

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ License: OFL-1.1
302302

303303
Files: thirdparty/freetype/*
304304
Comment: The FreeType Project
305-
Copyright: 1996-2023, David Turner, Robert Wilhelm, and Werner Lemberg.
305+
Copyright: 1996-2025, David Turner, Robert Wilhelm, and Werner Lemberg.
306306
License: FTL
307307

308308
Files: thirdparty/glad/*
@@ -1537,9 +1537,9 @@ License: FTL
15371537
The FreeType Project LICENSE
15381538
----------------------------
15391539
.
1540-
2000-Feb-08
1540+
2006-Jan-27
15411541
.
1542-
Copyright 1996-2000 by
1542+
Copyright 1996-2002, 2006 by
15431543
David Turner, Robert Wilhelm, and Werner Lemberg
15441544
.
15451545
.
@@ -1579,6 +1579,19 @@ License: FTL
15791579
assume no liability related to The FreeType Project.
15801580
.
15811581
.
1582+
Finally, many people asked us for a preferred form for a
1583+
credit/disclaimer to use in compliance with this license. We thus
1584+
encourage you to use the following text:
1585+
.
1586+
"""
1587+
Portions of this software are copyright © <year> The FreeType
1588+
Project (https://freetype.org). All rights reserved.
1589+
"""
1590+
.
1591+
Please replace <year> with the value from the FreeType version you
1592+
actually use.
1593+
.
1594+
.
15821595
Legal Terms
15831596
===========
15841597
.
@@ -1629,12 +1642,12 @@ License: FTL
16291642
authorize others to exercise some or all of the rights granted
16301643
herein, subject to the following conditions:
16311644
.
1632-
o Redistribution of source code must retain this license file
1633-
(`LICENSE.TXT') unaltered; any additions, deletions or changes
1634-
to the original files must be clearly indicated in
1635-
accompanying documentation. The copyright notices of the
1636-
unaltered, original files must be preserved in all copies of
1637-
source files.
1645+
o Redistribution of source code must retain this license file
1646+
(`FTL.TXT') unaltered; any additions, deletions or changes to
1647+
the original files must be clearly indicated in accompanying
1648+
documentation. The copyright notices of the unaltered,
1649+
original files must be preserved in all copies of source
1650+
files.
16381651
.
16391652
o Redistribution in binary form must provide a disclaimer that
16401653
states that the software is based in part of the work of the
@@ -1672,29 +1685,21 @@ License: FTL
16721685
.
16731686
There are two mailing lists related to FreeType:
16741687
.
1675-
o freetype@freetype.org
1688+
o freetype@nongnu.org
16761689
.
16771690
Discusses general use and applications of FreeType, as well as
16781691
future and wanted additions to the library and distribution.
16791692
If you are looking for support, start in this list if you
16801693
haven't found anything to help you in the documentation.
16811694
.
1682-
o devel@freetype.org
1695+
o freetype-devel@nongnu.org
16831696
.
16841697
Discusses bugs, as well as engine internals, design issues,
16851698
specific licenses, porting, etc.
16861699
.
1687-
o http://www.freetype.org
1688-
.
1689-
Holds the current FreeType web page, which will allow you to
1690-
download our latest development version and read online
1691-
documentation.
1692-
.
1693-
You can also contact us individually at:
1700+
Our home page can be found at
16941701
.
1695-
David Turner <[email protected]>
1696-
Robert Wilhelm <[email protected]>
1697-
Werner Lemberg <[email protected]>
1702+
https://freetype.org
16981703

16991704
License: HarfBuzz
17001705
HarfBuzz is licensed under the so-called "Old MIT" license. Details follow.

thirdparty/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ for UI.
340340

341341
## freetype
342342

343-
- Upstream: https://www.freetype.org
343+
- Upstream: https://gitlab.freedesktop.org/freetype/freetype
344344
- Version: 2.14.1 (526ec5c47b9ebccc4754c85ac0c0cdf7c85a5e9b, 2025)
345345
- License: FreeType License (BSD-like)
346346

0 commit comments

Comments
 (0)