Skip to content

Commit

Permalink
Relicense rgbasm, rgblink and rgbfix under MIT
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
AntonioND committed Jan 26, 2018
1 parent a02bc95 commit 50a3175
Show file tree
Hide file tree
Showing 66 changed files with 486 additions and 277 deletions.
39 changes: 39 additions & 0 deletions CONTRIBUTORS.rst
@@ -0,0 +1,39 @@
Contributors to RGBDS
=====================

Original author
---------------

- Carsten Elton Sørensen <csoren@gmail.com>

Main contributors
-----------------

- Justin Lloyd <jlloyd@imf.la>

- Vegard Nossum <vegard.nossum@gmail.com>

- Anthony J. Bentley <anthony@anjbe.name>

- Antonio Niño Díaz <antonio_nd@outlook.com>

Other contributors
------------------

- Ben10do

- Björn Höhrmann <bjoern@hoehrmann.de>

- Christophe Staïesse <chastai@skynet.be>

- The Musl C library <http://www.musl-libc.org>

- The OpenBSD Project <http://www.openbsd.org>

- Sanqui <gsanky@gmail.com>

- stag019 <stag019@gmail.com>

- YamaArashi <shadow962@live.com>

- yenatch <yenatch@gmail.com>
84 changes: 19 additions & 65 deletions LICENSE.rst
@@ -1,78 +1,32 @@
LICENSE
=======

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

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

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

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

- use it for whatever purpose even professional work without me charging you a
penny
- copy it to another person (wholly or in part, though I'm sure he'd appreciate
the whole package) in whatever form you find suitable
- mass-distribute the ASMotor package if it is complete (xAsm, xLink, RGBFix and
documentation).
- contact me if you have any problems

This also means you can't...

- blame me for loss of profit, data, sleep, food or other nasty things through
the use or distribution of ASMotor. If you choose to use ASMotor you do so at
your own risk.
- expect me to be able to help you should you have a problem related or not to
ASMotor.

Otaku no Zoku's modifications
-----------------------------

Copyright (C) 1999 Justin Lloyd <jlloyd@imf.la> (?)

::

DO WHATEVER PUBLIC LICENSE*
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. You can do whatever you want to with the work.
1. You cannot stop anybody from doing whatever they want to with the work.
2. You cannot revoke anybody elses DO WHATEVER PUBLIC LICENSE in the work.

This program is free software. It comes without any warranty, to
the extent permitted by applicable law. You can redistribute it
and/or modify it under the terms of the DO WHATEVER PUBLIC LICENSE

Software originally created by Justin Lloyd @ http://otakunozoku.com/

rgbds-linux
-----------

Copyright (C) 2009 Vegard Nossum <vegard.nossum@gmail.com>

Current
-------

rgbasm and rgblink are derived from Justin Lloyd's RGBDS.

rgbfix was rewritten from scratch by Anthony J. Bentley, and is released under
the ISC license; see the source file for the text of the license.
Other
-----

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

Some files of rgblink were written by Antonio Niño Díaz, and they are relased
under the ISC license. The affected files have the appropriate license in the
header of the file.

The UTF-8 decoder in src/asm/charmap.c was written by Björn Höhrmann and is
released under the MIT license. The remainder of charmap.c was written by
stag019, and is released under the ISC license.

extern/err.c is derived from the Musl C library, http://www.musl-libc.org, and
is released under the MIT license.
charmap.c was written by stag019, and is released under the ISC license.

extern/reallocarray.c is derived from the OpenBSD Project,
http://www.openbsd.org, and is released under the ISC license.
Expand Down
8 changes: 8 additions & 0 deletions Makefile
@@ -1,3 +1,11 @@
#
# This file is part of RGBDS.
#
# Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
#
# SPDX-License-Identifier: MIT
#

# User-defined variables

Q := @
Expand Down
2 changes: 2 additions & 0 deletions README.rst
Expand Up @@ -170,3 +170,5 @@ This is the complete list of user-defined variables:
implementation of rgbds.

- 2017, Bentley's repository is moved to a neutral name.

- 2018, codebase relicensed under the MIT license.
5 changes: 3 additions & 2 deletions docs/rgbds.7.html
Expand Up @@ -52,12 +52,13 @@ <h1 class="Sh" title="Sh" id="HISTORY"><a class="selflink" href="#HISTORY">HISTO
<dt class="It-ohang"></dt>
<dd class="It-ohang">2017, Bentley's repository is moved to a neutral name. It
is now maintained by a number of contributors at
<a class="Lk" title="Lk" href="https://github.com/rednex/rgbds">https://github.com/rednex/rgbds</a>.</dd>
<a class="Lk" title="Lk" href="https://github.com/rednex/rgbds">https://github.com/rednex/rgbds</a>.
2018, codebase relicensed under the MIT license.</dd>
</dl>
</div>
<table class="foot">
<tr>
<td class="foot-date">April 17, 2017</td>
<td class="foot-date">January 25, 2018</td>
<td class="foot-os">RGBDS Manual</td>
</tr>
</table>
Expand Down
10 changes: 7 additions & 3 deletions include/asm/asm.h
@@ -1,9 +1,13 @@
/*
* asm.h
* This file is part of RGBDS.
*
* Contains some assembler-wide defines and externs
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* Copyright 1997 Carsten Sorensen
* SPDX-License-Identifier: MIT
*/

/*
* Contains some assembler-wide defines and externs
*/

#ifndef RGBDS_ASM_ASM_H
Expand Down
8 changes: 8 additions & 0 deletions include/asm/charmap.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef RGBDS_ASM_CHARMAP_H
#define RGBDS_ASM_CHARMAP_H

Expand Down
12 changes: 8 additions & 4 deletions include/asm/fstack.h
@@ -1,9 +1,13 @@
/* fstack.h
/*
* This file is part of RGBDS.
*
* Contains some assembler-wide defines and externs
*
* Copyright 1997 Carsten Sorensen
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

/*
* Contains some assembler-wide defines and externs
*/

#ifndef RGBDS_ASM_FSTACK_H
Expand Down
8 changes: 8 additions & 0 deletions include/asm/lexer.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef RGBDS_ASM_LEXER_H
#define RGBDS_ASM_LEXER_H

Expand Down
8 changes: 8 additions & 0 deletions include/asm/localasm.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef RGBDS_ASM_LOCALASM_H
#define RGBDS_ASM_LOCALASM_H

Expand Down
8 changes: 8 additions & 0 deletions include/asm/main.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef RGBDS_MAIN_H
#define RGBDS_MAIN_H

Expand Down
8 changes: 8 additions & 0 deletions include/asm/mymath.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef RGBDS_ASM_MATH_H
#define RGBDS_ASM_MATH_H

Expand Down
8 changes: 8 additions & 0 deletions include/asm/output.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef RGBDS_ASM_OUTPUT_H
#define RGBDS_ASM_OUTPUT_H

Expand Down
8 changes: 8 additions & 0 deletions include/asm/rpn.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef RGBDS_ASM_RPN_H
#define RGBDS_ASM_RPN_H

Expand Down
8 changes: 8 additions & 0 deletions include/asm/symbol.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef RGBDS_SYMBOL_H
#define RGBDS_SYMBOL_H

Expand Down
8 changes: 8 additions & 0 deletions include/common.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef RGBDS_COMMON_H
#define RGBDS_COMMON_H

Expand Down
8 changes: 8 additions & 0 deletions include/extern/err.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef EXTERN_ERR_H
#define EXTERN_ERR_H

Expand Down
8 changes: 8 additions & 0 deletions include/extern/reallocarray.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 2015-2018, RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef EXTERN_REALLOCARRAY_H
#define EXTERN_REALLOCARRAY_H

Expand Down
8 changes: 8 additions & 0 deletions include/extern/stdnoreturn.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 2014-2018, RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef EXTERN_STDNORETURN_H
#define EXTERN_STDNORETURN_H

Expand Down
8 changes: 8 additions & 0 deletions include/extern/strl.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 2015-2018, RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/

#ifndef EXTERN_STRL_H
#define EXTERN_STRL_H

Expand Down
8 changes: 8 additions & 0 deletions include/extern/utf8decoder.h
@@ -1,3 +1,11 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 2018 Antonio Nino Diaz <antonio_nd@outlook.com>
*
* SPDX-License-Identifier: MIT
*/

#ifndef EXTERN_UTF8DECODER_H
#define EXTERN_UTF8DECODER_H

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

#ifndef EXTERN_VERSION_H
Expand Down

0 comments on commit 50a3175

Please sign in to comment.