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 | |
| parent | 0c7764fa40c1edb87b7f08a043d836808db02169 (diff) | |
Re-license LGPL-2.1 plugins to MPL-2
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/168
146 files changed, 519 insertions, 1744 deletions
diff --git a/audio/audiofx/Cargo.toml b/audio/audiofx/Cargo.toml index 4bffeddf7..53712ecea 100644 --- a/audio/audiofx/Cargo.toml +++ b/audio/audiofx/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-audiofx" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "LGPL-2.1-or-later" +license = "MPL-2.0" description = "Rust AudioFx Plugin" edition = "2021" rust-version = "1.56" diff --git a/audio/audiofx/LICENSE-APACHE b/audio/audiofx/LICENSE-APACHE deleted file mode 120000 index 1cd601d0a..000000000 --- a/audio/audiofx/LICENSE-APACHE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-APACHE
\ No newline at end of file diff --git a/audio/audiofx/LICENSE-LGPLv2 b/audio/audiofx/LICENSE-LGPLv2 deleted file mode 120000 index e7646620e..000000000 --- a/audio/audiofx/LICENSE-LGPLv2 +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-LGPLv2
\ No newline at end of file diff --git a/audio/audiofx/LICENSE-MIT b/audio/audiofx/LICENSE-MIT deleted file mode 120000 index b2cfbdc7b..000000000 --- a/audio/audiofx/LICENSE-MIT +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-MIT
\ No newline at end of file diff --git a/audio/audiofx/LICENSE-MPL-2.0 b/audio/audiofx/LICENSE-MPL-2.0 new file mode 120000 index 000000000..eb5d24fe9 --- /dev/null +++ b/audio/audiofx/LICENSE-MPL-2.0 @@ -0,0 +1 @@ +../../LICENSE-MPL-2.0
\ No newline at end of file diff --git a/audio/audiofx/examples/hrtfrender.rs b/audio/audiofx/examples/hrtfrender.rs index aee8d21c7..41ded273a 100644 --- a/audio/audiofx/examples/hrtfrender.rs +++ b/audio/audiofx/examples/hrtfrender.rs @@ -1,8 +1,10 @@ // Copyright (C) 2021 Tomasz Andrzejak <andreiltd@gmail.com> // -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::prelude::*; diff --git a/audio/audiofx/src/audioecho/imp.rs b/audio/audiofx/src/audioecho/imp.rs index 745fef2b5..d44874a37 100644 --- a/audio/audiofx/src/audioecho/imp.rs +++ b/audio/audiofx/src/audioecho/imp.rs @@ -1,10 +1,10 @@ // Copyright (C) 2017,2018 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/audioecho/mod.rs b/audio/audiofx/src/audioecho/mod.rs index f33475c3b..cfc986e51 100644 --- a/audio/audiofx/src/audioecho/mod.rs +++ b/audio/audiofx/src/audioecho/mod.rs @@ -1,10 +1,10 @@ // Copyright (C) 2017,2018 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/audioecho/ring_buffer.rs b/audio/audiofx/src/audioecho/ring_buffer.rs index 5eafefdd3..aa6417e52 100644 --- a/audio/audiofx/src/audioecho/ring_buffer.rs +++ b/audio/audiofx/src/audioecho/ring_buffer.rs @@ -1,10 +1,10 @@ // Copyright (C) 2017,2018 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use std::iter; diff --git a/audio/audiofx/src/audioloudnorm/imp.rs b/audio/audiofx/src/audioloudnorm/imp.rs index 22c8e5fda..6c2fbdaf6 100644 --- a/audio/audiofx/src/audioloudnorm/imp.rs +++ b/audio/audiofx/src/audioloudnorm/imp.rs @@ -2,21 +2,15 @@ // // Audio processing part of this file ported from ffmpeg/libavfilter/af_loudnorm.c // -// Copyright (c) 2016 Kyle Swanson <k@ylo.ph> +// Original C code +// Copyright (c) 2016 Kyle Swanson <k@ylo.ph> +// licensed under the LGPL-2.1+ and generously relicensed to MPL-2.0. // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 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/>. // -// FFmpeg 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 -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with FFmpeg; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/audioloudnorm/mod.rs b/audio/audiofx/src/audioloudnorm/mod.rs index 449a2a500..61000fcb8 100644 --- a/audio/audiofx/src/audioloudnorm/mod.rs +++ b/audio/audiofx/src/audioloudnorm/mod.rs @@ -1,22 +1,10 @@ // Copyright (C) 2019-2020 Sebastian Dröge <sebastian@centricular.com> // -// Audio processing part of this file ported from ffmpeg/libavfilter/af_loudnorm.c +// 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/>. // -// Copyright (c) 2016 Kyle Swanson <k@ylo.ph> -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// FFmpeg 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 -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with FFmpeg; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/audiornnoise/imp.rs b/audio/audiofx/src/audiornnoise/imp.rs index e2202faf6..1e865414e 100644 --- a/audio/audiofx/src/audiornnoise/imp.rs +++ b/audio/audiofx/src/audiornnoise/imp.rs @@ -1,11 +1,11 @@ // Copyright (C) 2020 Philippe Normand <philn@igalia.com> // Copyright (C) 2020 Natanael Mojica <neithanmo@gmail.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/audiornnoise/mod.rs b/audio/audiofx/src/audiornnoise/mod.rs index 7149f6c7e..37423fd20 100644 --- a/audio/audiofx/src/audiornnoise/mod.rs +++ b/audio/audiofx/src/audiornnoise/mod.rs @@ -1,11 +1,11 @@ // Copyright (C) 2020 Philippe Normand <philn@igalia.com> // Copyright (C) 2020 Natanael Mojica <neithanmo@gmail.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/ebur128level/imp.rs b/audio/audiofx/src/ebur128level/imp.rs index 792b9dc35..8228f68b7 100644 --- a/audio/audiofx/src/ebur128level/imp.rs +++ b/audio/audiofx/src/ebur128level/imp.rs @@ -1,10 +1,10 @@ // Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/ebur128level/mod.rs b/audio/audiofx/src/ebur128level/mod.rs index e84beb19a..f3d67809c 100644 --- a/audio/audiofx/src/ebur128level/mod.rs +++ b/audio/audiofx/src/ebur128level/mod.rs @@ -1,10 +1,10 @@ // Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/hrtfrender/imp.rs b/audio/audiofx/src/hrtfrender/imp.rs index 21cb6a1f9..847217de6 100644 --- a/audio/audiofx/src/hrtfrender/imp.rs +++ b/audio/audiofx/src/hrtfrender/imp.rs @@ -1,8 +1,10 @@ // Copyright (C) 2021 Tomasz Andrzejak <andreiltd@gmail.com> // -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/hrtfrender/mod.rs b/audio/audiofx/src/hrtfrender/mod.rs index 6f2349f9b..6e9e0144d 100644 --- a/audio/audiofx/src/hrtfrender/mod.rs +++ b/audio/audiofx/src/hrtfrender/mod.rs @@ -1,8 +1,10 @@ // Copyright (C) 2021 Tomasz Andrzejak <andreiltd@gmail.com> // -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/audiofx/src/lib.rs b/audio/audiofx/src/lib.rs index f7f64587e..ecf90b51a 100644 --- a/audio/audiofx/src/lib.rs +++ b/audio/audiofx/src/lib.rs @@ -1,10 +1,10 @@ // Copyright (C) 2017 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; @@ -29,7 +29,8 @@ gst::plugin_define!( env!("CARGO_PKG_DESCRIPTION"), plugin_init, concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")), - "MIT/X11", + // 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/audio/audiofx/tests/audioloudnorm.rs b/audio/audiofx/tests/audioloudnorm.rs index c01c7a38d..e3999211b 100644 --- a/audio/audiofx/tests/audioloudnorm.rs +++ b/audio/audiofx/tests/audioloudnorm.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 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 gst::prelude::*; diff --git a/audio/audiofx/tests/audiornnoise.rs b/audio/audiofx/tests/audiornnoise.rs index 9f31b2c4b..fe8d50453 100644 --- a/audio/audiofx/tests/audiornnoise.rs +++ b/audio/audiofx/tests/audiornnoise.rs @@ -1,10 +1,10 @@ // Copyright (C) 2020 Philippe Normand <philn@igalia.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use byte_slice_cast::*; diff --git a/audio/audiofx/tests/ebur128level.rs b/audio/audiofx/tests/ebur128level.rs index 9d37c4b0d..f441a63b8 100644 --- a/audio/audiofx/tests/ebur128level.rs +++ b/audio/audiofx/tests/ebur128level.rs @@ -1,10 +1,10 @@ // Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 #![allow(clippy::single_match)] diff --git a/audio/audiofx/tests/hrtfrender.rs b/audio/audiofx/tests/hrtfrender.rs index 3a3d6571d..b8fbe453a 100644 --- a/audio/audiofx/tests/hrtfrender.rs +++ b/audio/audiofx/tests/hrtfrender.rs @@ -1,8 +1,10 @@ // Copyright (C) 2021 Tomasz Andrzejak <andreiltd@gmail.com> // -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/csound/Cargo.toml b/audio/csound/Cargo.toml index 461120e7f..4785849b0 100644 --- a/audio/csound/Cargo.toml +++ b/audio/csound/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-csound" version = "0.9.0" authors = ["Natanael Mojica <neithanmo@gmail.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "LGPL-2.1-or-later" +license = "MPL-2.0" edition = "2021" rust-version = "1.56" description = "An Audio filter plugin based on Csound" diff --git a/audio/csound/LICENSE-LGPLv2 b/audio/csound/LICENSE-LGPLv2 deleted file mode 120000 index e7646620e..000000000 --- a/audio/csound/LICENSE-LGPLv2 +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-LGPLv2
\ No newline at end of file diff --git a/audio/csound/LICENSE-MPL-2.0 b/audio/csound/LICENSE-MPL-2.0 new file mode 120000 index 000000000..eb5d24fe9 --- /dev/null +++ b/audio/csound/LICENSE-MPL-2.0 @@ -0,0 +1 @@ +../../LICENSE-MPL-2.0
\ No newline at end of file diff --git a/audio/csound/examples/effect_example.rs b/audio/csound/examples/effect_example.rs index 222692830..bfce8cac1 100644 --- a/audio/csound/examples/effect_example.rs +++ b/audio/csound/examples/effect_example.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Natanael Mojica <neithanmo@gmail.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::prelude::*; diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs index bf1b4e270..70246c78d 100644 --- a/audio/csound/src/filter/imp.rs +++ b/audio/csound/src/filter/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Natanael Mojica <neithanmo@gmail.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/audio/csound/src/filter/mod.rs b/audio/csound/src/filter/mod.rs index 53d083853..095d3a596 100644 --- a/audio/csound/src/filter/mod.rs +++ b/audio/csound/src/filter/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Natanael Mojica <neithanmo@gmail.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/audio/csound/src/lib.rs b/audio/csound/src/lib.rs index 04a6ac8f4..c156b88c8 100644 --- a/audio/csound/src/lib.rs +++ b/audio/csound/src/lib.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Natanael Mojica <neithanmo@gmail.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)] use gst::glib; diff --git a/audio/csound/tests/csound_filter.rs b/audio/csound/tests/csound_filter.rs index 367e5e769..ed8b15987 100644 --- a/audio/csound/tests/csound_filter.rs +++ b/audio/csound/tests/csound_filter.rs @@ -1,19 +1,11 @@ // Copyright (C) 2020 Natanael Mojica <neithanmo@gmail.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::prelude::*; use byte_slice_cast::*; diff --git a/net/rusoto/Cargo.toml b/net/rusoto/Cargo.toml index d5f0d584c..16ab59380 100644 --- a/net/rusoto/Cargo.toml +++ b/net/rusoto/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Arun Raghavan <arun@arunraghavan.net>", "Jordan Petridis <jordan@centricular.com>", "Mathieu Duponchelle <mathieu@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MPL-2.0" description = "Amazon Web Services plugin" edition = "2021" rust-version = "1.56" diff --git a/net/rusoto/LICENSE-APACHE b/net/rusoto/LICENSE-APACHE deleted file mode 120000 index 1cd601d0a..000000000 --- a/net/rusoto/LICENSE-APACHE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-APACHE
\ No newline at end of file diff --git a/net/rusoto/LICENSE-MIT b/net/rusoto/LICENSE-MIT deleted file mode 120000 index b2cfbdc7b..000000000 --- a/net/rusoto/LICENSE-MIT +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-MIT
\ No newline at end of file diff --git a/net/rusoto/src/aws_transcribe_parse/imp.rs b/net/rusoto/src/aws_transcribe_parse/imp.rs index a22dae17d..91f5f66a1 100644 --- a/net/rusoto/src/aws_transcribe_parse/imp.rs +++ b/net/rusoto/src/aws_transcribe_parse/imp.rs @@ -1,20 +1,10 @@ // Copyright (C) 2021 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::*; use gst::subclass::prelude::*; diff --git a/net/rusoto/src/aws_transcribe_parse/mod.rs b/net/rusoto/src/aws_transcribe_parse/mod.rs index c7851ae30..2fbdb4c46 100644 --- a/net/rusoto/src/aws_transcribe_parse/mod.rs +++ b/net/rusoto/src/aws_transcribe_parse/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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/net/rusoto/src/aws_transcriber/imp.rs b/net/rusoto/src/aws_transcriber/imp.rs index cac7d7e35..b09d03c81 100644 --- a/net/rusoto/src/aws_transcriber/imp.rs +++ b/net/rusoto/src/aws_transcriber/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/net/rusoto/src/aws_transcriber/mod.rs b/net/rusoto/src/aws_transcriber/mod.rs index fc44742a3..29056f99b 100644 --- a/net/rusoto/src/aws_transcriber/mod.rs +++ b/net/rusoto/src/aws_transcriber/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/net/rusoto/src/aws_transcriber/packet/mod.rs b/net/rusoto/src/aws_transcriber/packet/mod.rs index 84bda0d67..d11a054ca 100644 --- a/net/rusoto/src/aws_transcriber/packet/mod.rs +++ b/net/rusoto/src/aws_transcriber/packet/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Jordan Petridis <jordan@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 byteorder::{BigEndian, WriteBytesExt}; use nom::{ diff --git a/net/rusoto/src/lib.rs b/net/rusoto/src/lib.rs index 087c57e57..467d9d6e6 100644 --- a/net/rusoto/src/lib.rs +++ b/net/rusoto/src/lib.rs @@ -1,10 +1,10 @@ // Copyright (C) 2017 Author: Arun Raghavan <arun@arunraghavan.net> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; @@ -30,7 +30,8 @@ gst::plugin_define!( env!("CARGO_PKG_DESCRIPTION"), plugin_init, concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")), - "MIT/X11", + // 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/net/rusoto/src/s3sink/imp.rs b/net/rusoto/src/s3sink/imp.rs index 006c6f114..850dcbe28 100644 --- a/net/rusoto/src/s3sink/imp.rs +++ b/net/rusoto/src/s3sink/imp.rs @@ -1,10 +1,10 @@ // Copyright (C) 2019 Amazon.com, Inc. or its affiliates <mkolny@amazon.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/net/rusoto/src/s3sink/mod.rs b/net/rusoto/src/s3sink/mod.rs index 0f0399256..b767c6b94 100644 --- a/net/rusoto/src/s3sink/mod.rs +++ b/net/rusoto/src/s3sink/mod.rs @@ -1,10 +1,10 @@ // Copyright (C) 2019 Amazon.com, Inc. or its affiliates <mkolny@amazon.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/net/rusoto/src/s3src/imp.rs b/net/rusoto/src/s3src/imp.rs index 61eaebf19..9e2dd939c 100644 --- a/net/rusoto/src/s3src/imp.rs +++ b/net/rusoto/src/s3src/imp.rs @@ -1,10 +1,10 @@ // Copyright (C) 2017 Author: Arun Raghavan <arun@arunraghavan.net> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use std::sync::Mutex; diff --git a/net/rusoto/src/s3src/mod.rs b/net/rusoto/src/s3src/mod.rs index 2d22df23d..3c28209ee 100644 --- a/net/rusoto/src/s3src/mod.rs +++ b/net/rusoto/src/s3src/mod.rs @@ -1,10 +1,10 @@ // Copyright (C) 2017 Author: Arun Raghavan <arun@arunraghavan.net> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/net/rusoto/src/s3url.rs b/net/rusoto/src/s3url.rs index 4b29e7be8..c03310e9b 100644 --- a/net/rusoto/src/s3url.rs +++ b/net/rusoto/src/s3url.rs @@ -1,10 +1,10 @@ // Copyright (C) 2017 Author: Arun Raghavan <arun@arunraghavan.net> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use percent_encoding::{percent_decode, percent_encode, AsciiSet, CONTROLS}; use rusoto_core::Region; diff --git a/net/rusoto/src/s3utils.rs b/net/rusoto/src/s3utils.rs index e25f83d14..9775ebd4e 100644 --- a/net/rusoto/src/s3utils.rs +++ b/net/rusoto/src/s3utils.rs @@ -1,10 +1,10 @@ // Copyright (C) 2017 Author: Arun Raghavan <arun@arunraghavan.net> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use bytes::{buf::BufMut, Bytes, BytesMut}; use futures::stream::TryStreamExt; diff --git a/text/json/Cargo.toml b/text/json/Cargo.toml index 153c65d0c..67644834a 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 e7646620e..000000000 --- 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 000000000..eb5d24fe9 --- /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 6b5a384db..eee814969 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 81a9aa15b..8aa983295 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 86bdb255a..92e49285b 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 b40996d7c..1be7a6ab5 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 54d7897a8..213c8194c 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 1d64d128f..4f9ceef0f 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 234d8aab5..1bfe702a0 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)] diff --git a/text/regex/Cargo.toml b/text/regex/Cargo.toml index 6231285d3..b8bda07d7 100644 --- a/text/regex/Cargo.toml +++ b/text/regex/Cargo.toml @@ -2,7 +2,7 @@ name = "gst-plugin-regex" 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 Regular Expression Plugin" diff --git a/text/regex/LICENSE-LGPLv2 b/text/regex/LICENSE-LGPLv2 deleted file mode 120000 index e7646620e..000000000 --- a/text/regex/LICENSE-LGPLv2 +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-LGPLv2
\ No newline at end of file diff --git a/text/regex/LICENSE-MPL-2.0 b/text/regex/LICENSE-MPL-2.0 new file mode 120000 index 000000000..eb5d24fe9 --- /dev/null +++ b/text/regex/LICENSE-MPL-2.0 @@ -0,0 +1 @@ +../../LICENSE-MPL-2.0
\ No newline at end of file diff --git a/text/regex/src/gstregex/imp.rs b/text/regex/src/gstregex/imp.rs index f6b47d788..9535db26b 100644 --- a/text/regex/src/gstregex/imp.rs +++ b/text/regex/src/gstregex/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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::gst_error; diff --git a/text/regex/src/gstregex/mod.rs b/text/regex/src/gstregex/mod.rs index 6884bb30c..bf3f07e20 100644 --- a/text/regex/src/gstregex/mod.rs +++ b/text/regex/src/gstregex/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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/regex/src/lib.rs b/text/regex/src/lib.rs index d6e9bd942..7181d2ca6 100644 --- a/text/regex/src/lib.rs +++ b/text/regex/src/lib.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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"] @@ -30,7 +21,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/regex/tests/regex.rs b/text/regex/tests/regex.rs index 35c6045b9..e9c2d04ad 100644 --- a/text/regex/tests/regex.rs +++ b/text/regex/tests/regex.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::prelude::*; diff --git a/text/wrap/Cargo.toml b/text/wrap/Cargo.toml index cfb5a33e6..244c8e952 100644 --- a/text/wrap/Cargo.toml +++ b/text/wrap/Cargo.toml @@ -2,7 +2,7 @@ name = "gst-plugin-textwrap" 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 Text Wrap Plugin" diff --git a/text/wrap/LICENSE-LGPLv2 b/text/wrap/LICENSE-LGPLv2 deleted file mode 120000 index e7646620e..000000000 --- a/text/wrap/LICENSE-LGPLv2 +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-LGPLv2
\ No newline at end of file diff --git a/text/wrap/LICENSE-MPL-2.0 b/text/wrap/LICENSE-MPL-2.0 new file mode 120000 index 000000000..eb5d24fe9 --- /dev/null +++ b/text/wrap/LICENSE-MPL-2.0 @@ -0,0 +1 @@ +../../LICENSE-MPL-2.0
\ No newline at end of file diff --git a/text/wrap/src/gsttextwrap/imp.rs b/text/wrap/src/gsttextwrap/imp.rs index b7395a95b..32ab807b4 100644 --- a/text/wrap/src/gsttextwrap/imp.rs +++ b/text/wrap/src/gsttextwrap/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/wrap/src/gsttextwrap/mod.rs b/text/wrap/src/gsttextwrap/mod.rs index 5d9554f58..4493d5ef0 100644 --- a/text/wrap/src/gsttextwrap/mod.rs +++ b/text/wrap/src/gsttextwrap/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/wrap/src/lib.rs b/text/wrap/src/lib.rs index e8b5726d0..642faf499 100644 --- a/text/wrap/src/lib.rs +++ b/text/wrap/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"] @@ -30,7 +21,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/wrap/tests/textwrap.rs b/text/wrap/tests/textwrap.rs index b399156c2..a385f89e9 100644 --- a/text/wrap/tests/textwrap.rs +++ b/text/wrap/tests/textwrap.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::prelude::*; diff --git a/utils/fallbackswitch/Cargo.toml b/utils/fallbackswitch/Cargo.toml index 9bf918093..1ffcb7cc0 100644 --- a/utils/fallbackswitch/Cargo.toml +++ b/utils/fallbackswitch/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-fallbackswitch" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "LGPL-2.1-or-later" +license = "MPL-2.0" edition = "2021" rust-version = "1.56" description = "Fallback Switcher Plugin" diff --git a/utils/fallbackswitch/LICENSE-LGPLv2 b/utils/fallbackswitch/LICENSE-LGPLv2 deleted file mode 120000 index e7646620e..000000000 --- a/utils/fallbackswitch/LICENSE-LGPLv2 +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-LGPLv2
\ No newline at end of file diff --git a/utils/fallbackswitch/LICENSE-MPL-2.0 b/utils/fallbackswitch/LICENSE-MPL-2.0 new file mode 120000 index 000000000..eb5d24fe9 --- /dev/null +++ b/utils/fallbackswitch/LICENSE-MPL-2.0 @@ -0,0 +1 @@ +../../LICENSE-MPL-2.0
\ No newline at end of file diff --git a/utils/fallbackswitch/examples/gtk_fallbackswitch.rs b/utils/fallbackswitch/examples/gtk_fallbackswitch.rs index 7af476455..3728d7cc3 100644 --- a/utils/fallbackswitch/examples/gtk_fallbackswitch.rs +++ b/utils/fallbackswitch/examples/gtk_fallbackswitch.rs @@ -1,19 +1,10 @@ // Copyright (C) 2019 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 gio::prelude::*; diff --git a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs index 5a752ac1d..dea3ee6be 100644 --- a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 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 gst::glib; use gst::prelude::*; diff --git a/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs b/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs index b3a958e25..311b1518d 100644 --- a/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs +++ b/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 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 gst::glib; diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs index 27283d5d9..c1c006de7 100644 --- a/utils/fallbackswitch/src/fallbacksrc/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 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 gst::glib; use gst::prelude::*; diff --git a/utils/fallbackswitch/src/fallbacksrc/mod.rs b/utils/fallbackswitch/src/fallbacksrc/mod.rs index 7532dc309..b639e7ad7 100644 --- a/utils/fallbackswitch/src/fallbacksrc/mod.rs +++ b/utils/fallbackswitch/src/fallbacksrc/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 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 gst::glib; use gst::prelude::*; diff --git a/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs b/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs index 5925b8f83..fc6269db0 100644 --- a/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs @@ -1,20 +1,11 @@ // Copyright (C) 2020 Sebastian Dröge <sebastian@centricular.com> // Copyright (C) 2020 Seungha Yang <seungha@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/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs b/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs index 7a83788df..d3220760e 100644 --- a/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs +++ b/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs @@ -1,20 +1,11 @@ // Copyright (C) 2020 Sebastian Dröge <sebastian@centricular.com> // Copyright (C) 2020 Seungha Yang <seungha@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; diff --git a/utils/fallbackswitch/src/fallbackswitch/imp.rs b/utils/fallbackswitch/src/fallbackswitch/imp.rs index 7162d94b8..0d0b4d3e7 100644 --- a/utils/fallbackswitch/src/fallbackswitch/imp.rs +++ b/utils/fallbackswitch/src/fallbackswitch/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2019 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 gst::glib; diff --git a/utils/fallbackswitch/src/fallbackswitch/mod.rs b/utils/fallbackswitch/src/fallbackswitch/mod.rs index 985801a4c..c1a247284 100644 --- a/utils/fallbackswitch/src/fallbackswitch/mod.rs +++ b/utils/fallbackswitch/src/fallbackswitch/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2019 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 gst::glib; use gst::prelude::*; diff --git a/utils/fallbackswitch/src/lib.rs b/utils/fallbackswitch/src/lib.rs index 0c5b1c8c4..0882f5ebe 100644 --- a/utils/fallbackswitch/src/lib.rs +++ b/utils/fallbackswitch/src/lib.rs @@ -1,19 +1,10 @@ // Copyright (C) 2019 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 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; @@ -32,7 +23,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/utils/fallbackswitch/tests/fallbackswitch.rs b/utils/fallbackswitch/tests/fallbackswitch.rs index a978f7477..34371131d 100644 --- a/utils/fallbackswitch/tests/fallbackswitch.rs +++ b/utils/fallbackswitch/tests/fallbackswitch.rs @@ -1,19 +1,10 @@ // Copyright (C) 2019 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 gst::gst_debug; use gst::prelude::*; diff --git a/utils/togglerecord/Cargo.toml b/utils/togglerecord/Cargo.toml index 13fc0b3d3..64f3fa4f1 100644 --- a/utils/togglerecord/Cargo.toml +++ b/utils/togglerecord/Cargo.toml @@ -2,7 +2,7 @@ name = "gst-plugin-togglerecord" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] -license = "LGPL-2.1-or-later" +license = "MPL-2.0" description = "Toggle Record Plugin" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" edition = "2021" diff --git a/utils/togglerecord/LICENSE b/utils/togglerecord/LICENSE deleted file mode 100644 index 4362b4915..000000000 --- a/utils/togglerecord/LICENSE +++ /dev/null @@ -1,502 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/utils/togglerecord/LICENSE-LGPLv2 b/utils/togglerecord/LICENSE-LGPLv2 deleted file mode 120000 index e7646620e..000000000 --- a/utils/togglerecord/LICENSE-LGPLv2 +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-LGPLv2
\ No newline at end of file diff --git a/utils/togglerecord/LICENSE-MPL-2.0 b/utils/togglerecord/LICENSE-MPL-2.0 new file mode 120000 index 000000000..eb5d24fe9 --- /dev/null +++ b/utils/togglerecord/LICENSE-MPL-2.0 @@ -0,0 +1 @@ +../../LICENSE-MPL-2.0
\ No newline at end of file diff --git a/utils/togglerecord/examples/gtk_recording.rs b/utils/togglerecord/examples/gtk_recording.rs index 73c66bf21..748e35307 100644 --- a/utils/togglerecord/examples/gtk_recording.rs +++ b/utils/togglerecord/examples/gtk_recording.rs @@ -1,19 +1,10 @@ // Copyright (C) 2017 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 gst::glib; use gst::prelude::*; diff --git a/utils/togglerecord/src/lib.rs b/utils/togglerecord/src/lib.rs index 5827ee268..3b7ff8478 100644 --- a/utils/togglerecord/src/lib.rs +++ b/utils/togglerecord/src/lib.rs @@ -1,19 +1,10 @@ // Copyright (C) 2017 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 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; @@ -29,7 +20,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-2.0", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_NAME"), env!("CARGO_PKG_REPOSITORY"), diff --git a/utils/togglerecord/src/togglerecord/imp.rs b/utils/togglerecord/src/togglerecord/imp.rs index 766869b3a..78a607654 100644 --- a/utils/togglerecord/src/togglerecord/imp.rs +++ b/utils/togglerecord/src/togglerecord/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2017 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 gst::glib; use gst::prelude::*; diff --git a/utils/togglerecord/src/togglerecord/mod.rs b/utils/togglerecord/src/togglerecord/mod.rs index 1c0fa6385..d742fef02 100644 --- a/utils/togglerecord/src/togglerecord/mod.rs +++ b/utils/togglerecord/src/togglerecord/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2017 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 gst::glib; use gst::prelude::*; diff --git a/utils/togglerecord/tests/tests.rs b/utils/togglerecord/tests/tests.rs index ad926e2f4..18c3df7dd 100644 --- a/utils/togglerecord/tests/tests.rs +++ b/utils/togglerecord/tests/tests.rs @@ -1,19 +1,10 @@ // Copyright (C) 2017 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 gst::prelude::*; diff --git a/video/closedcaption/Cargo.toml b/video/closedcaption/Cargo.toml index 882d4ee06..8acb2dc6a 100644 --- a/video/closedcaption/Cargo.toml +++ b/video/closedcaption/Cargo.toml @@ -2,7 +2,7 @@ name = "gst-plugin-closedcaption" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>", "Jordan Petridis <jordan@centricular.com>", "Matthew Waters <matthew@centricular.com>"] -license = "LGPL-2.1-or-later" +license = "MPL-2.0" edition = "2021" rust-version = "1.56" description = "Rust Closed Caption Plugin" diff --git a/video/closedcaption/LICENSE-LGPLv2 b/video/closedcaption/LICENSE-LGPLv2 deleted file mode 120000 index e7646620e..000000000 --- a/video/closedcaption/LICENSE-LGPLv2 +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-LGPLv2
\ No newline at end of file diff --git a/video/closedcaption/LICENSE-MPL-2.0 b/video/closedcaption/LICENSE-MPL-2.0 new file mode 120000 index 000000000..eb5d24fe9 --- /dev/null +++ b/video/closedcaption/LICENSE-MPL-2.0 @@ -0,0 +1 @@ +../../LICENSE-MPL-2.0
\ No newline at end of file diff --git a/video/closedcaption/src/caption_frame.rs b/video/closedcaption/src/caption_frame.rs index 724757500..dda738cc7 100644 --- a/video/closedcaption/src/caption_frame.rs +++ b/video/closedcaption/src/caption_frame.rs @@ -1,10 +1,10 @@ // Copyright (C) 2020 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use super::ffi; use std::mem; diff --git a/video/closedcaption/src/ccdetect/imp.rs b/video/closedcaption/src/ccdetect/imp.rs index cd85cde84..9d3a3075b 100644 --- a/video/closedcaption/src/ccdetect/imp.rs +++ b/video/closedcaption/src/ccdetect/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Matthew Waters <matthew@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/video/closedcaption/src/ccdetect/mod.rs b/video/closedcaption/src/ccdetect/mod.rs index 4f1a83114..0aa65d0dc 100644 --- a/video/closedcaption/src/ccdetect/mod.rs +++ b/video/closedcaption/src/ccdetect/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Matthew Waters <matthew@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/video/closedcaption/src/ccutils.rs b/video/closedcaption/src/ccutils.rs index 8d7fdadfd..5be0ed173 100644 --- a/video/closedcaption/src/ccutils.rs +++ b/video/closedcaption/src/ccutils.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Matthew Waters <matthew@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 byteorder::{BigEndian, ByteOrder}; use std::fmt; diff --git a/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs index 66065664d..4e859b1e8 100644 --- a/video/closedcaption/src/cea608overlay/imp.rs +++ b/video/closedcaption/src/cea608overlay/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/video/closedcaption/src/cea608overlay/mod.rs b/video/closedcaption/src/cea608overlay/mod.rs index 61c4ee23b..bdc62cac2 100644 --- a/video/closedcaption/src/cea608overlay/mod.rs +++ b/video/closedcaption/src/cea608overlay/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 // Example command-line: // diff --git a/video/closedcaption/src/cea608tojson/imp.rs b/video/closedcaption/src/cea608tojson/imp.rs index 8f11a61d0..c498691ab 100644 --- a/video/closedcaption/src/cea608tojson/imp.rs +++ b/video/closedcaption/src/cea608tojson/imp.rs @@ -1,10 +1,10 @@ // Copyright (C) 2021 Mathieu Duponchelle <mathieu@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 // TODO: // diff --git a/video/closedcaption/src/cea608tojson/mod.rs b/video/closedcaption/src/cea608tojson/mod.rs index 42bbef79f..02ffc7684 100644 --- a/video/closedcaption/src/cea608tojson/mod.rs +++ b/video/closedcaption/src/cea608tojson/mod.rs @@ -1,10 +1,10 @@ // Copyright (C) 2021 Mathieu Duponchelle <mathieu@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/src/cea608tott/imp.rs b/video/closedcaption/src/cea608tott/imp.rs index 120ab7599..85d003ccd 100644 --- a/video/closedcaption/src/cea608tott/imp.rs +++ b/video/closedcaption/src/cea608tott/imp.rs @@ -1,10 +1,10 @@ // Copyright (C) 2020 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/src/cea608tott/mod.rs b/video/closedcaption/src/cea608tott/mod.rs index dadcf01ab..86f8b69d7 100644 --- a/video/closedcaption/src/cea608tott/mod.rs +++ b/video/closedcaption/src/cea608tott/mod.rs @@ -1,10 +1,10 @@ // Copyright (C) 2020 Sebastian Dröge <sebastian@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/src/jsontovtt/fku.rs b/video/closedcaption/src/jsontovtt/fku.rs index 854e0cc6c..09b9b02db 100644 --- a/video/closedcaption/src/jsontovtt/fku.rs +++ b/video/closedcaption/src/jsontovtt/fku.rs @@ -1,10 +1,10 @@ // Copyright (C) 2021 Jan Schmidt <jan@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use std::cmp::Ordering; diff --git a/video/closedcaption/src/jsontovtt/imp.rs b/video/closedcaption/src/jsontovtt/imp.rs index 21eadfeeb..554898800 100644 --- a/video/closedcaption/src/jsontovtt/imp.rs +++ b/video/closedcaption/src/jsontovtt/imp.rs @@ -1,11 +1,11 @@ // Copyright (C) 2021 Mathieu Duponchelle <mathieu@centricular.com> // Copyright (C) 2021 Jan Schmidt <jan@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/src/jsontovtt/mod.rs b/video/closedcaption/src/jsontovtt/mod.rs index 6a673dc47..8e57133f8 100644 --- a/video/closedcaption/src/jsontovtt/mod.rs +++ b/video/closedcaption/src/jsontovtt/mod.rs @@ -1,10 +1,10 @@ // Copyright (C) 2021 Jan Schmidt <jan@centricular.com> // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// 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/>. +// +// SPDX-License-Identifier: MPL-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/src/lib.rs b/video/closedcaption/src/lib.rs index a15c2f46e..8bae593d5 100644 --- a/video/closedcaption/src/lib.rs +++ b/video/closedcaption/src/lib.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 #![allow(clippy::non_send_fields_in_send_ty)] #![recursion_limit = "128"] @@ -63,7 +54,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/video/closedcaption/src/line_reader.rs b/video/closedcaption/src/line_reader.rs index 1d64d128f..4f9ceef0f 100644 --- a/video/closedcaption/src/line_reader.rs +++ b/video/closedcaption/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/video/closedcaption/src/mcc_enc/headers.rs b/video/closedcaption/src/mcc_enc/headers.rs index 6995c99c3..63faf141b 100644 --- a/video/closedcaption/src/mcc_enc/headers.rs +++ b/video/closedcaption/src/mcc_enc/headers.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 pub const PREAMBLE_V1: &[u8] = b"File Format=MacCaption_MCC V1.0\r\n\ \r\n\ diff --git a/video/closedcaption/src/mcc_enc/imp.rs b/video/closedcaption/src/mcc_enc/imp.rs index eccf7183d..5bce00598 100644 --- a/video/closedcaption/src/mcc_enc/imp.rs +++ b/video/closedcaption/src/mcc_enc/imp.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 gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/src/mcc_enc/mod.rs b/video/closedcaption/src/mcc_enc/mod.rs index 2d9a9ac43..978bed90e 100644 --- a/video/closedcaption/src/mcc_enc/mod.rs +++ b/video/closedcaption/src/mcc_enc/mod.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 gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs index fc479a0dc..b48221c19 100644 --- a/video/closedcaption/src/mcc_parse/imp.rs +++ b/video/closedcaption/src/mcc_parse/imp.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 gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/src/mcc_parse/mod.rs b/video/closedcaption/src/mcc_parse/mod.rs index b4ef031dd..15b9b4cf6 100644 --- a/video/closedcaption/src/mcc_parse/mod.rs +++ b/video/closedcaption/src/mcc_parse/mod.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 gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/src/mcc_parse/parser.rs b/video/closedcaption/src/mcc_parse/parser.rs index d52bd2f44..0d818e1ed 100644 --- a/video/closedcaption/src/mcc_parse/parser.rs +++ b/video/closedcaption/src/mcc_parse/parser.rs @@ -1,19 +1,10 @@ // Copyright (C) 2018,2020 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 either::Either; diff --git a/video/closedcaption/src/parser_utils.rs b/video/closedcaption/src/parser_utils.rs index cdfcc8052..26a2853b5 100644 --- a/video/closedcaption/src/parser_utils.rs +++ b/video/closedcaption/src/parser_utils.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 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 nom::IResult; diff --git a/video/closedcaption/src/scc_enc/imp.rs b/video/closedcaption/src/scc_enc/imp.rs index 5a7ac6277..60598d701 100644 --- a/video/closedcaption/src/scc_enc/imp.rs +++ b/video/closedcaption/src/scc_enc/imp.rs @@ -1,20 +1,11 @@ // Copyright (C) 2019 Sebastian Dröge <sebastian@centricular.com> // Copyright (C) 2019 Jordan Petridis <jordan@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/video/closedcaption/src/scc_enc/mod.rs b/video/closedcaption/src/scc_enc/mod.rs index e157456be..44527fc70 100644 --- a/video/closedcaption/src/scc_enc/mod.rs +++ b/video/closedcaption/src/scc_enc/mod.rs @@ -1,20 +1,11 @@ // Copyright (C) 2019 Sebastian Dröge <sebastian@centricular.com> // Copyright (C) 2019 Jordan Petridis <jordan@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/video/closedcaption/src/scc_parse/imp.rs b/video/closedcaption/src/scc_parse/imp.rs index 6eef93724..b4ac750c7 100644 --- a/video/closedcaption/src/scc_parse/imp.rs +++ b/video/closedcaption/src/scc_parse/imp.rs @@ -1,20 +1,11 @@ // Copyright (C) 2019 Sebastian Dröge <sebastian@centricular.com> // Copyright (C) 2019 Jordan Petridis <jordan@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/video/closedcaption/src/scc_parse/mod.rs b/video/closedcaption/src/scc_parse/mod.rs index 2a74e294d..6d6714ff5 100644 --- a/video/closedcaption/src/scc_parse/mod.rs +++ b/video/closedcaption/src/scc_parse/mod.rs @@ -1,20 +1,11 @@ // Copyright (C) 2019 Sebastian Dröge <sebastian@centricular.com> // Copyright (C) 2019 Jordan Petridis <jordan@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/video/closedcaption/src/scc_parse/parser.rs b/video/closedcaption/src/scc_parse/parser.rs index 903ee9bda..603112d79 100644 --- a/video/closedcaption/src/scc_parse/parser.rs +++ b/video/closedcaption/src/scc_parse/parser.rs @@ -1,20 +1,11 @@ // Copyright (C) 2019,2020 Sebastian Dröge <sebastian@centricular.com> // Copyright (C) 2019 Jordan Petridis <jordan@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 crate::parser_utils::{end_of_line, timecode, TimeCode}; use nom::IResult; diff --git a/video/closedcaption/src/transcriberbin/imp.rs b/video/closedcaption/src/transcriberbin/imp.rs index aa084acca..62e6dad9f 100644 --- a/video/closedcaption/src/transcriberbin/imp.rs +++ b/video/closedcaption/src/transcriberbin/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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 crate::ttutils::Cea608Mode; use anyhow::Error; diff --git a/video/closedcaption/src/transcriberbin/mod.rs b/video/closedcaption/src/transcriberbin/mod.rs index 56e74d53a..8c7d194c0 100644 --- a/video/closedcaption/src/transcriberbin/mod.rs +++ b/video/closedcaption/src/transcriberbin/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs index f058f419c..442785c79 100644 --- a/video/closedcaption/src/tttocea608/imp.rs +++ b/video/closedcaption/src/tttocea608/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/video/closedcaption/src/tttocea608/mod.rs b/video/closedcaption/src/tttocea608/mod.rs index 165490587..24279b01d 100644 --- a/video/closedcaption/src/tttocea608/mod.rs +++ b/video/closedcaption/src/tttocea608/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/video/closedcaption/src/tttojson/imp.rs b/video/closedcaption/src/tttojson/imp.rs index 616ac2aba..58f50a64a 100644 --- a/video/closedcaption/src/tttojson/imp.rs +++ b/video/closedcaption/src/tttojson/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::gst_log; diff --git a/video/closedcaption/src/tttojson/mod.rs b/video/closedcaption/src/tttojson/mod.rs index b79be3c81..60a2df9dc 100644 --- a/video/closedcaption/src/tttojson/mod.rs +++ b/video/closedcaption/src/tttojson/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/video/closedcaption/src/ttutils.rs b/video/closedcaption/src/ttutils.rs index 5223f282d..1c8d729ad 100644 --- a/video/closedcaption/src/ttutils.rs +++ b/video/closedcaption/src/ttutils.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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 serde::{Deserialize, Serialize}; diff --git a/video/closedcaption/tests/ccdetect.rs b/video/closedcaption/tests/ccdetect.rs index 1f5f56e5a..57069273f 100644 --- a/video/closedcaption/tests/ccdetect.rs +++ b/video/closedcaption/tests/ccdetect.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Matthew Waters <matthew@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::prelude::*; use gst::ClockTime; diff --git a/video/closedcaption/tests/cea608tott.rs b/video/closedcaption/tests/cea608tott.rs index 05fc4302b..b3169b8be 100644 --- a/video/closedcaption/tests/cea608tott.rs +++ b/video/closedcaption/tests/cea608tott.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 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 gst::prelude::*; use gst::ClockTime; diff --git a/video/closedcaption/tests/mcc_enc.rs b/video/closedcaption/tests/mcc_enc.rs index 58d615187..a35a50f2f 100644 --- a/video/closedcaption/tests/mcc_enc.rs +++ b/video/closedcaption/tests/mcc_enc.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 gst::glib; use gst::prelude::*; diff --git a/video/closedcaption/tests/mcc_parse.rs b/video/closedcaption/tests/mcc_parse.rs index 923f88e01..1c986f0de 100644 --- a/video/closedcaption/tests/mcc_parse.rs +++ b/video/closedcaption/tests/mcc_parse.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 #![allow(clippy::single_match)] diff --git a/video/closedcaption/tests/scc_enc.rs b/video/closedcaption/tests/scc_enc.rs index 884e9e72f..33a068e41 100644 --- a/video/closedcaption/tests/scc_enc.rs +++ b/video/closedcaption/tests/scc_enc.rs @@ -1,20 +1,11 @@ // Copyright (C) 2019 Sebastian Dröge <sebastian@centricular.com> // Copyright (C) 2019 Jordan Petridis <jordan@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 pretty_assertions::assert_eq; diff --git a/video/closedcaption/tests/scc_parse.rs b/video/closedcaption/tests/scc_parse.rs index 31f62ee1c..b363dd099 100644 --- a/video/closedcaption/tests/scc_parse.rs +++ b/video/closedcaption/tests/scc_parse.rs @@ -1,20 +1,11 @@ // Copyright (C) 2019 Sebastian Dröge <sebastian@centricular.com> // Copyright (C) 2019 Jordan Petridis <jordan@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)] diff --git a/video/closedcaption/tests/tttocea608.rs b/video/closedcaption/tests/tttocea608.rs index 231dffb6b..17b5d3843 100644 --- a/video/closedcaption/tests/tttocea608.rs +++ b/video/closedcaption/tests/tttocea608.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::ClockTime; use pretty_assertions::assert_eq; diff --git a/video/gif/examples/testvideosrc2gif.rs b/video/gif/examples/testvideosrc2gif.rs index 7eb34af0e..056e0dee9 100644 --- a/video/gif/examples/testvideosrc2gif.rs +++ b/video/gif/examples/testvideosrc2gif.rs @@ -1,19 +1,10 @@ // Copyright (C) 2020 Markus Ebner <info@ebner-markus.de> // -// 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 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. +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. use gst::prelude::*; diff --git a/video/gtk4/src/lib.rs b/video/gtk4/src/lib.rs index 575ba5b29..1f8384039 100644 --- a/video/gtk4/src/lib.rs +++ b/video/gtk4/src/lib.rs @@ -24,7 +24,8 @@ gst::plugin_define!( env!("CARGO_PKG_DESCRIPTION"), plugin_init, concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")), - "MIT/X11", + // 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/video/videofx/src/lib.rs b/video/videofx/src/lib.rs index 1eeef67ae..918de42d9 100644 --- a/video/videofx/src/lib.rs +++ b/video/videofx/src/lib.rs @@ -19,7 +19,8 @@ gst::plugin_define!( env!("CARGO_PKG_DESCRIPTION"), plugin_init, concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")), - "MPL-2.0", + // 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/video/webp/Cargo.toml b/video/webp/Cargo.toml index 114e91393..0ddaa4e5e 100644 --- a/video/webp/Cargo.toml +++ b/video/webp/Cargo.toml @@ -2,7 +2,7 @@ name = "gst-plugin-webp" 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 = "WebP Plugin" diff --git a/video/webp/LICENSE-LGPLv2 b/video/webp/LICENSE-LGPLv2 deleted file mode 120000 index e7646620e..000000000 --- a/video/webp/LICENSE-LGPLv2 +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-LGPLv2
\ No newline at end of file diff --git a/video/webp/LICENSE-MPL-2.0 b/video/webp/LICENSE-MPL-2.0 new file mode 120000 index 000000000..eb5d24fe9 --- /dev/null +++ b/video/webp/LICENSE-MPL-2.0 @@ -0,0 +1 @@ +../../LICENSE-MPL-2.0
\ No newline at end of file diff --git a/video/webp/src/dec/imp.rs b/video/webp/src/dec/imp.rs index 0b8660a30..c8e3b91b9 100644 --- a/video/webp/src/dec/imp.rs +++ b/video/webp/src/dec/imp.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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/video/webp/src/dec/mod.rs b/video/webp/src/dec/mod.rs index b670a1900..823520f0d 100644 --- a/video/webp/src/dec/mod.rs +++ b/video/webp/src/dec/mod.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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 // Example command-line: // diff --git a/video/webp/src/lib.rs b/video/webp/src/lib.rs index 8a1d50298..079f14d3a 100644 --- a/video/webp/src/lib.rs +++ b/video/webp/src/lib.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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)] use gst::glib; @@ -30,7 +21,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/video/webp/tests/webpdec.rs b/video/webp/tests/webpdec.rs index 4d8e2dd3a..a7b4e2c65 100644 --- a/video/webp/tests/webpdec.rs +++ b/video/webp/tests/webpdec.rs @@ -1,19 +1,10 @@ // Copyright (C) 2021 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::prelude::*; use pretty_assertions::assert_eq; |