Skip to content

Commit cb4d24d

Browse files
AntonioNDAntonioND
committed
Relicense rgbasm, rgblink and rgbfix under MIT
With permission from the main authors, all code licensed under the terms of conflicting and unclear licenses have been relicensed under the MIT license: #128 SPDX license identifiers are used so that the license headers in source code files aren't too large. Add CONTRIBUTORS.rst file. Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
1 parent ee99cfc commit cb4d24d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+454
-277
lines changed

‎CONTRIBUTORS.rst

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Contributors to RGBDS
2+
=====================
3+
4+
Original author
5+
---------------
6+
7+
- Carsten Elton Sørensen (csoren@gmail.com)
8+
9+
Main contributors
10+
-----------------
11+
12+
- Justin Lloyd (jlloyd@imf.la)
13+
14+
- Vegard Nossum (vegard.nossum@gmail.com)
15+
16+
- Anthony J. Bentley (anthony@anjbe.name)
17+
18+
- Antonio Niño Díaz (antonio_nd@outlook.com)
19+
20+
Other contributors
21+
------------------
22+
23+
- Ben10do
24+
25+
- Björn Höhrmann (bjoern@hoehrmann.de)
26+
27+
- Christophe Staïesse (chastai@skynet.be)
28+
29+
- The Musl C library (http://www.musl-libc.org)
30+
31+
- The OpenBSD Project (http://www.openbsd.org)
32+
33+
- Sanqui (gsanky@gmail.com)
34+
35+
- stag019 (stag019@gmail.com)
36+
37+
- YamaArashi (shadow962@live.com)
38+
39+
- yenatch (yenatch@gmail.com)

‎LICENSE.rst

+19-65
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,32 @@
11
LICENSE
22
=======
33

4-
Original code
5-
-------------
4+
Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
65

7-
Copyright (C) 1997 Carsten Sorensen <surfsmurf@matilde.demon.co.uk>
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to
8+
deal in the Software without restriction, including without limitation the
9+
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
10+
sell copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
812

9-
The ASMotor package (xAsm, xLink, RGBFix, examples and documentation) is
10-
freeware and distributed as is. The author retains his copyright and right to
11-
modify the specifications and operation of the software without notice.
13+
The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
1215

13-
In other words this means I encourage you to...
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
22+
IN THE SOFTWARE.
1423

15-
- use it for whatever purpose even professional work without me charging you a
16-
penny
17-
- copy it to another person (wholly or in part, though I'm sure he'd appreciate
18-
the whole package) in whatever form you find suitable
19-
- mass-distribute the ASMotor package if it is complete (xAsm, xLink, RGBFix and
20-
documentation).
21-
- contact me if you have any problems
22-
23-
This also means you can't...
24-
25-
- blame me for loss of profit, data, sleep, food or other nasty things through
26-
the use or distribution of ASMotor. If you choose to use ASMotor you do so at
27-
your own risk.
28-
- expect me to be able to help you should you have a problem related or not to
29-
ASMotor.
30-
31-
Otaku no Zoku's modifications
32-
-----------------------------
33-
34-
Copyright (C) 1999 Justin Lloyd <jlloyd@imf.la> (?)
35-
36-
::
37-
38-
DO WHATEVER PUBLIC LICENSE*
39-
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
40-
41-
0. You can do whatever you want to with the work.
42-
1. You cannot stop anybody from doing whatever they want to with the work.
43-
2. You cannot revoke anybody elses DO WHATEVER PUBLIC LICENSE in the work.
44-
45-
This program is free software. It comes without any warranty, to
46-
the extent permitted by applicable law. You can redistribute it
47-
and/or modify it under the terms of the DO WHATEVER PUBLIC LICENSE
48-
49-
Software originally created by Justin Lloyd @ http://otakunozoku.com/
50-
51-
rgbds-linux
52-
-----------
53-
54-
Copyright (C) 2009 Vegard Nossum <vegard.nossum@gmail.com>
55-
56-
Current
57-
-------
58-
59-
rgbasm and rgblink are derived from Justin Lloyd's RGBDS.
60-
61-
rgbfix was rewritten from scratch by Anthony J. Bentley, and is released under
62-
the ISC license; see the source file for the text of the license.
24+
Other
25+
-----
6326

6427
rgbgfx was written by stag019, and is released under the ISC license.
6528

66-
Some files of rgblink were written by Antonio Niño Díaz, and they are relased
67-
under the ISC license. The affected files have the appropriate license in the
68-
header of the file.
69-
70-
The UTF-8 decoder in src/asm/charmap.c was written by Björn Höhrmann and is
71-
released under the MIT license. The remainder of charmap.c was written by
72-
stag019, and is released under the ISC license.
73-
74-
extern/err.c is derived from the Musl C library, http://www.musl-libc.org, and
75-
is released under the MIT license.
29+
charmap.c was written by stag019, and is released under the ISC license.
7630

7731
extern/reallocarray.c is derived from the OpenBSD Project,
7832
http://www.openbsd.org, and is released under the ISC license.

‎Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
#
2+
# This file is part of RGBDS.
3+
#
4+
# Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
19
# User-defined variables
210

311
Q := @

‎README.rst

+2
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,5 @@ This is the complete list of user-defined variables:
170170
implementation of rgbds.
171171

172172
- 2017, Bentley's repository is moved to a neutral name.
173+
174+
- 2018, codebase relicensed under the MIT license.

‎docs/rgbds.7.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,13 @@ <h1 class="Sh" title="Sh" id="HISTORY"><a class="selflink" href="#HISTORY">HISTO
5252
<dt class="It-ohang"></dt>
5353
<dd class="It-ohang">2017, Bentley's repository is moved to a neutral name. It
5454
is now maintained by a number of contributors at
55-
<a class="Lk" title="Lk" href="https://github.com/rednex/rgbds">https://github.com/rednex/rgbds</a>.</dd>
55+
<a class="Lk" title="Lk" href="https://github.com/rednex/rgbds">https://github.com/rednex/rgbds</a>.
56+
2018, codebase relicensed under the MIT license.</dd>
5657
</dl>
5758
</div>
5859
<table class="foot">
5960
<tr>
60-
<td class="foot-date">April 17, 2017</td>
61+
<td class="foot-date">January 25, 2018</td>
6162
<td class="foot-os">RGBDS Manual</td>
6263
</tr>
6364
</table>

‎include/asm/asm.h

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
/*
2-
* asm.h
2+
* This file is part of RGBDS.
33
*
4-
* Contains some assembler-wide defines and externs
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
55
*
6-
* Copyright 1997 Carsten Sorensen
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
9+
/*
10+
* Contains some assembler-wide defines and externs
711
*/
812

913
#ifndef RGBDS_ASM_ASM_H

‎include/asm/charmap.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_ASM_CHARMAP_H
210
#define RGBDS_ASM_CHARMAP_H
311

‎include/asm/fstack.h

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
/* fstack.h
1+
/*
2+
* This file is part of RGBDS.
23
*
3-
* Contains some assembler-wide defines and externs
4-
*
5-
* Copyright 1997 Carsten Sorensen
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
65
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
9+
/*
10+
* Contains some assembler-wide defines and externs
711
*/
812

913
#ifndef RGBDS_ASM_FSTACK_H

‎include/asm/lexer.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_ASM_LEXER_H
210
#define RGBDS_ASM_LEXER_H
311

‎include/asm/localasm.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_ASM_LOCALASM_H
210
#define RGBDS_ASM_LOCALASM_H
311

‎include/asm/main.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_MAIN_H
210
#define RGBDS_MAIN_H
311

‎include/asm/mymath.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_ASM_MATH_H
210
#define RGBDS_ASM_MATH_H
311

‎include/asm/output.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_ASM_OUTPUT_H
210
#define RGBDS_ASM_OUTPUT_H
311

‎include/asm/rpn.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_ASM_RPN_H
210
#define RGBDS_ASM_RPN_H
311

‎include/asm/symbol.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_SYMBOL_H
210
#define RGBDS_SYMBOL_H
311

‎include/common.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_COMMON_H
210
#define RGBDS_COMMON_H
311

‎include/extern/err.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef EXTERN_ERR_H
210
#define EXTERN_ERR_H
311

‎include/extern/version.h

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
/*
2-
* Copyright (C) 2017 Antonio Nino Diaz <antonio_nd@outlook.com>
2+
* This file is part of RGBDS.
33
*
4-
* Permission to use, copy, modify, and distribute this software for any
5-
* purpose with or without fee is hereby granted, provided that the above
6-
* copyright notice and this permission notice appear in all copies.
4+
* Copyright (c) 2017-2018 Antonio Nino Diaz <antonio_nd@outlook.com>
75
*
8-
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9-
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10-
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11-
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12-
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13-
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14-
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
6+
* SPDX-License-Identifier: MIT
157
*/
168

179
#ifndef EXTERN_VERSION_H

‎include/link/assign.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_LINK_ASSIGN_H
210
#define RGBDS_LINK_ASSIGN_H
311

‎include/link/library.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_LINK_LIBRARY_H
210
#define RGBDS_LINK_LIBRARY_H
311

‎include/link/main.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_LINK_MAIN_H
210
#define RGBDS_LINK_MAIN_H
311

‎include/link/mapfile.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* This file is part of RGBDS.
3+
*
4+
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
5+
*
6+
* SPDX-License-Identifier: MIT
7+
*/
8+
19
#ifndef RGBDS_LINK_MAPFILE_H
210
#define RGBDS_LINK_MAPFILE_H
311

0 commit comments

Comments
 (0)