[Scummvm-git-logs] scummvm master -> dff2efc76650a1d92196d4f2bdce07b8a02b0c1c
sev-
noreply at scummvm.org
Wed May 22 19:59:27 UTC 2024
This automated email contains information about 23 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a3e95db5f3 DIRECTOR: Added README to Lingo Decoder and relevant license file
f070a10b77 DEVTOOLS: Fix release check for new arrangement for dat files
c42742ded8 DISTS: Added missing references to bagel.dat
472f59c610 LIBRETRO: Moved include to the relevant .cpp file
48c8ff47c6 TWP: Remove unneded include
1fe1f23f4c AGS: Update POTFILES
eb91c70705 FREESCAPE: Added missing files to POTFILES
664e1737c3 I18N: Update POTFILES with source changes
0054119f56 TWP: Added missing file to POTFILES
c5e57db522 MM: Remove moved file from POTFILES
220304a5a3 DEVTOOLS: Update POTFILES release check
04749e30cb GOB: Make release checker happier in regards of POTFILES
19b11a9aaf GLK: Move common/translation.h include to .cpp file
3746945ad5 DEVTOOLS: Split out themes check into a separate test
b1605807f5 BUILD: Added missing License files to makefiles
01076c8b62 IRIX: Added missing License files
10da6c6acb MAEMO: Added missing License files
1919a349e4 WIN32: Added missing License files
1033d8ce68 CREATE_PROJECT: Added missing License files
a69f9e5afb DISTS: REDHAT: Added missing License files
9829448a02 MACOS: Added missing License files to macOS menu
681b9b744e DEVTOOLS: Implemented sanity License files pre-release checks
dff2efc766 LICENSES: Make sure every license file has an appropriate Note
Commit: a3e95db5f3a5d1b33bf1b1858d20956fdccb3fc5
https://github.com/scummvm/scummvm/commit/a3e95db5f3a5d1b33bf1b1858d20956fdccb3fc5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
DIRECTOR: Added README to Lingo Decoder and relevant license file
Changed paths:
A LICENSES/COPYING.MPL
A engines/director/lingo/lingodec/README.md
diff --git a/LICENSES/COPYING.MPL b/LICENSES/COPYING.MPL
new file mode 100644
index 00000000000..c59e6d423f4
--- /dev/null
+++ b/LICENSES/COPYING.MPL
@@ -0,0 +1,379 @@
+NOTE: This license file only applies to the fillowing files and
+directories:
+
+ * engines/director/lingo/lingodec/
+
+
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
diff --git a/engines/director/lingo/lingodec/README.md b/engines/director/lingo/lingodec/README.md
new file mode 100644
index 00000000000..98125b417f3
--- /dev/null
+++ b/engines/director/lingo/lingodec/README.md
@@ -0,0 +1,12 @@
+This directory is coming straight from the ProjectorRays project
+
+ https://github.com/ProjectorRays/ProjectorRays/tree/master/src/lingodec
+
+And should be kept in sync.
+
+At the time of writing, the changes have not yet been merged within
+ProjectorRays and as such, live in 'scummvm' branch:
+
+ https://github.com/ProjectorRays/ProjectorRays/tree/scummvm/src/lingodec
+
+The original code is licensed under the Mozilla Public License 2.0.
Commit: f070a10b77b9a4f446f00c7d973f091459b8e152
https://github.com/scummvm/scummvm/commit/f070a10b77b9a4f446f00c7d973f091459b8e152
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
DEVTOOLS: Fix release check for new arrangement for dat files
Changed paths:
devtools/release-checks.sh
diff --git a/devtools/release-checks.sh b/devtools/release-checks.sh
index 2b293a0b549..eba46ce9365 100755
--- a/devtools/release-checks.sh
+++ b/devtools/release-checks.sh
@@ -305,13 +305,13 @@ IFS="$OLDIFS"
echo_n "Checking engine-data files..."
+cat dists/engine-data/engine_data.mk dists/engine-data/engine_data_big.mk dists/engine-data/engine_data_core.mk >dists/engine-data/engine_data_combined.mk
+
# Use # as delimiter, %FILE% for the filename
declare -a distfiles=(
- "Makefile.common#DIST_FILES_ENGINEDATA\+=%FILE%"
- "devtools/create_project/xcode.cpp#[ ]+files.push_back\(\"dists/engine-data/%FILE%\"\);"
"dists/engine-data/README#%FILE%:"
+ "dists/engine-data/engine_data_combined.mk#DIST_FILES_LIST \+= dists/engine-data/%FILE%"
"dists/irix/scummvm.idb#f 0644 root sys usr/ScummVM/share/scummvm/%FILE% %FILE% scummvm.sw.eoe"
- "dists/scummvm.rc#%FILE%[ ]+FILE[ ]+\"dists/engine-data/%FILE%\""
)
OLDIFS="$IFS"
@@ -329,7 +329,9 @@ do
file=`basename $f`
# Skip README file
- if [ $file == "README" -o $file == "create-playground3d-data.sh" -o $file == "create-testbed-data.sh" ]; then
+ if [ $file == "README" -o $file == "create-playground3d-data.sh" -o $file == "create-testbed-data.sh" \
+ -o $file == "engine_data.mk" -o $file == "engine_data_big.mk" -o $file == "engine_data_core.mk" \
+ -o $file == "engine_data_combined.mk" ]; then
continue
fi
@@ -347,12 +349,13 @@ do
done
done
+rm dists/engine-data/engine_data_combined.mk
+
declare -a themefiles=(
"Makefile.common#DIST_FILES_THEMES.*%FILE%"
"devtools/create_project/xcode.cpp#[ ]+files.push_back\(\"gui/themes/%FILE%\"\);"
"dists/irix/scummvm.idb#f 0644 root sys usr/ScummVM/share/scummvm/%FILE% %FILE% scummvm.sw.eoe"
"dists/scummvm.rc#%FILE%[ ]+FILE[ ]+\"gui/themes/%FILE%\""
- "dists/win32/migration.txt#%FILE%"
)
for f in gui/themes/*
Commit: c42742ded88def65ef8835e53001539a4bd8e95e
https://github.com/scummvm/scummvm/commit/c42742ded88def65ef8835e53001539a4bd8e95e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
DISTS: Added missing references to bagel.dat
Changed paths:
dists/engine-data/README
dists/irix/scummvm.idb
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 62e5a9f79a6..a5ccf782a17 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -7,6 +7,9 @@ This file contains game resource data used by the Access engine.
achievements.dat:
This file contains Achievements and Statistics IDs and localization from Steam and GOG.
+bagel.dat:
+This file contains essential game data used by the BAGEL engine.
+
classicmacfonts.dat:
This file contains fonts used for recreation of Classic Mac OS GUI. To generate it,
use the following commnand:
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index 7859736903f..8d089abf495 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -18,6 +18,7 @@ f 0755 root sys usr/ScummVM/scummvm scummvm scummvm.sw.eoe tag('0x5260dbec')
f 0644 root sys usr/ScummVM/share/pixmaps/scummvm.xpm scummvm.xpm scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/access.dat access.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/achievements.dat achievements.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/bagel.dat bagel.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/classicmacfonts.dat classicmacfonts.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/cryo.dat cryo.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/cryomni3d.dat cryomni3d.dat scummvm.sw.eoe
Commit: 472f59c6104c5680bb92e9a2b2e4afd7a8f11152
https://github.com/scummvm/scummvm/commit/472f59c6104c5680bb92e9a2b2e4afd7a8f11152
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
LIBRETRO: Moved include to the relevant .cpp file
Changed paths:
backends/platform/libretro/include/libretro-options-widget.h
backends/platform/libretro/src/libretro-options-widget.cpp
diff --git a/backends/platform/libretro/include/libretro-options-widget.h b/backends/platform/libretro/include/libretro-options-widget.h
index 365042f947d..d2182deb798 100644
--- a/backends/platform/libretro/include/libretro-options-widget.h
+++ b/backends/platform/libretro/include/libretro-options-widget.h
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-#include "common/translation.h"
#include "gui/browser.h"
#include "gui/gui-manager.h"
#include "gui/ThemeEval.h"
diff --git a/backends/platform/libretro/src/libretro-options-widget.cpp b/backends/platform/libretro/src/libretro-options-widget.cpp
index 0e76c7005b4..f9f902bb907 100644
--- a/backends/platform/libretro/src/libretro-options-widget.cpp
+++ b/backends/platform/libretro/src/libretro-options-widget.cpp
@@ -22,6 +22,7 @@
#include "backends/platform/libretro/include/libretro-os.h"
#include "gui/launcher.h"
+#include "common/translation.h"
enum {
kPlaylistPathCmd = 'pchp',
Commit: 48c8ff47c6c1e2174bcca0781fa01c0ce9e86520
https://github.com/scummvm/scummvm/commit/48c8ff47c6c1e2174bcca0781fa01c0ce9e86520
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
TWP: Remove unneded include
Changed paths:
engines/twp/detection.cpp
diff --git a/engines/twp/detection.cpp b/engines/twp/detection.cpp
index 32bd08fe919..04922edb6e0 100644
--- a/engines/twp/detection.cpp
+++ b/engines/twp/detection.cpp
@@ -21,7 +21,6 @@
#include "base/plugins.h"
#include "common/file.h"
-#include "common/translation.h"
#include "twp/detection.h"
#include "twp/detection_tables.h"
Commit: 1fe1f23f4c75993f76019d2b580080ddde8a263d
https://github.com/scummvm/scummvm/commit/1fe1f23f4c75993f76019d2b580080ddde8a263d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
AGS: Update POTFILES
Changed paths:
engines/ags/POTFILES
diff --git a/engines/ags/POTFILES b/engines/ags/POTFILES
index bb10da8eca7..649393cf515 100644
--- a/engines/ags/POTFILES
+++ b/engines/ags/POTFILES
@@ -1,2 +1,3 @@
-engines/ags/dialogs.cpp
engines/ags/ags.cpp
+engines/ags/dialogs.cpp
+engines/ags/engine/ac/listbox.cpp
Commit: eb91c707052b6ad202a450b70eeee4f77bcdbeb6
https://github.com/scummvm/scummvm/commit/eb91c707052b6ad202a450b70eeee4f77bcdbeb6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
FREESCAPE: Added missing files to POTFILES
Changed paths:
engines/freescape/POTFILES
diff --git a/engines/freescape/POTFILES b/engines/freescape/POTFILES
index 278e0c945c0..3a218e8187e 100644
--- a/engines/freescape/POTFILES
+++ b/engines/freescape/POTFILES
@@ -1,2 +1,4 @@
engines/freescape/metaengine.cpp
engines/freescape/movement.cpp
+engines/freescape/games/dark/dark.cpp
+engines/freescape/games/driller/driller.cpp
Commit: 664e1737c34e8517bc933e7a9d20b8a384b7d05d
https://github.com/scummvm/scummvm/commit/664e1737c34e8517bc933e7a9d20b8a384b7d05d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
I18N: Update POTFILES with source changes
Changed paths:
po/POTFILES
diff --git a/po/POTFILES b/po/POTFILES
index 16b7e04d9e2..a90fc34433f 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -9,7 +9,6 @@ gui/downloadpacksdialog.cpp
gui/dump-all-dialogs.cpp
gui/editgamedialog.cpp
gui/editrecorddialog.cpp
-gui/error.cpp
gui/filebrowser-dialog.cpp
gui/fluidsynth-dialog.cpp
gui/gui-manager.cpp
@@ -36,6 +35,7 @@ gui/widgets/groupedlist.cpp
base/main.cpp
+common/engine_data.cpp
common/error.cpp
common/localization.cpp
common/rendermode.cpp
@@ -76,7 +76,6 @@ backends/dialogs/gtk/gtk-dialogs.cpp
backends/dialogs/macosx/macosx-dialogs.mm
backends/dialogs/win32/win32-dialogs.cpp
backends/events/default/default-events.cpp
-backends/events/gph/gph-events.cpp
backends/events/maemosdl/maemosdl-events.cpp
backends/events/openpandora/op-events.cpp
backends/fs/android/android-saf-fs.cpp
@@ -112,6 +111,7 @@ backends/platform/ios7/ios7_options.mm
backends/platform/ios7/ios7_osys_events.cpp
backends/platform/ios7/ios7_osys_main.cpp
backends/platform/ios7/ios7_osys_misc.mm
+backends/platform/libretro/src/libretro-options-widget.cpp
backends/platform/maemo/maemo.cpp
backends/platform/sdl/sdl.cpp
backends/platform/sdl/macosx/appmenu_osx.mm
Commit: 0054119f56461df3a387703d86eeb16d92f3759a
https://github.com/scummvm/scummvm/commit/0054119f56461df3a387703d86eeb16d92f3759a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
TWP: Added missing file to POTFILES
Changed paths:
engines/twp/POTFILES
diff --git a/engines/twp/POTFILES b/engines/twp/POTFILES
index 523f89adf63..9946f09f6ab 100644
--- a/engines/twp/POTFILES
+++ b/engines/twp/POTFILES
@@ -1,2 +1,3 @@
engines/twp/dialogs.cpp
engines/twp/metaengine.cpp
+engines/twp/twp.cpp
Commit: c5e57db522727f66be5c6cbf9576b63add433b96
https://github.com/scummvm/scummvm/commit/c5e57db522727f66be5c6cbf9576b63add433b96
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
MM: Remove moved file from POTFILES
Changed paths:
engines/mm/POTFILES
diff --git a/engines/mm/POTFILES b/engines/mm/POTFILES
index 170f4ecb2ec..7e32e118695 100644
--- a/engines/mm/POTFILES
+++ b/engines/mm/POTFILES
@@ -2,5 +2,4 @@ engines/mm/detection.cpp
engines/mm/metaengine.cpp
engines/mm/mm1/metaengine.cpp
engines/mm/mm1/mm1.cpp
-engines/mm/shared/utils/engine_data.cpp
engines/mm/xeen/saves.cpp
Commit: 220304a5a37e9d8a7d6226a135a66c62d2cf4b78
https://github.com/scummvm/scummvm/commit/220304a5a37e9d8a7d6226a135a66c62d2cf4b78
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
DEVTOOLS: Update POTFILES release check
Changed paths:
devtools/release-checks.sh
diff --git a/devtools/release-checks.sh b/devtools/release-checks.sh
index eba46ce9365..3e69e3d9735 100755
--- a/devtools/release-checks.sh
+++ b/devtools/release-checks.sh
@@ -260,7 +260,7 @@ fi
echo_n "Checking POTFILES header includes..."
-headerlist=`grep \.h$ <<< "$list" | grep -v detection_ | grep -v keymapper_`
+headerlist=`grep \.h$ <<< "$list" | grep -v detection_ | grep -v keymapper_ | grep -v engines/gob/detection/tables`
if [ ! -z "$headerlist" ]; then
num_lines=`wc -l <<< "$headerlist"`
@@ -280,7 +280,7 @@ fi
echo_n "Checking missing/extra POTFILES..."
# Now get list of includes
-git grep -l "common/translation\.h" | grep -v devtools/create_engine | grep -v devtools/release-checks.sh | sort > $TMP
+git grep -l "common/translation\.h" | grep -v devtools/create_engine | grep -v devtools/release-checks.sh | grep -v devtools/generate-android-i18n-strings.py | grep -v engines/gob/detection/tables.h | sort > $TMP
res=`diff - $TMP <<< "$list"`
Commit: 04749e30cb5c6f043b82dd85ce6ee734acddc9da
https://github.com/scummvm/scummvm/commit/04749e30cb5c6f043b82dd85ce6ee734acddc9da
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:58:59+02:00
Commit Message:
GOB: Make release checker happier in regards of POTFILES
Changed paths:
engines/gob/detection/tables_adi5.h
engines/gob/detection/tables_adibou3.h
engines/gob/detection/tables_adiboudchou.h
engines/gob/detection/tables_adiboupresente.h
engines/gob/detection/tables_pierresmagiques.h
diff --git a/engines/gob/detection/tables_adi5.h b/engines/gob/detection/tables_adi5.h
index 656d9cdd0c8..e76abc71155 100644
--- a/engines/gob/detection/tables_adi5.h
+++ b/engines/gob/detection/tables_adi5.h
@@ -31,6 +31,8 @@
#ifndef GOB_DETECTION_TABLES_ADI5_H
#define GOB_DETECTION_TABLES_ADI5_H
+//#include "common/translation.h" // Make release checker happy
+
// -- French: Adi 5 --
{
diff --git a/engines/gob/detection/tables_adibou3.h b/engines/gob/detection/tables_adibou3.h
index a21762ef8f2..e6f5f7ec430 100644
--- a/engines/gob/detection/tables_adibou3.h
+++ b/engines/gob/detection/tables_adibou3.h
@@ -31,6 +31,8 @@
#ifndef GOB_DETECTION_TABLES_ADIBOU3_H
#define GOB_DETECTION_TABLES_ADIBOU3_H
+//#include "common/translation.h" // Make release checker happy
+
// -- French: Adibou 3 --
{
diff --git a/engines/gob/detection/tables_adiboudchou.h b/engines/gob/detection/tables_adiboudchou.h
index 1ef654492a0..837149167d5 100644
--- a/engines/gob/detection/tables_adiboudchou.h
+++ b/engines/gob/detection/tables_adiboudchou.h
@@ -31,6 +31,8 @@
#ifndef GOB_DETECTION_TABLES_ADIBOUDCHOU_H
#define GOB_DETECTION_TABLES_ADIBOUDCHOU_H
+//#include "common/translation.h" // Make release checker happy
+
// -- French: Adiboud'chou series --
// -- German: Addy Buschu series --
diff --git a/engines/gob/detection/tables_adiboupresente.h b/engines/gob/detection/tables_adiboupresente.h
index f9f20c88d52..73ca231f35a 100644
--- a/engines/gob/detection/tables_adiboupresente.h
+++ b/engines/gob/detection/tables_adiboupresente.h
@@ -31,6 +31,8 @@
#ifndef GOB_DETECTION_TABLES_ADIBOUPRESENTE_H
#define GOB_DETECTION_TABLES_ADIBOUPRESENTE_H
+//#include "common/translation.h" // Make release checker happy
+
// -- French: Adibou présente Dessin --
{
diff --git a/engines/gob/detection/tables_pierresmagiques.h b/engines/gob/detection/tables_pierresmagiques.h
index 9457449fa25..7e5ceefad6c 100644
--- a/engines/gob/detection/tables_pierresmagiques.h
+++ b/engines/gob/detection/tables_pierresmagiques.h
@@ -31,6 +31,8 @@
#ifndef GOB_DETECTION_TABLES_PIERRESMAGIQUES_H
#define GOB_DETECTION_TABLES_PIERRESMAGIQUES_H
+//#include "common/translation.h" // Make release checker happy
+
// -- French: Le pays des Pierres Magiques --
{
Commit: 19b11a9aaf47c21da1ca688dfe84fe3b2dc1b003
https://github.com/scummvm/scummvm/commit/19b11a9aaf47c21da1ca688dfe84fe3b2dc1b003
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
GLK: Move common/translation.h include to .cpp file
That makes release checker happy and is less error-prone.
Changed paths:
engines/glk/POTFILES
engines/glk/magnetic/magnetic.cpp
engines/glk/magnetic/magnetic.h
diff --git a/engines/glk/POTFILES b/engines/glk/POTFILES
index add5301de64..1c78f7f773c 100644
--- a/engines/glk/POTFILES
+++ b/engines/glk/POTFILES
@@ -8,7 +8,7 @@ engines/glk/advsys/vm.cpp
engines/glk/alan2/alan2.cpp
engines/glk/comprehend/game.cpp
engines/glk/glulx/glulx.cpp
-engines/glk/magnetic/magnetic.h
+engines/glk/magnetic/magnetic.cpp
engines/glk/quest/quest.cpp
engines/glk/scott/scott.cpp
engines/glk/zcode/detection.cpp
diff --git a/engines/glk/magnetic/magnetic.cpp b/engines/glk/magnetic/magnetic.cpp
index 6f8bcf4f8c8..e2077e762c7 100644
--- a/engines/glk/magnetic/magnetic.cpp
+++ b/engines/glk/magnetic/magnetic.cpp
@@ -22,6 +22,7 @@
#include "glk/magnetic/magnetic.h"
#include "glk/magnetic/magnetic_defs.h"
#include "common/config-manager.h"
+#include "common/translation.h"
namespace Glk {
namespace Magnetic {
@@ -178,5 +179,25 @@ Common::Error Magnetic::writeGameData(Common::WriteStream *ws) {
return ws->write(_saveData, _saveSize) == _saveSize ? Common::kNoError : Common::kWritingFailed;
}
+/**
+ * The Magnetic engine currently doesn't support loading savegames from the GMM
+ */
+bool Magnetic::canLoadGameStateCurrently(Common::U32String *msg) {
+ if (msg)
+ *msg = _("This game does not support loading from the menu. Use in-game interface");
+
+ return false;
+}
+
+/**
+ * The Magnetic engine currently doesn't support saving games from the GMM
+ */
+bool Magnetic::canSaveGameStateCurrently(Common::U32String *msg) {
+ if (msg)
+ *msg = _("This game does not support saving from the menu. Use in-game interface");
+
+ return false;
+}
+
} // End of namespace Magnetic
} // End of namespace Glk
diff --git a/engines/glk/magnetic/magnetic.h b/engines/glk/magnetic/magnetic.h
index 01d82e6b30f..1fb55fa6634 100644
--- a/engines/glk/magnetic/magnetic.h
+++ b/engines/glk/magnetic/magnetic.h
@@ -25,7 +25,6 @@
#define GLK_MAGNETIC_MAGNETIC
#include "common/scummsys.h"
-#include "common/translation.h"
#include "glk/glk_api.h"
#include "glk/magnetic/magnetic_types.h"
#include "glk/magnetic/magnetic_defs.h"
@@ -1386,22 +1385,12 @@ public:
/**
* The Magnetic engine currently doesn't support loading savegames from the GMM
*/
- bool canLoadGameStateCurrently(Common::U32String *msg = nullptr) override {
- if (msg)
- *msg = _("This game does not support loading from the menu. Use in-game interface");
-
- return false;
- }
+ bool canLoadGameStateCurrently(Common::U32String *msg = nullptr) override;
/**
* The Magnetic engine currently doesn't support saving games from the GMM
*/
- bool canSaveGameStateCurrently(Common::U32String *msg = nullptr) override {
- if (msg)
- *msg = _("This game does not support saving from the menu. Use in-game interface");
-
- return false;
- }
+ bool canSaveGameStateCurrently(Common::U32String *msg = nullptr) override;
/**
* Load a savegame from the passed Quetzal file chunk stream
Commit: 3746945ad53a96d60c8a57cb247238e606ebf815
https://github.com/scummvm/scummvm/commit/3746945ad53a96d60c8a57cb247238e606ebf815
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
DEVTOOLS: Split out themes check into a separate test
Changed paths:
devtools/release-checks.sh
diff --git a/devtools/release-checks.sh b/devtools/release-checks.sh
index 3e69e3d9735..84227b835dd 100755
--- a/devtools/release-checks.sh
+++ b/devtools/release-checks.sh
@@ -351,6 +351,22 @@ done
rm dists/engine-data/engine_data_combined.mk
+if [ "$absentFiles" -ne "0" ]; then
+ echo -e "$absentFiles missing files ${RED}Fix them${NC}"
+
+ failPlus
+else
+ echoOk
+fi
+
+##########
+# GUI theme files
+##########
+
+echo_n "Checking GUI theme files..."
+
+absentFiles=0
+
declare -a themefiles=(
"Makefile.common#DIST_FILES_THEMES.*%FILE%"
"devtools/create_project/xcode.cpp#[ ]+files.push_back\(\"gui/themes/%FILE%\"\);"
Commit: b1605807f534145dfe65c241b900393ef4e284f8
https://github.com/scummvm/scummvm/commit/b1605807f534145dfe65c241b900393ef4e284f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
BUILD: Added missing License files to makefiles
Changed paths:
Makefile.common
ports.mk
diff --git a/Makefile.common b/Makefile.common
index a879a75ae45..f0f6cf77c8f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -370,10 +370,12 @@ dist-src: \
@#DEB-src?
# Common files
-DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING LICENSES/COPYING.BSD LICENSES/COPYING.LGPL \
- LICENSES/COPYING.FREEFONT LICENSES/COPYING.OFL LICENSES/COPYING.ISC LICENSES/COPYING.LUA \
- LICENSES/COPYING.MIT LICENSES/COPYING.MKV LICENSES/COPYING.TINYGL LICENSES/COPYING.GLAD \
- LICENSES/CatharonLicense.txt COPYRIGHT NEWS.md README.md CONTRIBUTING.md)
+DIST_FILES_DOCS:=AUTHORS COPYING COPYRIGHT NEWS.md README.md CONTRIBUTING.md
+DIST_FILES_DOCS+=LICENSES/COPYING.Apache LICENSES/COPYING.BSD LICENSES/COPYING.BSL LICENSES/COPYING.FREEFONT
+DIST_FILES_DOCS+=LICENSES/COPYING.GLAD LICENSES/COPYING.ISC LICENSES/COPYING.LGPL LICENSES/COPYING.LUA
+DIST_FILES_DOCS+=LICENSES/COPYING.MIT LICENSES/COPYING.MKV LICENSES/COPYING.MPL LICENSES/COPYING.OFL LICENSES/COPYING.TINYGL
+DIST_FILES_DOCS+=LICENSES/CatharonLicense.txt
+DIST_FILES_DOCS:=$(addprefix $(srcdir)/,$(DIST_FILES_DOCS))
ifdef USE_PANDOC
DIST_FILES_DOCS+=README$(PANDOCEXT) NEWS$(PANDOCEXT) CONTRIBUTING$(PANDOCEXT)
endif
diff --git a/ports.mk b/ports.mk
index 871282e1cd3..f2ad6e26815 100644
--- a/ports.mk
+++ b/ports.mk
@@ -182,10 +182,21 @@ ifdef USE_PANDOC
@sed -i'.sed-orig' -e "s|href=\"AUTHORS\"|href=\"https://www.scummvm.org/credits/\"|g" $(bundle_name)/Contents/Resources/README$(PANDOCEXT)
endif
@rm $(bundle_name)/Contents/Resources/*.sed-orig
- cp $(bundle_name)/Contents/Resources/COPYING.LGPL $(bundle_name)/Contents/Resources/COPYING-LGPL
+ cp $(bundle_name)/Contents/Resources/COPYING.Apache $(bundle_name)/Contents/Resources/COPYING-Apache
+ cp $(bundle_name)/Contents/Resources/COPYING.BSD $(bundle_name)/Contents/Resources/COPYING-BSD
+ cp $(bundle_name)/Contents/Resources/COPYING.BSL $(bundle_name)/Contents/Resources/COPYING-BSL
cp $(bundle_name)/Contents/Resources/COPYING.FREEFONT $(bundle_name)/Contents/Resources/COPYING-FREEFONT
+ cp $(bundle_name)/Contents/Resources/COPYING.GLAD $(bundle_name)/Contents/Resources/COPYING-GLAD
+ cp $(bundle_name)/Contents/Resources/COPYING.ISC $(bundle_name)/Contents/Resources/COPYING-ISC
+ cp $(bundle_name)/Contents/Resources/COPYING.LGPL $(bundle_name)/Contents/Resources/COPYING-LGPL
+ cp $(bundle_name)/Contents/Resources/COPYING.LUA $(bundle_name)/Contents/Resources/COPYING-LUA
+ cp $(bundle_name)/Contents/Resources/COPYING.MIT $(bundle_name)/Contents/Resources/COPYING-MIT
+ cp $(bundle_name)/Contents/Resources/COPYING.MKV $(bundle_name)/Contents/Resources/COPYING-MKV
+ cp $(bundle_name)/Contents/Resources/COPYING.MPL $(bundle_name)/Contents/Resources/COPYING-MPL
cp $(bundle_name)/Contents/Resources/COPYING.OFL $(bundle_name)/Contents/Resources/COPYING-OFL
- cp $(bundle_name)/Contents/Resources/COPYING.BSD $(bundle_name)/Contents/Resources/COPYING-BSD
+ cp $(bundle_name)/Contents/Resources/COPYING.TINYGL $(bundle_name)/Contents/Resources/COPYING-TINYGL
+ cp $(bundle_name)/Contents/Resources/CatharonLicense.txt $(bundle_name)/Contents/Resources/CatharonLicense-txt
+
ifdef DYNAMIC_MODULES
cp $(PLUGINS) $(bundle_name)/Contents/Resources/
endif
@@ -577,16 +588,19 @@ osxsnap: bundle
mkdir ScummVM-snapshot
cp $(DIST_FILES_DOCS) ./ScummVM-snapshot/
mv ./ScummVM-snapshot/COPYING ./ScummVM-snapshot/License\ \(GPL\)
- mv ./ScummVM-snapshot/COPYING.LGPL ./ScummVM-snapshot/License\ \(LGPL\)
- mv ./ScummVM-snapshot/COPYING.FREEFONT ./ScummVM-snapshot/License\ \(FREEFONT\)
- mv ./ScummVM-snapshot/COPYING.OFL ./ScummVM-snapshot/License\ \(OFL\)
+ mv ./ScummVM-snapshot/COPYING.Apache ./ScummVM-snapshot/License\ \(Apache\)
mv ./ScummVM-snapshot/COPYING.BSD ./ScummVM-snapshot/License\ \(BSD\)
+ mv ./ScummVM-snapshot/COPYING.BSL ./ScummVM-snapshot/License\ \(BSL\)
+ mv ./ScummVM-snapshot/COPYING.FREEFONT ./ScummVM-snapshot/License\ \(FREEFONT\)
+ mv ./ScummVM-snapshot/COPYING.GLAD ./ScummVM-snapshot/License\ \(Glad\)
mv ./ScummVM-snapshot/COPYING.ISC ./ScummVM-snapshot/License\ \(ISC\)
+ mv ./ScummVM-snapshot/COPYING.LGPL ./ScummVM-snapshot/License\ \(LGPL\)
mv ./ScummVM-snapshot/COPYING.LUA ./ScummVM-snapshot/License\ \(Lua\)
mv ./ScummVM-snapshot/COPYING.MIT ./ScummVM-snapshot/License\ \(MIT\)
mv ./ScummVM-snapshot/COPYING.MKV ./ScummVM-snapshot/License\ \(MKV\)
+ mv ./ScummVM-snapshot/COPYING.MPL ./ScummVM-snapshot/License\ \(MPL\)
+ mv ./ScummVM-snapshot/COPYING.OFL ./ScummVM-snapshot/License\ \(OFL\)
mv ./ScummVM-snapshot/COPYING.TINYGL ./ScummVM-snapshot/License\ \(TinyGL\)
- mv ./ScummVM-snapshot/COPYING.GLAD ./ScummVM-snapshot/License\ \(Glad\)
mv ./ScummVM-snapshot/CatharonLicense.txt ./ScummVM-snapshot/CatharonLicense.txt
$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
mkdir ScummVM-snapshot/doc
Commit: 01076c8b625624d15dab908d3dcc59e2a10a2750
https://github.com/scummvm/scummvm/commit/01076c8b625624d15dab908d3dcc59e2a10a2750
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
IRIX: Added missing License files
Changed paths:
dists/irix/scummvm.idb
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index 8d089abf495..9b28496e028 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -1,15 +1,17 @@
f 0644 root sys usr/ScummVM/COPYING COPYING scummvm.man.readme
+f 0644 root sys usr/ScummVM/COPYING.Apache LICENSES/COPYING.Apache scummvm.man.readme
f 0644 root sys usr/ScummVM/COPYING.BSD LICENSES/COPYING.BSD scummvm.man.readme
-f 0644 root sys usr/ScummVM/COPYING.LGPL LICENSES/COPYING.LGPL scummvm.man.readme
-f 0644 root sys usr/ScummVM/COPYING.BSD LICENSES/COPYING.BSD scummvm.man.readme
+f 0644 root sys usr/ScummVM/COPYING.BSL LICENSES/COPYING.BSL scummvm.man.readme
f 0644 root sys usr/ScummVM/COPYING.FREEFONT LICENSES/COPYING.FREEFONT scummvm.man.readme
-f 0644 root sys usr/ScummVM/COPYING.OFL LICENSES/COPYING.OFL scummvm.man.readme
+f 0644 root sys usr/ScummVM/COPYING.GLAD LICENSES/COPYING.GLAD scummvm.man.readme
f 0644 root sys usr/ScummVM/COPYING.ISC LICENSES/COPYING.ISC scummvm.man.readme
+f 0644 root sys usr/ScummVM/COPYING.LGPL LICENSES/COPYING.LGPL scummvm.man.readme
f 0644 root sys usr/ScummVM/COPYING.LUA LICENSES/COPYING.LUA scummvm.man.readme
f 0644 root sys usr/ScummVM/COPYING.MIT LICENSES/COPYING.MIT scummvm.man.readme
f 0644 root sys usr/ScummVM/COPYING.MKV LICENSES/COPYING.MKV scummvm.man.readme
+f 0644 root sys usr/ScummVM/COPYING.MPL LICENSES/COPYING.MPL scummvm.man.readme
+f 0644 root sys usr/ScummVM/COPYING.OFL LICENSES/COPYING.OFL scummvm.man.readme
f 0644 root sys usr/ScummVM/COPYING.TINYGL LICENSES/COPYING.TINYGL scummvm.man.readme
-f 0644 root sys usr/ScummVM/COPYING.GLAD LICENSES/COPYING.GLAD scummvm.man.readme
f 0644 root sys usr/ScummVM/CatharonLicense.txt LICENSES/CatharonLicense.txt scummvm.man.readme
f 0644 root sys usr/ScummVM/COPYRIGHT COPYRIGHT scummvm.man.readme
f 0644 root sys usr/ScummVM/NEWS.md NEWS.module scummvm.man.readme
Commit: 10da6c6acb4e34a383b44288c5a287c14d8376dd
https://github.com/scummvm/scummvm/commit/10da6c6acb4e34a383b44288c5a287c14d8376dd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
MAEMO: Added missing License files
Changed paths:
backends/platform/maemo/debian/rules
diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules
index 0018c795dad..5814ba96294 100755
--- a/backends/platform/maemo/debian/rules
+++ b/backends/platform/maemo/debian/rules
@@ -55,9 +55,12 @@ install: build
install -m0644 dists/engine-data/*.cpt debian/scummvm/opt/scummvm/share
install -m0644 -d debian/scummvm/usr/share/doc/scummvm
- install -m0644 AUTHORS COPYING LICENSES/COPYING.BSD LICENSES/COPYING.LGPL LICENSES/COPYING.FREEFONT LICENSES/COPYING.OFL \
- LICENSES/COPYING.ISC LICENSES/COPYING.LUA LICENSES/COPYING.MIT LICENSES/COPYING.MKV LICENSES/COPYING.TINYGL \
- LICENSES/COPYING.GLAD LICENSES/CatharonLicense.txt COPYRIGHT NEWS.md README.md debian/scummvm/usr/share/doc/scummvm
+ install -m0644 AUTHORS COPYING COPYRIGHT NEWS.md README.md debian/scummvm/usr/share/doc/scummvm
+ install -m0644 LICENSES/COPYING.Apache LICENSES/COPYING.BSD LICENSES/COPYING.BSL debian/scummvm/usr/share/doc/scummvm
+ install -m0644 LICENSES/COPYING.FREEFONT LICENSES/COPYING.GLAD LICENSES/COPYING.ISC debian/scummvm/usr/share/doc/scummvm
+ install -m0644 LICENSES/COPYING.LGPL LICENSES/COPYING.LUA LICENSES/COPYING.MIT debian/scummvm/usr/share/doc/scummvm
+ install -m0644 LICENSES/COPYING.MKV LICENSES/COPYING.MPL LICENSES/COPYING.OFL debian/scummvm/usr/share/doc/scummvm
+ install -m0644 LICENSES/COPYING.TINYGL LICENSES/CatharonLicense.txt debian/scummvm/usr/share/doc/scummvm
binary: binary-arch
binary-arch: build install
Commit: 1919a349e4c6ff02c2ff895643df16366a3dea1c
https://github.com/scummvm/scummvm/commit/1919a349e4c6ff02c2ff895643df16366a3dea1c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
WIN32: Added missing License files
Changed paths:
backends/platform/sdl/win32/win32.mk
diff --git a/backends/platform/sdl/win32/win32.mk b/backends/platform/sdl/win32/win32.mk
index 5236805a6b2..c7cf0b734d4 100644
--- a/backends/platform/sdl/win32/win32.mk
+++ b/backends/platform/sdl/win32/win32.mk
@@ -48,16 +48,19 @@ win32-data: all
$(STRIP) $(EXECUTABLE) -o $(WIN32PATH)/$(EXECUTABLE)
cp $(srcdir)/AUTHORS $(WIN32PATH)/AUTHORS.txt
cp $(srcdir)/COPYING $(WIN32PATH)/COPYING.txt
+ cp $(srcdir)/LICENSES/COPYING.Apache $(WIN32PATH)/COPYING.Apache.txt
cp $(srcdir)/LICENSES/COPYING.BSD $(WIN32PATH)/COPYING.BSD.txt
- cp $(srcdir)/LICENSES/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
+ cp $(srcdir)/LICENSES/COPYING.BSL $(WIN32PATH)/COPYING.BSL.txt
cp $(srcdir)/LICENSES/COPYING.FREEFONT $(WIN32PATH)/COPYING.FREEFONT.txt
- cp $(srcdir)/LICENSES/COPYING.OFL $(WIN32PATH)/COPYING.OFL.txt
- cp $(srcdir)/LICENSES/COPYING.ISC $(WIN32PATH)/COPYING.ISC.txt
+ cp $(srcdir)/LICENSES/COPYING.GLAD $(WIN32PATH)/COPYING.GLAD.txt
+ cp $(srcdir)/LICENSES/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
cp $(srcdir)/LICENSES/COPYING.LUA $(WIN32PATH)/COPYING.LUA.txt
cp $(srcdir)/LICENSES/COPYING.MIT $(WIN32PATH)/COPYING.MIT.txt
cp $(srcdir)/LICENSES/COPYING.MKV $(WIN32PATH)/COPYING.MKV.txt
+ cp $(srcdir)/LICENSES/COPYING.MPL $(WIN32PATH)/COPYING.MPL.txt
+ cp $(srcdir)/LICENSES/COPYING.OFL $(WIN32PATH)/COPYING.OFL.txt
+ cp $(srcdir)/LICENSES/COPYING.ISC $(WIN32PATH)/COPYING.ISC.txt
cp $(srcdir)/LICENSES/COPYING.TINYGL $(WIN32PATH)/COPYING.TINYGL.txt
- cp $(srcdir)/LICENSES/COPYING.GLAD $(WIN32PATH)/COPYING.GLAD.txt
cp $(srcdir)/LICENSES/CatharonLicense.txt $(WIN32PATH)/CatharonLicense.txt
cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
cp $(srcdir)/doc/cz/PrectiMe $(WIN32PATH)/doc/cz/PrectiMe.txt
Commit: 1033d8ce68ae801ccde45dd181bb0703ea0efb6b
https://github.com/scummvm/scummvm/commit/1033d8ce68ae801ccde45dd181bb0703ea0efb6b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
CREATE_PROJECT: Added missing License files
Changed paths:
devtools/create_project/create_project.cpp
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 80681ffd268..eb459df1c9f 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1732,16 +1732,19 @@ void ProjectProvider::createProject(BuildSetup &setup) {
// Various text files
in.push_back(setup.srcDir + "/AUTHORS");
in.push_back(setup.srcDir + "/COPYING");
+ in.push_back(setup.srcDir + "/LICENSES/COPYING.Apache");
in.push_back(setup.srcDir + "/LICENSES/COPYING.BSD");
- in.push_back(setup.srcDir + "/LICENSES/COPYING.LGPL");
+ in.push_back(setup.srcDir + "/LICENSES/COPYING.BSL");
in.push_back(setup.srcDir + "/LICENSES/COPYING.FREEFONT");
- in.push_back(setup.srcDir + "/LICENSES/COPYING.OFL");
+ in.push_back(setup.srcDir + "/LICENSES/COPYING.GLAD");
in.push_back(setup.srcDir + "/LICENSES/COPYING.ISC");
+ in.push_back(setup.srcDir + "/LICENSES/COPYING.LGPL");
in.push_back(setup.srcDir + "/LICENSES/COPYING.LUA");
in.push_back(setup.srcDir + "/LICENSES/COPYING.MIT");
in.push_back(setup.srcDir + "/LICENSES/COPYING.MKV");
+ in.push_back(setup.srcDir + "/LICENSES/COPYING.MPL");
+ in.push_back(setup.srcDir + "/LICENSES/COPYING.OFL");
in.push_back(setup.srcDir + "/LICENSES/COPYING.TINYGL");
- in.push_back(setup.srcDir + "/LICENSES/COPYING.GLAD");
in.push_back(setup.srcDir + "/LICENSES/CatharonLicense.txt");
in.push_back(setup.srcDir + "/COPYRIGHT");
in.push_back(setup.srcDir + "/NEWS.md");
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 0da5e13d8c2..8d9df77f51c 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1135,16 +1135,19 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
files.push_back("icons/scummvm.icns");
files.push_back("AUTHORS");
files.push_back("COPYING");
+ files.push_back("LICENSES/COPYING.Apache");
+ files.push_back("LICENSES/COPYING.BSL");
files.push_back("LICENSES/COPYING.BSD");
- files.push_back("LICENSES/COPYING.LGPL");
files.push_back("LICENSES/COPYING.FREEFONT");
- files.push_back("LICENSES/COPYING.OFL");
+ files.push_back("LICENSES/COPYING.GLAD");
files.push_back("LICENSES/COPYING.ISC");
+ files.push_back("LICENSES/COPYING.LGPL");
files.push_back("LICENSES/COPYING.LUA");
files.push_back("LICENSES/COPYING.MIT");
files.push_back("LICENSES/COPYING.MKV");
+ files.push_back("LICENSES/COPYING.MPL");
+ files.push_back("LICENSES/COPYING.OFL");
files.push_back("LICENSES/COPYING.TINYGL");
- files.push_back("LICENSES/COPYING.GLAD");
files.push_back("LICENSES/CatharonLicense.txt");
files.push_back("NEWS.md");
files.push_back("README.md");
Commit: a69f9e5afb2b63276a87d0a2c684d9a5c1a3863f
https://github.com/scummvm/scummvm/commit/a69f9e5afb2b63276a87d0a2c684d9a5c1a3863f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
DISTS: REDHAT: Added missing License files
Changed paths:
dists/redhat/scummvm.spec
dists/redhat/scummvm.spec.in
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 660fbc50999..4f390f127aa 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -86,7 +86,7 @@ fi
#------------------------------------------------------------------------------
%files
%defattr(0644,root,root,0755)
-%doc AUTHORS README.md NEWS.md COPYING LICENSES/COPYING.BSD LICENSES/COPYING.LGPL LICENSES/COPYING.FREEFONT LICENSES/COPYING.OFL LICENSES/COPYING.ISC LICENSES/COPYING.LUA LICENSES/COPYING.MIT LICENSES/COPYING.MKV LICENSES/COPYING.TINYGL LICENSES/COPYING.GLAD LICENSES/CatharonLicense.txt COPYRIGHT
+%doc AUTHORS README.md NEWS.md COPYING LICENSES/COPYING.Apache LICENSES/COPYING.BSD LICENSES/COPYING.BSL LICENSES/COPYING.LGPL LICENSES/COPYING.FREEFONT LICENSES/COPYING.OFL LICENSES/COPYING.ISC LICENSES/COPYING.LUA LICENSES/COPYING.MIT LICENSES/COPYING.MKV LICENSES/COPYING.MPL LICENSES/COPYING.TINYGL LICENSES/COPYING.GLAD LICENSES/CatharonLicense.txt COPYRIGHT
%attr(0755,root,root)%{_bindir}/scummvm
%{_datadir}/applications/*
%{_datadir}/pixmaps/org.scummvm.scummvm.xpm
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index a24f51c7128..209f80ae43b 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -86,7 +86,7 @@ fi
#------------------------------------------------------------------------------
%files
%defattr(0644,root,root,0755)
-%doc AUTHORS README.md NEWS.md COPYING LICENSES/COPYING.BSD LICENSES/COPYING.LGPL LICENSES/COPYING.FREEFONT LICENSES/COPYING.OFL LICENSES/COPYING.ISC LICENSES/COPYING.LUA LICENSES/COPYING.MIT LICENSES/COPYING.MKV LICENSES/COPYING.TINYGL LICENSES/COPYING.GLAD LICENSES/CatharonLicense.txt COPYRIGHT
+%doc AUTHORS README.md NEWS.md COPYING LICENSES/COPYING.Apache LICENSES/COPYING.BSD LICENSES/COPYING.BSL LICENSES/COPYING.LGPL LICENSES/COPYING.FREEFONT LICENSES/COPYING.OFL LICENSES/COPYING.ISC LICENSES/COPYING.LUA LICENSES/COPYING.MIT LICENSES/COPYING.MKV LICENSES/COPYING.MPL LICENSES/COPYING.TINYGL LICENSES/COPYING.GLAD LICENSES/CatharonLicense.txt COPYRIGHT
%attr(0755,root,root)%{_bindir}/scummvm
%{_datadir}/applications/*
%{_datadir}/pixmaps/org.scummvm.scummvm.xpm
Commit: 9829448a025990af732a5c7f3ea12d9a5cfaaa1b
https://github.com/scummvm/scummvm/commit/9829448a025990af732a5c7f3ea12d9a5cfaaa1b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
MACOS: Added missing License files to macOS menu
Changed paths:
backends/platform/sdl/macosx/appmenu_osx.mm
diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 15e33bf51f7..36676d3f2c3 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -113,10 +113,20 @@ static void openFromBundle(NSString *file) {
}
- (void) openReadme;
- (void) openLicenseGPL;
-- (void) openLicenseLGPL;
+- (void) openLicenseApache;
+- (void) openLicenseBSD;
+- (void) openLicenseBSL;
- (void) openLicenseFreefont;
+- (void) openLicenseGLAD;
+- (void) openLicenseISC;
+- (void) openLicenseLGPL;
+- (void) openLicenseLUA;
+- (void) openLicenseMIT;
+- (void) openLicenseMKV;
+- (void) openLicenseMPL;
- (void) openLicenseOFL;
-- (void) openLicenseBSD;
+- (void) openLicenseTinyGL;
+- (void) openLicenseCatharon;
- (void) openNews;
- (void) openUserManual;
- (void) openCredits;
@@ -131,20 +141,60 @@ static void openFromBundle(NSString *file) {
openFromBundle(@"COPYING");
}
-- (void)openLicenseLGPL {
- openFromBundle(@"COPYING-LGPL");
+- (void)openLicenseApache {
+ openFromBundle(@"COPYING-Apache");
+}
+
+- (void)openLicenseBSD {
+ openFromBundle(@"COPYING-BSD");
+}
+
+- (void)openLicenseBSL {
+ openFromBundle(@"COPYING-BSL");
}
- (void)openLicenseFreefont {
openFromBundle(@"COPYING-FREEFONT");
}
+- (void)openLicenseGLAD {
+ openFromBundle(@"COPYING-GLAD");
+}
+
+- (void)openLicenseISC {
+ openFromBundle(@"COPYING-ISC");
+}
+
+- (void)openLicenseLGPL {
+ openFromBundle(@"COPYING-LGPL");
+}
+
+- (void)openLicenseLUA {
+ openFromBundle(@"COPYING-LUA");
+}
+
+- (void)openLicenseMIT {
+ openFromBundle(@"COPYING-MIT");
+}
+
+- (void)openLicenseMKV {
+ openFromBundle(@"COPYING-MKV");
+}
+
+- (void)openLicenseMPL {
+ openFromBundle(@"COPYING-MPL");
+}
+
- (void)openLicenseOFL {
openFromBundle(@"COPYING-OFL");
}
-- (void)openLicenseBSD {
- openFromBundle(@"COPYING-BSD");
+- (void)openLicenseTinyGL {
+ openFromBundle(@"COPYING-TINYGL");
+}
+
+- (void)openLicenseCatharon {
+ openFromBundle(@"CatharonLicense-txt");
}
- (void)openNews {
@@ -275,6 +325,17 @@ void replaceApplicationMenuItems() {
addMenuItem(_("Freefont License"), delegate, @selector(openLicenseFreefont), @"", helpMenu);
addMenuItem(_("OFL License"), delegate, @selector(openLicenseOFL), @"", helpMenu);
addMenuItem(_("BSD License"), delegate, @selector(openLicenseBSD), @"", helpMenu);
+
+ addMenuItem(_("Apache License"), delegate, @selector(openLicenseApache), @"", helpMenu);
+ addMenuItem(_("BSL License"), delegate, @selector(openLicenseBSL), @"", helpMenu);
+ addMenuItem(_("GLAD License"), delegate, @selector(openLicenseGLAD), @"", helpMenu);
+ addMenuItem(_("ISC License"), delegate, @selector(openLicenseISC), @"", helpMenu);
+ addMenuItem(_("Lua License"), delegate, @selector(openLicenseLUA), @"", helpMenu);
+ addMenuItem(_("MIT License"), delegate, @selector(openLicenseMIT), @"", helpMenu);
+ addMenuItem(_("MKV License"), delegate, @selector(openLicenseMKV), @"", helpMenu);
+ addMenuItem(_("MPL License"), delegate, @selector(openLicenseMPL), @"", helpMenu);
+ addMenuItem(_("TinyGL License"), delegate, @selector(openLicenseTinyGL), @"", helpMenu);
+ addMenuItem(_("Catharon License"), delegate, @selector(openLicenseCatharon), @"", helpMenu);
}
[appleMenu release];
Commit: 681b9b744e94a0ccbbdbf1d9d35b736c0e148468
https://github.com/scummvm/scummvm/commit/681b9b744e94a0ccbbdbf1d9d35b736c0e148468
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
DEVTOOLS: Implemented sanity License files pre-release checks
Changed paths:
devtools/release-checks.sh
diff --git a/devtools/release-checks.sh b/devtools/release-checks.sh
index 84227b835dd..eceeeb5a3c2 100755
--- a/devtools/release-checks.sh
+++ b/devtools/release-checks.sh
@@ -402,8 +402,63 @@ do
done
done
-IFS="$OLDIFS"
+if [ "$absentFiles" -ne "0" ]; then
+ echo -e "$absentFiles missing files ${RED}Fix them${NC}"
+
+ failPlus
+else
+ echoOk
+fi
+
+##########
+# LICENSE files
+##########
+
+OLDIFS="$IFS"
+IFS=$'\n' # allow arguments with tabs and spaces
+
+echo_n "Checking LICENSE files..."
+
+absentFiles=0
+
+declare -a licensefiles=(
+ "Makefile.common#DIST_FILES_DOCS.*%FILE%"
+ "backends/platform/maemo/debian/rules#install -m0644.*%FILE%.*debian/scummvm/usr/share/doc/scummvm"
+ "backends/platform/sdl/macosx/appmenu_osx.mm#openFromBundle\(@\"%FILEUNDOTTED%\"\);"
+ "backends/platform/sdl/win32/win32.mk#cp \\$\(srcdir\)/%FILE% \\$\(WIN32PATH\)/%FILEBASE%\.txt"
+ "devtools/create_project/create_project.cpp#in\.push_back\(setup.srcDir \+ \"/%FILE%\"\)"
+ "devtools/create_project/xcode.cpp#[ ]+files.push_back\(\"%FILE%\"\);"
+ "dists/irix/scummvm.idb#f 0644 root sys usr/ScummVM/%FILEBASE% %FILE% scummvm.man.readme"
+ "dists/redhat/scummvm.spec#%doc AUTHORS README.md.*%FILE%"
+ "dists/redhat/scummvm.spec.in#%doc AUTHORS README.md.*%FILE%"
+ "ports.mk#cp \\$\(bundle_name\)/Contents/Resources/%FILEBASE% \\$\(bundle_name\)/Contents/Resources/%FILEUNDOTTED%"
+ "ports.mk#mv \./ScummVM-snapshot/%FILEBASE% \./ScummVM-snapshot"
+)
+
+for f in LICENSES/*
+do
+ file=$f
+ filebase=`basename $f`
+ fileundotted=`sed "s|\.|-|g" <<< "$filebase"`
+
+ for d in "${licensefiles[@]}"
+ do
+ if [ $filebase == "CatharonLicense.txt" -o $d == "backends/platform/sdl/win32/win32.mk" ]; then
+ # the file is not renamed to .txt.txt
+ continue
+ fi
+ target=`cut -d '#' -f 1 <<< "$d"`
+ pattern=`cut -d '#' -f 2 <<< "$d"`
+
+ res=`sed "s|%FILE%|$file|g;s|%FILEBASE%|$filebase|g;s|%FILEUNDOTTED%|$fileundotted|g" <<< "$pattern"`
+
+ if [ -z $(grep -E "$res" "$target" | head -1) ]; then
+ echo "$file is absent in $target"
+ absentFiles=$((absentFiles+1))
+ fi
+ done
+done
if [ "$absentFiles" -ne "0" ]; then
echo -e "$absentFiles missing files ${RED}Fix them${NC}"
@@ -413,6 +468,29 @@ else
echoOk
fi
+echo_n "Checking LICENSE files contents..."
+
+checkFailed=0
+
+for f in LICENSES/*
+do
+
+ if [ -z $(head -2 $f | grep NOTE: ) ]; then
+ echo "$f is missing NOTE"
+ checkFailed=$((checkFailed+1))
+ fi
+done
+
+if [ "$checkFailed" -ne "0" ]; then
+ echo -e "$checkFailed files malformed ${RED}Fix them${NC}"
+
+ failPlus
+else
+ echoOk
+fi
+
+IFS="$OLDIFS"
+
#############################################################################
#
Commit: dff2efc76650a1d92196d4f2bdce07b8a02b0c1c
https://github.com/scummvm/scummvm/commit/dff2efc76650a1d92196d4f2bdce07b8a02b0c1c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-22T21:59:00+02:00
Commit Message:
LICENSES: Make sure every license file has an appropriate Note
This is required to remove potential confusion in regards to
where certain licenses are applied
Changed paths:
LICENSES/COPYING.Apache
LICENSES/COPYING.BSL
LICENSES/COPYING.GLAD
LICENSES/COPYING.ISC
LICENSES/COPYING.MKV
LICENSES/COPYING.MPL
diff --git a/LICENSES/COPYING.Apache b/LICENSES/COPYING.Apache
index 6c46acaee00..99c05612a39 100644
--- a/LICENSES/COPYING.Apache
+++ b/LICENSES/COPYING.Apache
@@ -1,5 +1,5 @@
-NOTE: This license file only applies to the fillowing files distributed
+NOTE: This license file only applies to the following files distributed
along with our theme files:
* MaterialSymbolsSharp.ttf
diff --git a/LICENSES/COPYING.BSL b/LICENSES/COPYING.BSL
index ae3da63563c..da60a540b1d 100644
--- a/LICENSES/COPYING.BSL
+++ b/LICENSES/COPYING.BSL
@@ -1,3 +1,9 @@
+NOTE: This license file only applies to the following source files
+in ScummVM:
+
+ * engines/twp/clipper/clipper.cpp
+ * engines/twp/clipper/clipper.h
+
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
diff --git a/LICENSES/COPYING.GLAD b/LICENSES/COPYING.GLAD
index ac5d8041b60..292ad6934d4 100644
--- a/LICENSES/COPYING.GLAD
+++ b/LICENSES/COPYING.GLAD
@@ -1,3 +1,9 @@
+NOTE: This license file only applies to the following source files
+in ScummVM:
+
+ * graphics/opengl/glad.h
+
+
The glad source code:
The MIT License (MIT)
diff --git a/LICENSES/COPYING.ISC b/LICENSES/COPYING.ISC
index c58dc6407b4..c9e0ca087ef 100644
--- a/LICENSES/COPYING.ISC
+++ b/LICENSES/COPYING.ISC
@@ -1,4 +1,4 @@
-All .patchr files in ScummVM are under the ISC license:
+NOTE: All .patchr files in ScummVM are under the ISC license:
ScummVM - Graphic Adventure Engine
diff --git a/LICENSES/COPYING.MKV b/LICENSES/COPYING.MKV
index 7a6f99547d4..b8af8c02eed 100644
--- a/LICENSES/COPYING.MKV
+++ b/LICENSES/COPYING.MKV
@@ -1,3 +1,8 @@
+NOTE: This license file only applies to the following files and
+directories in ScummVM:
+
+ * video/mkv/*
+
Copyright (c) 2010, Google Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -27,4 +32,3 @@ 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.
-
diff --git a/LICENSES/COPYING.MPL b/LICENSES/COPYING.MPL
index c59e6d423f4..da748f059de 100644
--- a/LICENSES/COPYING.MPL
+++ b/LICENSES/COPYING.MPL
@@ -1,4 +1,4 @@
-NOTE: This license file only applies to the fillowing files and
+NOTE: This license file only applies to the following files and
directories:
* engines/director/lingo/lingodec/
More information about the Scummvm-git-logs
mailing list