Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Licensing fixes #48

Merged
merged 3 commits into from Mar 10, 2019

Conversation

Projects
None yet
5 participants
@illwieckz
Copy link
Member

illwieckz commented Oct 26, 2017

See Unvanquished/Unvanquished#1030 for a similar PR on Unvanquished side.

This PR is created to submit licensing fixes and rewording to Daemon source code.

The first commit is about brand new files by @gimhael introduced in commit 0bb3550 that has Tr3b GPL header just because the skeleton was copypasted (header and main block) but everything is original work.

See that talk:

2017-09-06 09:37:16 +0200 <illwieckz>	I have a question though, why the depthtile*glsl / lighttile*glsl files have Tr3b/XreaL/GPL copyright header if they are brand new? Can't we put another copyright and license on them?
2017-09-06 09:37:38 +0200 <illwieckz>	they were introduced in 0bb3550ce16ab7b165a88ebb365edf6b2837d1f5 (Daemon tree)
2017-09-06 09:40:27 +0200 <illwieckz>	https://github.com/DaemonEngine/Daemon/commit/0bb3550ce16ab7b165a88ebb365edf6b2837d1f5
2017-09-06 09:40:57 +0200 <illwieckz>	gimhael_, what are your thoughts about this? ↑
2017-09-06 09:42:33 +0200 <gimhael_>	iirc i copied some other simple shader files and modified them, that's why the original copyright is there
2017-09-06 09:44:14 +0200 <illwieckz>	okie
2017-09-06 09:45:17 +0200 <illwieckz>	but was there any trace of the previous file (except header) when comitted for the first time?
2017-09-06 09:46:21 +0200 <illwieckz>	if the file was entirely rewritten, you can put the copyright you want
2017-09-06 09:47:18 +0200 <gimhael_>	i think just the structural parts, like "void main() {", the shader logic was all new
2017-09-06 09:50:04 +0200 <illwieckz>	so the only original thing is the header itself…
2017-09-06 09:52:15 +0200 <gimhael_>	yes, i think we could replace it
2017-09-06 09:53:52 +0200 <illwieckz>	I've seen brand new file using BSD © Daemon Developpers like this: https://github.com/DaemonEngine/Daemon/blob/master/src/engine/framework/Application.cpp

So @gimhael obviously have the right to not attribute copyright to Tr3b on these files, and is able to chose the license he wants and the copyright attribution he wants. By the way, since this PR changed the license to BSD 3 clause and copyright attribution to Daemon Developers, we need an explicit acknowledgement by gimhael to merge this. So gimhael if you prefer another license or copyright attribution it's very ok, tell it in comments, but whatever you prefer it's probably better for you to not attribute copyright to someone not involved. 😉

So:

gimhael do you give your permission to relicense to BSD 3 Clause and attribute to Daemon Developers the files I discover to be brand new original work from you? Or can you define your licensing and attribution preference?

This PR (or subsequent ones) is likely to received header rewording to unify them and make grepping easier (as Unvanquished/Unvanquished#1030 does).

On a similar topic of gimhael's shaders, it looks like some brand new original code by @cmf028 is copypasting the GPL header with Zenimax clause. I will investigate it more, but if it appears these files are brand new original work by Fuma, with his permission we can set another license (like BSD 3 Clause), another attribution (Daemon Developers) or whatever he prefers, and remove the Zenimax clause on them if they were not involved at all in that work. I'll dig into it more further.

Note that as stated in COPYING.txt file, the default license for Daemon is the BSD 3 Clause, and files under GPL are referenced as exception, that why I suggest BSD 3 Clause by default unless otherwise stated when a relicense is possible.

@illwieckz illwieckz referenced this pull request Oct 26, 2017

Merged

Licensing fixes #1030

@illwieckz illwieckz requested a review from gimhael Oct 26, 2017

@gimhael

This comment has been minimized.

Copy link
Contributor

gimhael commented Oct 28, 2017

Yes, I agree to the proposed license change. Please go ahead and merge the changes.

@illwieckz illwieckz force-pushed the illwieckz:licensing branch from 52e27e8 to 2f39a47 Dec 30, 2017

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Dec 30, 2017

@Kangz have a look at the commit named “BSD fxaa shader licensing (files by @Kangz)”, is that true theses files are brand new from you ? If yes do you agree to switch the license to BSD 3 Clause ?

We also need permission by @cmf028 to relicense @gimhael's and @Kangz's shaders because of contributions.

Note: please do NOT merge this PR until every contributor to these files (i.e. legal owners) said they are OK with a relicensing.

@Kangz

This comment has been minimized.

Copy link
Contributor

Kangz commented Jan 2, 2018

LGTM for the fxaa shaders on my side.

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Apr 8, 2018

@cmf028 any comment?

Note that I would ask you the same for these files:

It looks like these bot-related files are brand new from you, if you're OK and if contributors are OK we would be able to remove the useless Zenimax Clause and also put a BSD license on them.

@illwieckz illwieckz force-pushed the illwieckz:licensing branch from 2f39a47 to bb9db31 Jul 7, 2018

@illwieckz illwieckz changed the base branch from master to for-0.51.0 Jul 7, 2018

@illwieckz illwieckz force-pushed the illwieckz:licensing branch from bb9db31 to c1b51f3 Jul 7, 2018

@slipher slipher closed this Oct 21, 2018

@slipher slipher changed the base branch from for-0.51.0 to master Oct 21, 2018

@slipher slipher reopened this Oct 21, 2018

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Nov 8, 2018

@DolceTriade this file looks to be brand new file from you:

Do you confirm?

@cmf028

This comment has been minimized.

Copy link
Contributor

cmf028 commented Mar 9, 2019

@cmf028 any comment?

Note that I would ask you the same for these files:

* [src/engine/botlib/bot_api.h](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_api.h)

* [src/engine/botlib/bot_convert.cpp](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_convert.cpp)

* [src/engine/botlib/bot_convert.h](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_convert.h)

* [src/engine/botlib/bot_debug.cpp](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_debug.cpp)

* [src/engine/botlib/bot_debug.h](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_debug.h)

* [src/engine/botlib/bot_load.cpp](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_load.cpp)

* [src/engine/botlib/bot_local.cpp](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_local.cpp)

* [src/engine/botlib/bot_local.h](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_local.h)

* [src/engine/botlib/bot_nav.h](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_nav.h)

* [src/engine/botlib/bot_navdraw.h](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_navdraw.h)

* [src/engine/botlib/bot_nav_edit.cpp](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_nav_edit.cpp)

* [src/engine/botlib/bot_types.cpp](https://github.com/DaemonEngine/Daemon/blob/master/src/engine/botlib/bot_types.cpp)

It looks like these bot-related files are brand new from you, if you're OK and if contributors are OK we would be able to remove the useless Zenimax Clause and also put a BSD license on them.

I wrote all of these myself. The Zenimax clause was an artifact from copying the license from other source files. I'm fine with putting a BSD license on them and removing the Zenimax clause.

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Mar 9, 2019

great 👍

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Mar 10, 2019

After a deep review of all botlib commits that are not commits by Fuma neither merge commits, I confirm they all are trivial doing trivial things like Replace NULL and 0-pointer with nullptr. or Replace MIN and MAX with std::min and std::max where possible..

There was one commit that was doing things more than that but this commit is now reverted since being buggy in any way.

So we can relicense botlib files.

List of trivial commits compatible with a relicense of botlib stuff:

Author: dimhotepus
Date:   Mon Mar 7 16:45:22 2016 +0300

    Apply GNU compilers specific pragmas under GNU
Author: TimePath
Date:   Fri Apr 3 17:04:54 2015 +1100

    Suppress many instances of writable-strings
Author: Tim
Date:   Thu Nov 15 00:54:43 2018 +0100

    Use `default` for trivial default constructors.
Author: Darren Salt
Date:   Wed Dec 4 17:52:54 2013 +0000

    Replace MIN and MAX with std::min and std::max where possible.
Author: Corentin Wallez
Date:   Mon Apr 13 02:53:47 2015 +0200

    Put vector in the Math namespace, add VecX to the prelude
Author: Tim
Date:   Wed Nov 14 02:51:24 2018 +0100

    Replace NULL and 0-pointer with nullptr.
Author: TimePath
Date:   Sat Jan 16 23:02:23 2016 +1100

    s/#define/static const/
Author: Darren Salt
Date:   Tue Feb 5 03:59:22 2013 +0000

    Nav mesh debug draw compile fixes.
Author: slipher
Date:   Thu Dec 27 16:41:16 2018 -0600

    Fix some spelling errors in comments
Author: slipher
Date:   Fri Jul 13 06:42:02 2018 -0700

    Replace Format("%s, s) with Format(s) in all Str::Format-based APIs.
Author: TimePath
Date:   Sat Jan 16 16:21:26 2016 +1100

    Classier enums
Author: Mattia Basaglia
Date:   Thu Aug 6 14:00:45 2015 +0200

    Remove color macros
Author: TimePath
Date:   Thu Jan 21 10:51:56 2016 +1100

    Remove redundant log constant prefixes
Author: TimePath
Date:   Thu Jan 21 16:18:16 2016 +1100

    Logging part 3
Author: TimePath
Date:   Thu Jan 21 13:21:15 2016 +1100

    Logging part 1
Author: Corentin Wallez
Date:   Wed Jan 29 00:32:18 2014 +0100

    Remove all the CVAR_ARCHIVE flags
Author: Corentin Wallez
Date:   Mon Feb 24 21:58:30 2014 +0100

    Translate bot syscalls
Author: TimePath
Date:   Wed Apr 15 12:34:00 2015 +1000

    Replace NULL with nullptr in code
Author: Darren Salt
Date:   Wed Jan 30 13:55:11 2013 +0000

    POLYFLAGS_SWIM was missing.
Author: Amanieu d'Antras
Date:   Sun Jul 6 18:46:41 2014 +0200

    Various cleanups
Author: Darren Salt
Date:   Sun Jun 30 01:23:47 2013 +0100

    Make navmesh connection editing a little easier.
Author: TimePath
Date:   Wed Apr 15 14:32:36 2015 +1000

    Replace func(void) with func()
Author: Viech
Date:   Wed Jun 4 22:13:06 2014 +0200

    Add a skip mask to all traces, which allows to selectively ignore content types.
Author: slipher
Date:   Thu Dec 27 16:45:31 2018 -0600

    Fix some spelling errors and function names in log messages
Author: slipher
Date:   Wed Dec 26 19:53:07 2018 -0600

    Delete unused variable
Author: Thomas Debesse
Date:   Tue May 15 21:08:39 2018 +0200

    fix minor warning misspell
Author: Viech
Date:   Mon Oct 28 23:29:59 2013 +0100

    Move bg_* files from "game" to "shared".
Author: Corentin Wallez
Date:   Fri Mar 27 03:47:28 2015 +0100

    Add include dirs, make all includes use absolute paths
Author: TimePath
Date:   Wed Apr 15 12:05:24 2015 +1000

    Remove the qboolean enum
Author: Amanieu d'Antras
Date:   Sat Dec 14 23:36:33 2013 +0000

    Consolidate headers:
Author: TimePath
Date:   Fri Jan 15 20:30:46 2016 +1100

    using typedef = using
Author: Mattia Basaglia
Date:   Fri Aug 14 10:38:42 2015 +0200

    Remove Color::NamedString
Author: maek
Date:   Sun Oct 7 11:35:59 2018 +0100

    Other minor fixes
Author: Amanieu d'Antras
Date:   Wed Apr 9 23:39:24 2014 +0100

    Change all #ifdefs to use the new BUILD_* target macros
Author: Darren Salt
Date:   Wed Dec 11 14:09:45 2013 +0000

    Replace min+max pairs with Maths::clamp.
Author: Corentin Wallez
Date:   Fri Aug 7 06:03:29 2015 +0200

    Fix all regular warnings in the engine except in renderer
Author: TimePath
Date:   Wed Jul 15 22:03:42 2015 +1000

    Make PNaCl a first class CMake toolchain; split engine and game build scripts
Author: Tim
Date:   Sat Apr 6 04:27:07 2013 +0200

    include bg_public.h in bot_debug.h, so we can remove it from the rest of the client
Author: Darren Salt
Date:   Sun Jun 30 01:23:29 2013 +0100

    Fix a linkage warning.

There is no commits incompatible with a relicense of botlib stuff.

@illwieckz illwieckz force-pushed the illwieckz:licensing branch from c1b51f3 to 66636b7 Mar 10, 2019

@cmf028

This comment has been minimized.

Copy link
Contributor

cmf028 commented Mar 10, 2019

@Kangz have a look at the commit named “BSD fxaa shader licensing (files by @Kangz)”, is that true theses files are brand new from you ? If yes do you agree to switch the license to BSD 3 Clause ?

We also need permission by @cmf028 to relicense @gimhael's and @Kangz's shaders because of contributions.

Note: please do NOT merge this PR until every contributor to these files (i.e. legal owners) said they are OK with a relicensing.

Relicensing is fine with me as well.

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Mar 10, 2019

great 👍

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Mar 10, 2019

All the commits in that PR are now mergeable, I'm just waiting for an answer from @DolceTriade about another file to know if if I can add this another file to the PR or not:

@DolceTriade this file looks to be brand new file from you:

Do you confirm?

illwieckz added some commits Oct 26, 2017

BSD tile shader licensing (files by @gimhael)
- These files are brand new files by @gimhael
- the Tr3b GPL header was just there because he copypasted
  the skeleton but everything is original.
BSD fxaa shader licensing (files by @Kangz)
- These files are brand new files by @Kangz

@illwieckz illwieckz force-pushed the illwieckz:licensing branch from 66636b7 to 714566b Mar 10, 2019

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Mar 10, 2019

I'm merging this, if we can relicense the other file there will still be time to make another commit

@illwieckz illwieckz merged commit 714566b into DaemonEngine:master Mar 10, 2019

0 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.