diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2022-01-15 21:40:12 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2022-01-15 22:05:11 +0300 |
commit | 326449b3e6b38b0c9861f3a67e0a92629500336f (patch) | |
tree | d55a088b075bba23f933d91f5812171c8f58306e /text/json | |
parent | 0c7764fa40c1edb87b7f08a043d836808db02169 (diff) |
Re-license LGPL-2.1 plugins to MPL-2
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/168
Diffstat (limited to 'text/json')
-rw-r--r-- | text/json/Cargo.toml | 2 | ||||
l--------- | text/json/LICENSE-LGPLv2 | 1 | ||||
l--------- | text/json/LICENSE-MPL-2.0 | 1 | ||||
-rw-r--r-- | text/json/src/jsongstenc/imp.rs | 17 | ||||
-rw-r--r-- | text/json/src/jsongstenc/mod.rs | 17 | ||||
-rw-r--r-- | text/json/src/jsongstparse/imp.rs | 17 | ||||
-rw-r--r-- | text/json/src/jsongstparse/mod.rs | 17 | ||||
-rw-r--r-- | text/json/src/lib.rs | 20 | ||||
-rw-r--r-- | text/json/src/line_reader.rs | 17 | ||||
-rw-r--r-- | text/json/tests/json.rs | 17 |
10 files changed, 32 insertions, 94 deletions
diff --git a/text/json/Cargo.toml b/text/json/Cargo.toml index 153c65d0..67644834 100644 --- a/text/json/Cargo.toml +++ b/text/json/Cargo.toml @@ -2,7 +2,7 @@ name = "gst-plugin-json" version = "0.9.0" authors = ["Mathieu Duponchelle <mathieu@centricular.com>"] -license = "LGPL-2.1-or-later" +license = "MPL-2.0" edition = "2021" rust-version = "1.56" description = "Rust JSON Plugin" diff --git a/text/json/LICENSE-LGPLv2 b/text/json/LICENSE-LGPLv2 deleted file mode 120000 index e7646620..00000000 --- a/text/json/LICENSE-LGPLv2 +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-LGPLv2
\ No newline at end of file diff --git a/text/json/LICENSE-MPL-2.0 b/text/json/LICENSE-MPL-2.0 new file mode 120000 index 00000000..eb5d24fe --- /dev/null +++ b/text/json/LICENSE-MPL-2.0 @@ -0,0 +1 @@ +../../LICENSE-MPL-2.0
\ No newline at end of file diff --git a/text/json/src/jsongstenc/imp.rs b/text/json/src/jsongstenc/imp.rs index 6b5a384d..eee81496 100644 --- a/text/json/src/jsongstenc/imp.rs +++ b/text/json/src/jsongstenc/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Mathieu Duponchelle <mathieu@centricular.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 Source Code Form is subject to the terms of the Mozilla Public License, v2.0. +// If a copy of the MPL was not distributed with this file, You can obtain one at +// <https://mozilla.org/MPL/2.0/>. // -// 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., 51 Franklin Street, Suite 500, -// Boston, MA 02110-1335, USA. +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/text/json/src/jsongstenc/mod.rs b/text/json/src/jsongstenc/mod.rs index 81a9aa15..8aa98329 100644 --- a/text/json/src/jsongstenc/mod.rs +++ b/text/json/src/jsongstenc/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Mathieu Duponchelle <mathieu@centricular.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 Source Code Form is subject to the terms of the Mozilla Public License, v2.0. +// If a copy of the MPL was not distributed with this file, You can obtain one at +// <https://mozilla.org/MPL/2.0/>. // -// 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., 51 Franklin Street, Suite 500, -// Boston, MA 02110-1335, USA. +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/text/json/src/jsongstparse/imp.rs b/text/json/src/jsongstparse/imp.rs index 86bdb255..92e49285 100644 --- a/text/json/src/jsongstparse/imp.rs +++ b/text/json/src/jsongstparse/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Mathieu Duponchelle <mathieu@centricular.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 Source Code Form is subject to the terms of the Mozilla Public License, v2.0. +// If a copy of the MPL was not distributed with this file, You can obtain one at +// <https://mozilla.org/MPL/2.0/>. // -// 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., 51 Franklin Street, Suite 500, -// Boston, MA 02110-1335, USA. +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/text/json/src/jsongstparse/mod.rs b/text/json/src/jsongstparse/mod.rs index b40996d7..1be7a6ab 100644 --- a/text/json/src/jsongstparse/mod.rs +++ b/text/json/src/jsongstparse/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Mathieu Duponchelle <mathieu@centricular.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 Source Code Form is subject to the terms of the Mozilla Public License, v2.0. +// If a copy of the MPL was not distributed with this file, You can obtain one at +// <https://mozilla.org/MPL/2.0/>. // -// 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., 51 Franklin Street, Suite 500, -// Boston, MA 02110-1335, USA. +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/text/json/src/lib.rs b/text/json/src/lib.rs index 54d7897a..213c8194 100644 --- a/text/json/src/lib.rs +++ b/text/json/src/lib.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Mathieu Duponchelle <mathieu@centricular.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 Source Code Form is subject to the terms of the Mozilla Public License, v2.0. +// If a copy of the MPL was not distributed with this file, You can obtain one at +// <https://mozilla.org/MPL/2.0/>. // -// 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., 51 Franklin Street, Suite 500, -// Boston, MA 02110-1335, USA. +// SPDX-License-Identifier: MPL-2.0 #![allow(clippy::non_send_fields_in_send_ty)] #![recursion_limit = "128"] @@ -34,7 +25,8 @@ gst::plugin_define!( env!("CARGO_PKG_DESCRIPTION"), plugin_init, concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")), - "LGPL", + // FIXME: MPL-2.0 is only allowed since 1.18.3 (as unknown) and 1.20 (as known) + "MPL", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_NAME"), env!("CARGO_PKG_REPOSITORY"), diff --git a/text/json/src/line_reader.rs b/text/json/src/line_reader.rs index 1d64d128..4f9ceef0 100644 --- a/text/json/src/line_reader.rs +++ b/text/json/src/line_reader.rs @@ -1,19 +1,10 @@ // Copyright (C) 2018 Sebastian Dröge <sebastian@centricular.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 Source Code Form is subject to the terms of the Mozilla Public License, v2.0. +// If a copy of the MPL was not distributed with this file, You can obtain one at +// <https://mozilla.org/MPL/2.0/>. // -// 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., 51 Franklin Street, Suite 500, -// Boston, MA 02110-1335, USA. +// SPDX-License-Identifier: MPL-2.0 use std::collections::VecDeque; diff --git a/text/json/tests/json.rs b/text/json/tests/json.rs index 234d8aab..1bfe702a 100644 --- a/text/json/tests/json.rs +++ b/text/json/tests/json.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Mathieu Duponchelle <mathieu@centricular.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 Source Code Form is subject to the terms of the Mozilla Public License, v2.0. +// If a copy of the MPL was not distributed with this file, You can obtain one at +// <https://mozilla.org/MPL/2.0/>. // -// 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., 51 Franklin Street, Suite 500, -// Boston, MA 02110-1335, USA. +// SPDX-License-Identifier: MPL-2.0 #![allow(clippy::single_match)] |