Skip to content

Commit d71a6bf

Browse files
clogwogGStreamer Marge Bot
authored andcommitted
plugin: add Apache 2 license to known licenses
the licence in gstreamer/subprojects/gstreamer/gst/gstplugin.c currently is defined to be one of: LGPL GPL QPL GPL/QPL MPL BSD MIT/X11 0BSD Proprietary The open source project for the kinesis plugin is using an Apache 2.0 license. Because "Apache 2.0" is not one of the supported licenses it automatically falls back to Proprietary. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2514>
1 parent 4474056 commit d71a6bf

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

subprojects/gstreamer/gst/gstplugin.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ static char *_gst_plugin_fault_handler_filename = NULL;
9595
* MIT/X11: https://opensource.org/licenses/MIT
9696
* 3-clause BSD: https://opensource.org/licenses/BSD-3-Clause
9797
* Zero-Clause BSD: https://opensource.org/licenses/0BSD
98+
* Apache License 2.0: http://www.apache.org/licenses/LICENSE-2.0 (Since: 1.22)
99+
98100
* FIXME: update to use SPDX identifiers, or just remove entirely
99101
*/
100102
static const gchar known_licenses[] = "LGPL\000" /* GNU Lesser General Public License */
@@ -106,6 +108,7 @@ static const gchar known_licenses[] = "LGPL\000" /* GNU Lesser General Pu
106108
"BSD\000" /* 3-clause BSD license */
107109
"MIT/X11\000" /* MIT/X11 license */
108110
"0BSD\000" /* Zero-Clause BSD */
111+
"Apache 2.0\000" /* Apache License 2.0 */
109112
"Proprietary\000" /* Proprietary license */
110113
GST_LICENSE_UNKNOWN; /* some other license */
111114

@@ -1487,19 +1490,19 @@ gst_plugin_list_free (GList * list)
14871490
* ENV + *xyz same as above, but xyz acts as suffix filter
14881491
* ENV + xyz* same as above, but xyz acts as prefix filter (is this needed?)
14891492
* ENV + *xyz* same as above, but xyz acts as strstr filter (is this needed?)
1490-
*
1493+
*
14911494
* same as above, with additional paths hard-coded at compile-time:
14921495
* - only check paths + ... if ENV is not set or yields not paths
14931496
* - always check paths + ... in addition to ENV
14941497
*
14951498
* When user specifies set of environment variables, he/she may also use e.g.
14961499
* "HOME/.mystuff/plugins", and we'll expand the content of $HOME with the
1497-
* remainder
1500+
* remainder
14981501
*/
14991502

15001503
/* we store in registry:
15011504
* sets of:
1502-
* {
1505+
* {
15031506
* - environment variables (array of strings)
15041507
* - last hash of env variable contents (uint) (so we can avoid doing stats
15051508
* if one of the env vars has changed; premature optimisation galore)

0 commit comments

Comments
 (0)