mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 00:36:51 +00:00
gst/gstplugin.*: Add the 3-clause BSD license and the MIT/X11 license to the license list. Fixes #479784.
Original commit message from CVS: * gst/gstplugin.c: * gst/gstplugin.h: Add the 3-clause BSD license and the MIT/X11 license to the license list. Fixes #479784.
This commit is contained in:
parent
fab9c98201
commit
cb36a2e7a5
3 changed files with 12 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2007-09-24 Sebastian Dröge <slomo@circular-chaos.org>
|
||||||
|
|
||||||
|
* gst/gstplugin.c:
|
||||||
|
* gst/gstplugin.h:
|
||||||
|
Add the 3-clause BSD license and the MIT/X11 license to the license
|
||||||
|
list. Fixes #479784.
|
||||||
|
|
||||||
2007-09-24 Tim-Philipp Müller <tim at centricular dot net>
|
2007-09-24 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
* docs/faq/getting.xml:
|
* docs/faq/getting.xml:
|
||||||
|
|
|
@ -94,6 +94,8 @@ static gboolean _gst_plugin_fault_handler_is_setup = FALSE;
|
||||||
* LGPL: http://www.gnu.org/copyleft/lesser.html
|
* LGPL: http://www.gnu.org/copyleft/lesser.html
|
||||||
* QPL: http://www.trolltech.com/licenses/qpl.html
|
* QPL: http://www.trolltech.com/licenses/qpl.html
|
||||||
* MPL: http://www.opensource.org/licenses/mozilla1.1.php
|
* MPL: http://www.opensource.org/licenses/mozilla1.1.php
|
||||||
|
* MIT/X11: http://www.opensource.org/licenses/mit-license.php
|
||||||
|
* 3-clause BSD: http://www.opensource.org/licenses/bsd-license.php
|
||||||
*/
|
*/
|
||||||
static const gchar *valid_licenses[] = {
|
static const gchar *valid_licenses[] = {
|
||||||
"LGPL", /* GNU Lesser General Public License */
|
"LGPL", /* GNU Lesser General Public License */
|
||||||
|
@ -101,6 +103,8 @@ static const gchar *valid_licenses[] = {
|
||||||
"QPL", /* Trolltech Qt Public License */
|
"QPL", /* Trolltech Qt Public License */
|
||||||
"GPL/QPL", /* Combi-license of GPL + QPL */
|
"GPL/QPL", /* Combi-license of GPL + QPL */
|
||||||
"MPL", /* MPL 1.1 license */
|
"MPL", /* MPL 1.1 license */
|
||||||
|
"BSD", /* 3-clause BSD license */
|
||||||
|
"MIT/X11", /* MIT/X11 license */
|
||||||
"Proprietary", /* Proprietary license */
|
"Proprietary", /* Proprietary license */
|
||||||
GST_LICENSE_UNKNOWN, /* some other license */
|
GST_LICENSE_UNKNOWN, /* some other license */
|
||||||
NULL
|
NULL
|
||||||
|
|
|
@ -105,7 +105,7 @@ typedef gboolean (*GstPluginInitFunc) (GstPlugin *plugin);
|
||||||
* loader will use the data provided there to initialize the plugin.
|
* loader will use the data provided there to initialize the plugin.
|
||||||
*
|
*
|
||||||
* The @licence parameter must be one of: LGPL, GPL, QPL, GPL/QPL, MPL,
|
* The @licence parameter must be one of: LGPL, GPL, QPL, GPL/QPL, MPL,
|
||||||
* Proprietary, unknown.
|
* BSD, MIT/X11, Proprietary, unknown.
|
||||||
*/
|
*/
|
||||||
struct _GstPluginDesc {
|
struct _GstPluginDesc {
|
||||||
gint major_version;
|
gint major_version;
|
||||||
|
|
Loading…
Reference in a new issue