From e7e6aa3d64d87730b9330d23297ffdeb45785ddc Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 21 Apr 2017 12:18:55 +0200 Subject: [PATCH] demux_mkv: change license to LGPL Most contributors have agreed. This claims it's based on gstreamer code, but this was LGPL at the time (and still is). Contributors whose code was removed were not accounted for. There are still some potentially problematic cases: 06eee1b67 is potentially the most problematic case. Most of these changes are gone due to mpv not using BITMAPINFOHEADER anymore. Some of the other changes are rather trivial. If someone contests this and claims that copyrightable changes are left, the original change can simply be reverted. 62bfae140 has only 2 lines left: a "char *name;" struct field, and a line that prints a message. All other code was removed. The parsing code in particular was made declarative, which replaced reading this element explicitly (and other elements, see 1b22101c77e). I'm putting the log message under HAVE_GPL, but I don't think the declaration is copyrightable, or the mere concept of reading this element. Redoing the other 2 lines of code would result in the same program text. d41e860ba was applied by someone who (potentially) disagreed. The patch itself is from someone who did agree, though. It's unknown whether the applier changed the patch. But it seems unlikely, and the change was mostly rewritten. 50a86fcc3 all demux_mkv changes were reverted (old stdout slave mode) 3a406e94d same 2e40bfa13 the old MPlayer subtitle code was completely removed 316bb1d44 completely removed in 1cf4802c1d 87f93d9d7 same 11bfc6780 relative seeks were removed in 92ba630796 be54f4813 the corresponding demux_mkv code was removed in 5dabaaf093 efd53eed6 all internal vobsub handling is now in FFmpeg d7f693a20 removed in f3db4b0b937 e8a1b3713 removed in 522ee6b7831 cfb890259 removed, see 6b1374b203 for analysis c80808b5a same --- demux/demux_mkv.c | 16 +++++++++------- waftools/generators/headers.py | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index d564999fc6..abea342ed2 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -6,18 +6,18 @@ * * This file is part of mpv. * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * mpv is distributed in the hope that 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. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . */ #include @@ -647,7 +647,9 @@ static void parse_trackentry(struct demuxer *demuxer, if (entry->name) { track->name = talloc_strdup(track, entry->name); +#if HAVE_GPL MP_VERBOSE(demuxer, "| + Name: %s\n", track->name); +#endif } track->type = entry->track_type; diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py index 84f914c2c1..c7f5b48b84 100644 --- a/waftools/generators/headers.py +++ b/waftools/generators/headers.py @@ -29,6 +29,7 @@ def __add_mpv_defines__(ctx): ctx.define("CONFIGURATION", " ".join(argv)) ctx.define("MPV_CONFDIR", ctx.env.CONFLOADDIR) ctx.define("FULLCONFIG", __escape_c_string(__get_features_string__(ctx))) + ctx.define("HAVE_GPL", 1) def configure(ctx): __add_mpv_defines__(ctx)