mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-11-22 11:30:59 +00:00
Use MPL as license specifier for plugins only requiring GStreamer < 1.20
And use MPL-2.0 for all that require GStreamer 1.20 or newer. The new string is only allowed in 1.20 or newer and using it in older versions causes failure to load the plugin. All affected plugins are of course still MPL-2.0 licensed. Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/374 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1235>
This commit is contained in:
parent
b7e6e5cbc9
commit
c65b3429ad
4 changed files with 6 additions and 6 deletions
|
@ -5546,7 +5546,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"filename": "gstrsonvif",
|
"filename": "gstrsonvif",
|
||||||
"license": "MPL",
|
"license": "MPL-2.0",
|
||||||
"other-types": {},
|
"other-types": {},
|
||||||
"package": "gst-plugin-onvif",
|
"package": "gst-plugin-onvif",
|
||||||
"source": "gst-plugin-onvif",
|
"source": "gst-plugin-onvif",
|
||||||
|
@ -5811,7 +5811,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"filename": "gstrsrtp",
|
"filename": "gstrsrtp",
|
||||||
"license": "MPL",
|
"license": "MPL-2.0",
|
||||||
"other-types": {},
|
"other-types": {},
|
||||||
"package": "gst-plugin-rtp",
|
"package": "gst-plugin-rtp",
|
||||||
"source": "gst-plugin-rtp",
|
"source": "gst-plugin-rtp",
|
||||||
|
@ -8548,7 +8548,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"filename": "gsttogglerecord",
|
"filename": "gsttogglerecord",
|
||||||
"license": "MPL-2.0",
|
"license": "MPL",
|
||||||
"other-types": {},
|
"other-types": {},
|
||||||
"package": "gst-plugin-togglerecord",
|
"package": "gst-plugin-togglerecord",
|
||||||
"source": "gst-plugin-togglerecord",
|
"source": "gst-plugin-togglerecord",
|
||||||
|
|
|
@ -130,7 +130,7 @@ gst::plugin_define!(
|
||||||
env!("CARGO_PKG_DESCRIPTION"),
|
env!("CARGO_PKG_DESCRIPTION"),
|
||||||
plugin_init,
|
plugin_init,
|
||||||
concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
|
concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
|
||||||
"MPL",
|
"MPL-2.0",
|
||||||
env!("CARGO_PKG_NAME"),
|
env!("CARGO_PKG_NAME"),
|
||||||
env!("CARGO_PKG_NAME"),
|
env!("CARGO_PKG_NAME"),
|
||||||
env!("CARGO_PKG_REPOSITORY"),
|
env!("CARGO_PKG_REPOSITORY"),
|
||||||
|
|
|
@ -31,7 +31,7 @@ gst::plugin_define!(
|
||||||
env!("CARGO_PKG_DESCRIPTION"),
|
env!("CARGO_PKG_DESCRIPTION"),
|
||||||
plugin_init,
|
plugin_init,
|
||||||
concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
|
concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
|
||||||
"MPL",
|
"MPL-2.0",
|
||||||
env!("CARGO_PKG_NAME"),
|
env!("CARGO_PKG_NAME"),
|
||||||
env!("CARGO_PKG_NAME"),
|
env!("CARGO_PKG_NAME"),
|
||||||
env!("CARGO_PKG_REPOSITORY"),
|
env!("CARGO_PKG_REPOSITORY"),
|
||||||
|
|
|
@ -26,7 +26,7 @@ gst::plugin_define!(
|
||||||
plugin_init,
|
plugin_init,
|
||||||
concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
|
concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
|
||||||
// FIXME: MPL-2.0 is only allowed since 1.18.3 (as unknown) and 1.20 (as known)
|
// FIXME: MPL-2.0 is only allowed since 1.18.3 (as unknown) and 1.20 (as known)
|
||||||
"MPL-2.0",
|
"MPL",
|
||||||
env!("CARGO_PKG_NAME"),
|
env!("CARGO_PKG_NAME"),
|
||||||
env!("CARGO_PKG_NAME"),
|
env!("CARGO_PKG_NAME"),
|
||||||
env!("CARGO_PKG_REPOSITORY"),
|
env!("CARGO_PKG_REPOSITORY"),
|
||||||
|
|
Loading…
Reference in a new issue