summaryrefslogtreecommitdiffstats
path: root/Copyright
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-11-24 14:04:53 +0100
committerwm4 <wm4@nowhere>2017-11-24 14:12:10 +0100
commit386e8cd16d0b9740433ece4bf2744da055d513da (patch)
tree5ec774de41b76182190a5060ff5769fc89d70a9e /Copyright
parentefbb91999796a33c91761d2c206d0f42beb4954c (diff)
downloadmpv-386e8cd16d0b9740433ece4bf2744da055d513da.tar.bz2
mpv-386e8cd16d0b9740433ece4bf2744da055d513da.tar.xz
player: change 3 remaining GPL-only code pieces to LGPL
There has been no new developments or agreements, but I was uncertain about the copyright status of them. Thus this part of code was marked as being potentially GPL, and was not built in LGPL mode. Now I've taken a close look again, and decided that these can be relicensed using the existing relicensing agreements. OSD level 3 was introduced in commit 8d190244, with the author being unreachable. As I decided in commit 6ddd95fd, OSD level 3 itself can be kept, but the "osd" command had to go, and the "rendering" of OSD level 3 (the HAVE_GPL code in osd.c) was uncertain. But the code for this was rewritten: instead of duplicating the time/percent formatting code, it was changed to use common code, and some weird extra logic was removed. The code inside of the "if" is exactly the same as the code that formats the OSD status line (covered by LGPL relicensing). The current commands for adding/removing sub/audio tracks more or less originated from commit 2f376d1b39, with the author being unreachable. But the original code was very different, mostly due to MPlayer's incredibly messy handling of subtitles in general. Nothing of this remains in the current code. Even the command declarations were rewritten. The commands (as seen from the user side) are rather similar in naming and semantics, but we don't consider this copyrightable. So it doesn't look like anything copyrightable is left. The add/cycle commands were more or less based on step_property, introduced in commit 7a71da01d6, with the patch author disagreeing with the LGPL relicensing. But all code original to the patch has been replaced in later mpv changes, and the original code was mostly copied from MP_CMD_SET_PROPERTY anyway. The underlying property interface was completely changed, the error handling was redone, and all of this is very similar to the changes that were done on SET_PROPERTY. The command declarations are completely different in the first place, because the semantic change from step to add/cycle. The commit also seems to have been co-authored by reimar to some degree. He also had the idea to change the original patch from making the command modify a specific property to making it generic. (The error message line, especially with its %g formatting, might contain some level of originality, so change that just to be sure. This commit Copies and adapts the error message for SET_PROPERTY.) Although I'm a bit on the fence with all the above things, it really doesn't look like there's anything substantial that would cause issues. I thus claim that there is no problem with changing the license to LGPL for the above things. It's probably still slightly below the standard that was usually applied in the code relicensing in mpv, but probably still far above to the usual in open source relicensing (and above commercial standards as well, if you look what certain tech giants do).
Diffstat (limited to 'Copyright')
-rw-r--r--Copyright9
1 files changed, 2 insertions, 7 deletions
diff --git a/Copyright b/Copyright
index aea1d98166..08c3d10ae2 100644
--- a/Copyright
+++ b/Copyright
@@ -42,12 +42,10 @@ them quite central:
- many builtin video filters (use libavfilter instead)
- automatic rotation and stereoscopic video handling
- Linux TV input
-- the add/cycle and sub-add/audio-add/sub-remove/audio-remove commands
- video format conversion (if not supported by the VO)
- minor features: jack, DVD, CDDA, SMB, CACA, legacy direct3d VO
-Some of these will be fixed in the future. The lack of the add/cycle commands
-makes this particularly useless for CLI mode, and most of the appeal of LGPL
-is for libmpv anyway. Thus it's not recommended to build mpv CLI in LGPL mode
+Some of these will be fixed in the future. The intended use for LGPL mode is
+with libmpv, and currently it's not recommended to build mpv CLI in LGPL mode
at all.
The following files are still GPL only (--enable-lgpl disables them):
@@ -107,11 +105,8 @@ The following files are still GPL only (--enable-lgpl disables them):
The following files contain some optional GPL code (--enable-lgpl disables it):
- input/cmd_list.c potentially some commands
options/parse_commandline.c dvd:// expansion
player/audio.c libaf glue code
- player/osd.c OSD level 3
- player/command.c add/cycle command, possibly sub-add command
None of the exceptions listed above affect the final binary if it's built as
LGPL. Linked libraries still can affect the final license (for example if