From cb36a2e7a57ad47de481300189fc2374c4df0802 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Mon, 24 Sep 2007 17:41:25 +0000
Subject: [PATCH] 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.
---
 ChangeLog       | 7 +++++++
 gst/gstplugin.c | 4 ++++
 gst/gstplugin.h | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 590266f..7a8d1e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* docs/faq/getting.xml:
diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index d238df6..c11faeb 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -94,6 +94,8 @@ static gboolean _gst_plugin_fault_handler_is_setup = FALSE;
  * LGPL: http://www.gnu.org/copyleft/lesser.html
  * QPL: http://www.trolltech.com/licenses/qpl.html
  * 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[] = {
   "LGPL",                       /* GNU Lesser General Public License */
@@ -101,6 +103,8 @@ static const gchar *valid_licenses[] = {
   "QPL",                        /* Trolltech Qt Public License */
   "GPL/QPL",                    /* Combi-license of GPL + QPL */
   "MPL",                        /* MPL 1.1 license */
+  "BSD",                        /* 3-clause BSD license */
+  "MIT/X11",                    /* MIT/X11 license */
   "Proprietary",                /* Proprietary license */
   GST_LICENSE_UNKNOWN,          /* some other license */
   NULL
diff --git a/gst/gstplugin.h b/gst/gstplugin.h
index 15d633c..c1b1496 100644
--- a/gst/gstplugin.h
+++ b/gst/gstplugin.h
@@ -105,7 +105,7 @@ typedef gboolean (*GstPluginInitFunc) (GstPlugin *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,
- * Proprietary, unknown.
+ * BSD, MIT/X11, Proprietary, unknown.
  */
 struct _GstPluginDesc {
   gint major_version;
-- 
2.7.4