From cff88cedf5d56b30eeff219c9a58bd4982920f9b Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Sat, 23 Apr 2022 11:09:57 +0200 Subject: [PATCH] Relicense the leftover GPL-2.0-only files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The relicensing can be done because the Atmosphère-NX upstream has the following license addition: """ The yuzu Nintendo Switch emulator and the Ryujinx Team and Contributors are exempt from GPLv2 licensing. They are permitted, each at their individual discretion, to instead license any source code authored for the Atmosphère project as either GPLv2 or later or the MIT license. In doing so, they may alter, supplement, or entirely remove the copyright notice for each file they choose to relicense. Neither the Atmosphère project nor its individual contributors shall assert their moral rights against any of the aforementioned projects. """ Link: https://github.com/Atmosphere-NX/Atmosphere/blob/0bb2c0a04f0eca4/README.md Fixes: #8242 --- src/common/bit_set.h | 18 +++-------------- src/core/file_sys/fsmitm_romfsbuild.cpp | 27 +++++-------------------- src/core/file_sys/fsmitm_romfsbuild.h | 27 +++++-------------------- src/core/memory/dmnt_cheat_types.h | 27 +++++-------------------- src/core/memory/dmnt_cheat_vm.cpp | 27 +++++-------------------- src/core/memory/dmnt_cheat_vm.h | 27 +++++-------------------- 6 files changed, 28 insertions(+), 125 deletions(-) diff --git a/src/common/bit_set.h b/src/common/bit_set.h index 9235ad4128..c9bf3cc950 100644 --- a/src/common/bit_set.h +++ b/src/common/bit_set.h @@ -1,18 +1,6 @@ -/* - * Copyright (c) 2018-2020 Atmosphère-NX - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright (c) 2018-2020 Atmosphère-NX +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included #pragma once diff --git a/src/core/file_sys/fsmitm_romfsbuild.cpp b/src/core/file_sys/fsmitm_romfsbuild.cpp index 1ca1d536f7..9fd871facb 100644 --- a/src/core/file_sys/fsmitm_romfsbuild.cpp +++ b/src/core/file_sys/fsmitm_romfsbuild.cpp @@ -1,26 +1,9 @@ -/* - * Copyright (c) 2018 Atmosphère-NX - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright (c) 2018 Atmosphère-NX +// Modifications Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. -/* - * Adapted by DarkLordZach for use/interaction with yuzu - * - * Modifications Copyright 2018 yuzu emulator team - * Licensed under GPLv2 or any later version - * Refer to the license.txt file included. - */ +// Adapted by DarkLordZach for use/interaction with yuzu #include #include diff --git a/src/core/file_sys/fsmitm_romfsbuild.h b/src/core/file_sys/fsmitm_romfsbuild.h index 8d4d89fab9..cda78cc809 100644 --- a/src/core/file_sys/fsmitm_romfsbuild.h +++ b/src/core/file_sys/fsmitm_romfsbuild.h @@ -1,26 +1,9 @@ -/* - * Copyright (c) 2018 Atmosphère-NX - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright (c) 2018 Atmosphère-NX +// Modifications Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. -/* - * Adapted by DarkLordZach for use/interaction with yuzu - * - * Modifications Copyright 2018 yuzu emulator team - * Licensed under GPLv2 or any later version - * Refer to the license.txt file included. - */ +// Adapted by DarkLordZach for use/interaction with yuzu #pragma once diff --git a/src/core/memory/dmnt_cheat_types.h b/src/core/memory/dmnt_cheat_types.h index 5e60733dc7..e3e46ae586 100644 --- a/src/core/memory/dmnt_cheat_types.h +++ b/src/core/memory/dmnt_cheat_types.h @@ -1,26 +1,9 @@ -/* - * Copyright (c) 2018-2019 Atmosphère-NX - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright (c) 2018-2019 Atmosphère-NX +// Modifications Copyright 2019 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. -/* - * Adapted by DarkLordZach for use/interaction with yuzu - * - * Modifications Copyright 2019 yuzu emulator team - * Licensed under GPLv2 or any later version - * Refer to the license.txt file included. - */ +// Adapted by DarkLordZach for use/interaction with yuzu #pragma once diff --git a/src/core/memory/dmnt_cheat_vm.cpp b/src/core/memory/dmnt_cheat_vm.cpp index dc04e37d2c..5299f173d2 100644 --- a/src/core/memory/dmnt_cheat_vm.cpp +++ b/src/core/memory/dmnt_cheat_vm.cpp @@ -1,26 +1,9 @@ -/* - * Copyright (c) 2018-2019 Atmosphère-NX - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright (c) 2018-2019 Atmosphère-NX +// Modifications Copyright 2019 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. -/* - * Adapted by DarkLordZach for use/interaction with yuzu - * - * Modifications Copyright 2019 yuzu emulator team - * Licensed under GPLv2 or any later version - * Refer to the license.txt file included. - */ +// Adapted by DarkLordZach for use/interaction with yuzu #include "common/assert.h" #include "common/scope_exit.h" diff --git a/src/core/memory/dmnt_cheat_vm.h b/src/core/memory/dmnt_cheat_vm.h index 707bee82bc..18a6d9e8ab 100644 --- a/src/core/memory/dmnt_cheat_vm.h +++ b/src/core/memory/dmnt_cheat_vm.h @@ -1,26 +1,9 @@ -/* - * Copyright (c) 2018-2019 Atmosphère-NX - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright (c) 2018-2019 Atmosphère-NX +// Modifications Copyright 2019 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. -/* - * Adapted by DarkLordZach for use/interaction with yuzu - * - * Modifications Copyright 2019 yuzu emulator team - * Licensed under GPLv2 or any later version - * Refer to the license.txt file included. - */ +// Adapted by DarkLordZach for use/interaction with yuzu #pragma once