[gst-devel] gstreamer legal patch
Brian Cameron
Brian.Cameron at sun.com
Thu Jul 24 03:07:14 CEST 2003
Gstreamer Team:
I would like to get the following patch applied to gst-plugins. It
does the following:
+ adds a LGPL license to mixmatrix (copyright wtay 2002, according to
1st commit)
+ adds a LGPL license to speed/demo-mp3.c (copyright 2002 wingo,
according to 1st commit)
+ adds a LGPL license to gst/gconf/*.[ch] (copyright 2002 Thomas
Stichele according to 1st commit)
+ specifies that alsa is GPL instead of LGPL
+ specifies that dvdreadsrc is GPL instead of LGPL
+ specifies that gstmpeg1systemencode is GPL instead of LGPL (see main.h)
+ specifies that rtjpeg is GPL rather than LGPL
+ specifies that gstcdaudio is LGPL (previous unspecified)
+ specifies that speex is LGPL (previous unspecified)
Can I commit these changes? It is important to Sun that this change
goes in before the next gst-plugins release.
One changes that would be *really* nice if they could go in would
be the following:
+ I have talked with Wtay and he agrees that gstreamer/libs/gst/putbits
should be removed from the gstreamer core. It has a nasty MPEG
license which is inappropriate for the core module. He hightlights
that mpegaudio and mpeg2enc both use the putbits library and will
not work when the support lib is removed...so perhaps the support
library needs to be moved to gst-plugins? This cleanup task would
make it much easier for Sun to ship the gstreamer core.
A minor nit. There is *.[ch] files in both gst-plugins/ext/festival
and gst-plugins/gst/festival. Can the unused code be removed?
Thanks!
Brian
-------------- next part --------------
Index: gst-plugins/ext/alsa/gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.65
diff -u -p -r1.65 gstalsa.c
--- gst-plugins/ext/alsa/gstalsa.c 19 Jul 2003 23:22:47 -0000 1.65
+++ gst-plugins/ext/alsa/gstalsa.c 24 Jul 2003 09:51:58 -0000
@@ -61,7 +61,7 @@
static GstElementDetails gst_alsa_sink_details = {
"Alsa Sink",
"Sink/Audio",
- "LGPL",
+ "GPL",
"Output to a sound card via ALSA",
VERSION,
"Thomas Nyberg <thomas at codefactory.se>, "
@@ -74,7 +74,7 @@ static GstElementDetails gst_alsa_sink_d
static GstElementDetails gst_alsa_src_details = {
"Alsa Src",
"Source/Audio",
- "LGPL",
+ "GPL",
"Read from a sound card via ALSA",
VERSION,
"Thomas Nyberg <thomas at codefactory.se>, "
Index: gst-plugins/ext/cdaudio/gstcdaudio.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/cdaudio/gstcdaudio.c,v
retrieving revision 1.3
diff -u -p -r1.3 gstcdaudio.c
--- gst-plugins/ext/cdaudio/gstcdaudio.c 29 Jun 2003 19:44:56 -0000 1.3
+++ gst-plugins/ext/cdaudio/gstcdaudio.c 24 Jul 2003 09:51:58 -0000
@@ -107,6 +107,7 @@ static guint gst_cdaudio_signals[LAST_SI
static GstElementDetails gst_cdaudio_details = {
"CD Player",
"Generic/Bin",
+ "LGPL",
"Play CD audio through the CD Drive",
VERSION,
"Wim Taymans <wim.taymans at chello.be>",
Index: gst-plugins/ext/dvdread/dvdreadsrc.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/dvdread/dvdreadsrc.c,v
retrieving revision 1.4
diff -u -p -r1.4 dvdreadsrc.c
--- gst-plugins/ext/dvdread/dvdreadsrc.c 12 Jul 2003 14:49:20 -0000 1.4
+++ gst-plugins/ext/dvdread/dvdreadsrc.c 24 Jul 2003 09:51:58 -0000
@@ -89,7 +89,7 @@ struct _DVDReadSrcPrivate {
GstElementDetails dvdreadsrc_details = {
"DVD Source",
"Source/File/DVD",
- "LGPL",
+ "GPL",
"Access a DVD title/chapter/angle using libdvdread",
VERSION,
"Erik Walthinsen <omega at cse.ogi.edu>",
Index: gst-plugins/ext/speex/gstspeexdec.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/speex/gstspeexdec.c,v
retrieving revision 1.5
diff -u -p -r1.5 gstspeexdec.c
--- gst-plugins/ext/speex/gstspeexdec.c 6 Jul 2003 20:49:24 -0000 1.5
+++ gst-plugins/ext/speex/gstspeexdec.c 24 Jul 2003 09:51:58 -0000
@@ -31,6 +31,7 @@ extern GstPadTemplate *speexdec_src_temp
GstElementDetails gst_speexdec_details = {
"speex audio decoder",
"Codec/Audio/Decoder",
+ "LGPL"
".speex",
VERSION,
"Wim Taymans <wim.taymans at chello.be>",
Index: gst-plugins/ext/speex/gstspeexenc.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/speex/gstspeexenc.c,v
retrieving revision 1.5
diff -u -p -r1.5 gstspeexenc.c
--- gst-plugins/ext/speex/gstspeexenc.c 6 Jul 2003 20:49:24 -0000 1.5
+++ gst-plugins/ext/speex/gstspeexenc.c 24 Jul 2003 09:51:58 -0000
@@ -31,6 +31,7 @@ extern GstPadTemplate *speexenc_src_temp
GstElementDetails gst_speexenc_details = {
"speex audio encoder",
"Codec/Audio/Encoder",
+ "LGPL",
".speex",
VERSION,
"Wim Taymans <wim.taymans at chello.be>",
Index: gst-plugins/gst/mixmatrix/mixmatrix.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/mixmatrix/mixmatrix.c,v
retrieving revision 1.11
diff -u -p -r1.11 mixmatrix.c
--- gst-plugins/gst/mixmatrix/mixmatrix.c 19 Jul 2003 23:47:40 -0000 1.11
+++ gst-plugins/gst/mixmatrix/mixmatrix.c 24 Jul 2003 09:51:58 -0000
@@ -1,3 +1,22 @@
+/* GStreamer
+ * Copyright (C) 2002 Wim Taymans <wtay at chello.be>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: gst-plugins/gst/mpeg1sys/gstmpeg1systemencode.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/mpeg1sys/gstmpeg1systemencode.c,v
retrieving revision 1.12
diff -u -p -r1.12 gstmpeg1systemencode.c
--- gst-plugins/gst/mpeg1sys/gstmpeg1systemencode.c 6 Jul 2003 20:49:40 -0000 1.12
+++ gst-plugins/gst/mpeg1sys/gstmpeg1systemencode.c 24 Jul 2003 09:51:58 -0000
@@ -34,7 +34,7 @@
static GstElementDetails system_encode_details = {
"MPEG1 Multiplexer",
"Codec/Muxer",
- "LGPL",
+ "GPL",
"Multiplexes MPEG-1 Streams",
VERSION,
"Wim Taymans <wim.taymans at chello.be>",
Index: gst-plugins/gst/rtjpeg/gstrtjpegdec.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/rtjpeg/gstrtjpegdec.c,v
retrieving revision 1.6
diff -u -p -r1.6 gstrtjpegdec.c
--- gst-plugins/gst/rtjpeg/gstrtjpegdec.c 29 Jun 2003 19:45:52 -0000 1.6
+++ gst-plugins/gst/rtjpeg/gstrtjpegdec.c 24 Jul 2003 09:51:58 -0000
@@ -29,7 +29,7 @@
GstElementDetails gst_rtjpegdec_details = {
"RTjpeg decoder",
"Codec/Video/Decoder",
- "LGPL",
+ "GPL",
"Decodes video in RTjpeg format",
VERSION,
"Erik Walthinsen <omega at cse.ogi.edu>",
Index: gst-plugins/gst/rtjpeg/gstrtjpegenc.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/rtjpeg/gstrtjpegenc.c,v
retrieving revision 1.6
diff -u -p -r1.6 gstrtjpegenc.c
--- gst-plugins/gst/rtjpeg/gstrtjpegenc.c 29 Jun 2003 19:45:52 -0000 1.6
+++ gst-plugins/gst/rtjpeg/gstrtjpegenc.c 24 Jul 2003 09:51:58 -0000
@@ -27,7 +27,7 @@
GstElementDetails gst_rtjpegenc_details = {
"RTjpeg encoder",
"Codec/Video/Encoder",
- "LGPL",
+ "GPL",
"Encodes video in RTjpeg format",
VERSION,
"Erik Walthinsen <omega at cse.ogi.edu>",
Index: gst-plugins/gst/speed/demo-mp3.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/speed/demo-mp3.c,v
retrieving revision 1.7
diff -u -p -r1.7 demo-mp3.c
--- gst-plugins/gst/speed/demo-mp3.c 10 Jan 2003 10:22:21 -0000 1.7
+++ gst-plugins/gst/speed/demo-mp3.c 24 Jul 2003 09:51:58 -0000
@@ -1,3 +1,23 @@
+/*
+ * GStreamer
+ * Copyright (C) 2002 Andy Wingo <wingo at pobox dot com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
#include <stdlib.h>
#include <gtk/gtk.h>
#include <gst/gst.h>
Index: gst-plugins/gst-libs/gst/gconf/gconf.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst-libs/gst/gconf/gconf.c,v
retrieving revision 1.11
diff -u -p -r1.11 gconf.c
--- gst-plugins/gst-libs/gst/gconf/gconf.c 29 May 2003 17:00:55 -0000 1.11
+++ gst-plugins/gst-libs/gst/gconf/gconf.c 24 Jul 2003 09:51:58 -0000
@@ -1,3 +1,22 @@
+/* GStreamer
+ * Copyright (C) <2002> Thomas Vander Stichele <thomas at apestaart.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
/*
* this library handles interaction with GConf
*/
Index: gst-plugins/gst-libs/gst/gconf/gconf.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst-libs/gst/gconf/gconf.h,v
retrieving revision 1.5
diff -u -p -r1.5 gconf.h
--- gst-plugins/gst-libs/gst/gconf/gconf.h 29 Mar 2003 19:48:38 -0000 1.5
+++ gst-plugins/gst-libs/gst/gconf/gconf.h 24 Jul 2003 09:51:58 -0000
@@ -1,3 +1,22 @@
+/* GStreamer
+ * Copyright (C) <2002> Thomas Vander Stichele <thomas at apestaart.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
#ifndef GST_GCONF_H
#define GST_GCONF_H
Index: gst-plugins/gst-libs/gst/gconf/test-gconf.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst-libs/gst/gconf/test-gconf.c,v
retrieving revision 1.3
diff -u -p -r1.3 test-gconf.c
--- gst-plugins/gst-libs/gst/gconf/test-gconf.c 25 Oct 2002 14:31:15 -0000 1.3
+++ gst-plugins/gst-libs/gst/gconf/test-gconf.c 24 Jul 2003 09:51:58 -0000
@@ -1,3 +1,22 @@
+/* GStreamer
+ * Copyright (C) <2002> Thomas Vander Stichele <thomas at apestaart.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
#include "gconf.h"
int
More information about the gstreamer-devel
mailing list