[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 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.

That does not sound like so many people to ask.

In any case, I insist that we cannot accept GPL v2 code without an or
later clause.

> > > + * MatrixView 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.
> > > + *
> > > + * You should have received a copy of the GNU General Public License along
> > > + * with MPlayer; if not, write to the Free Software Foundation, Inc.,
> > > + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> > > + */
> > 
> > MatrixView or MPlayer?  It should be the latter.
> 
> That code is basically from MatrixView, so I avoided changing it.

MatrixView wrote MPlayer in their license header?

> > > --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> > > +++ trunk/libvo/matrixview.h	Sun Jan  3 15:54:51 2010	(r30182)
> > > @@ -0,0 +1,12 @@
> > > +#ifndef MPLAYER_MATRIXVIEW_H
> > > +#define MPLAYER_MATRIXVIEW_H
> > 
> > missing license header
> > 
> > > --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> > > +++ trunk/libvo/matrixview_font.h	Sun Jan  3 15:54:51 2010	(r30182)
> > > @@ -0,0 +1,588 @@
> > > +#ifndef MPLAYER_MATRIXVIEW_FONT_H
> > > +#define MPLAYER_MATRIXVIEW_FONT_H
> > 
> > missing license header
> 
> Grumml... 100% non-copyrightable... grumml... I won't get around it no
> matter how much I grumml, will I?

It's not copyrightable *today*, but tomorrow it will me moved around,
merged, extended and converted into something copyrightable.  So no, I
do not think there is a way around license headers for all new files.
And yes, I will eventually add them to all the ones that still lack one.

Diego