[MPlayer-cvslog] r30182 - in trunk: Makefile configure libvo/matrixview.c libvo/matrixview.h libvo/matrixview_font.h libvo/video_out.c libvo/vo_matrixview.c

[Diego Biurrun]

On Mon, Jan 04, 2010 at 01:52:15PM +0100, Reimar Döffinger wrote:
> On Mon, Jan 04, 2010 at 01:09:11PM +0100, Diego Biurrun wrote:
> > On Mon, Jan 04, 2010 at 01:06:19PM +0100, Reimar Döffinger wrote:
> > > On Mon, Jan 04, 2010 at 12:56:14PM +0100, Reimar Döffinger wrote:
> > > > On Mon, Jan 04, 2010 at 11:28:09AM +0100, Diego Biurrun wrote:
> > > > > > --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> > > > > > +++ trunk/libvo/matrixview.c	Sun Jan  3 15:54:51 2010	(r30182)
> > > > > > @@ -0,0 +1,378 @@
> > > > > > + * MatrixView is free software; you can redistribute it and/or modify
> > > > > > + * it under the terms of the GNU General Public License version 2 as
> > > > > > + * published by the Free Software Foundation.
> > > > > 
> > > > > Danger Will Robinson!
> > > > > 
> > > > > This is GPL v2, not GPL v2+ as the rest of MPlayer.  This is not
> > > > > acceptable, please ask the patch submitter to relicense.
> > > > 
> > > > Not particularly realistic, there are already about 4 authors for that
> > > > code, and it is copied from code that is GPL v2 only.
> > > 
> > > (note that I asked them anyway though, but an alternative plan would be
> > > good - is wasn't aware that everything is "or later" or I would have
> > > waited a bit longer)
> > 
> > Everything except for libmpdemux/demux_ty_osd.c.  I will try to reach
> > that person by phone once more, otherwise I think we should remove that
> > code.
> 
> Seems like we might have more luck, the author(s) of the MPlayer parts
> seem to already have agreed before (I just got a confirmation of that),
> and the original code seems to have been relicensed:
> http://matrixgl.git.sourceforge.net/git/gitweb.cgi?p=matrixgl/matrixgl;a=blob_plain;f=src/matrix.c;hb=HEAD
> I propose to give a few days of time for the authors to raise any
> objections/issues I missed, but otherwise I think we can go ahead
> and change the license, do you agree?

Yes, go right ahead.

Diego