From b01b9711dcef6dc5a0774b128a0277d0d5ddc90d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 14 Mar 2022 10:22:53 +0200 Subject: [PATCH] Use SPDX license format in Cargo.toml --- audio/claxon/Cargo.toml | 2 +- audio/claxon/src/claxondec/imp.rs | 2 +- audio/claxon/src/claxondec/mod.rs | 2 +- audio/claxon/src/lib.rs | 2 +- audio/claxon/tests/claxondec.rs | 2 +- audio/lewton/Cargo.toml | 2 +- audio/lewton/src/lewtondec/imp.rs | 2 +- audio/lewton/src/lewtondec/mod.rs | 2 +- audio/lewton/src/lib.rs | 2 +- audio/lewton/tests/lewtondec.rs | 2 +- generic/file/Cargo.toml | 2 +- generic/file/src/file_location.rs | 2 +- generic/file/src/filesink/imp.rs | 2 +- generic/file/src/filesink/mod.rs | 2 +- generic/file/src/filesrc/imp.rs | 2 +- generic/file/src/filesrc/mod.rs | 2 +- generic/file/src/lib.rs | 2 +- net/reqwest/Cargo.toml | 2 +- net/reqwest/src/lib.rs | 2 +- net/reqwest/src/reqwesthttpsrc/imp.rs | 2 +- net/reqwest/src/reqwesthttpsrc/mod.rs | 2 +- net/reqwest/tests/reqwesthttpsrc.rs | 2 +- tutorial/Cargo.toml | 2 +- tutorial/src/identity/imp.rs | 2 +- tutorial/src/identity/mod.rs | 2 +- tutorial/src/lib.rs | 2 +- tutorial/src/progressbin/imp.rs | 2 +- tutorial/src/progressbin/mod.rs | 2 +- tutorial/src/rgb2gray/imp.rs | 2 +- tutorial/src/rgb2gray/mod.rs | 2 +- tutorial/src/sinesrc/imp.rs | 2 +- tutorial/src/sinesrc/mod.rs | 2 +- tutorial/tutorial-1.md | 2 +- video/cdg/Cargo.toml | 2 +- video/cdg/src/cdgdec/imp.rs | 2 +- video/cdg/src/cdgdec/mod.rs | 2 +- video/cdg/src/cdgparse/imp.rs | 2 +- video/cdg/src/cdgparse/mod.rs | 2 +- video/cdg/src/constants.rs | 2 +- video/cdg/src/lib.rs | 2 +- video/cdg/src/typefind.rs | 2 +- video/cdg/tests/cdgdec.rs | 2 +- video/dav1d/Cargo.toml | 2 +- video/dav1d/src/dav1ddec/imp.rs | 2 +- video/dav1d/src/dav1ddec/mod.rs | 2 +- video/dav1d/src/lib.rs | 2 +- video/ffv1/Cargo.toml | 2 +- video/ffv1/src/ffv1dec/imp.rs | 2 +- video/ffv1/src/ffv1dec/mod.rs | 2 +- video/ffv1/src/lib.rs | 2 +- video/ffv1/tests/ffv1dec.rs | 2 +- video/flavors/Cargo.toml | 2 +- video/flavors/src/bytes.rs | 2 +- video/flavors/src/flvdemux/imp.rs | 2 +- video/flavors/src/flvdemux/mod.rs | 2 +- video/flavors/src/lib.rs | 2 +- video/gif/Cargo.toml | 2 +- video/gif/examples/testvideosrc2gif.rs | 2 +- video/gif/src/gifenc/imp.rs | 2 +- video/gif/src/gifenc/mod.rs | 2 +- video/gif/src/lib.rs | 2 +- video/gif/tests/gifenc.rs | 2 +- video/hsv/Cargo.toml | 2 +- video/hsv/src/hsvdetector/imp.rs | 2 +- video/hsv/src/hsvdetector/mod.rs | 2 +- video/hsv/src/hsvfilter/imp.rs | 2 +- video/hsv/src/hsvfilter/mod.rs | 2 +- video/hsv/src/hsvutils.rs | 2 +- video/hsv/src/lib.rs | 2 +- video/rav1e/Cargo.toml | 2 +- video/rav1e/src/lib.rs | 2 +- video/rav1e/src/rav1enc/imp.rs | 2 +- video/rav1e/src/rav1enc/mod.rs | 2 +- video/rav1e/tests/rav1enc.rs | 2 +- video/rspng/Cargo.toml | 2 +- video/rspng/examples/pngenc.rs | 2 +- video/rspng/src/lib.rs | 2 +- video/rspng/src/pngenc/imp.rs | 2 +- video/rspng/src/pngenc/mod.rs | 2 +- video/rspng/tests/pngenc.rs | 2 +- 80 files changed, 80 insertions(+), 80 deletions(-) diff --git a/audio/claxon/Cargo.toml b/audio/claxon/Cargo.toml index 1a7407f0..66287b8e 100644 --- a/audio/claxon/Cargo.toml +++ b/audio/claxon/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-claxon" version = "0.8.3" authors = ["Ruben Gonzalez "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Claxon FLAC Decoder Plugin" edition = "2021" rust-version = "1.56" diff --git a/audio/claxon/src/claxondec/imp.rs b/audio/claxon/src/claxondec/imp.rs index 066b9380..8866ff0f 100644 --- a/audio/claxon/src/claxondec/imp.rs +++ b/audio/claxon/src/claxondec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::subclass::prelude::*; diff --git a/audio/claxon/src/claxondec/mod.rs b/audio/claxon/src/claxondec/mod.rs index 1b2a0ba7..c6bdb9d8 100644 --- a/audio/claxon/src/claxondec/mod.rs +++ b/audio/claxon/src/claxondec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/claxon/src/lib.rs b/audio/claxon/src/lib.rs index 1a0c8274..dff70387 100644 --- a/audio/claxon/src/lib.rs +++ b/audio/claxon/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/audio/claxon/tests/claxondec.rs b/audio/claxon/tests/claxondec.rs index 0cd5063f..307dd197 100644 --- a/audio/claxon/tests/claxondec.rs +++ b/audio/claxon/tests/claxondec.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/audio/lewton/Cargo.toml b/audio/lewton/Cargo.toml index c2218db2..29b55e8c 100644 --- a/audio/lewton/Cargo.toml +++ b/audio/lewton/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-lewton" version = "0.8.3" authors = ["Sebastian Dröge "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "lewton Vorbis Decoder Plugin" edition = "2021" rust-version = "1.56" diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs index 56e293f5..e0d6b578 100644 --- a/audio/lewton/src/lewtondec/imp.rs +++ b/audio/lewton/src/lewtondec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::subclass::prelude::*; diff --git a/audio/lewton/src/lewtondec/mod.rs b/audio/lewton/src/lewtondec/mod.rs index 319fc535..b55ae43d 100644 --- a/audio/lewton/src/lewtondec/mod.rs +++ b/audio/lewton/src/lewtondec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/lewton/src/lib.rs b/audio/lewton/src/lib.rs index 0e3b259d..6e49a70b 100644 --- a/audio/lewton/src/lib.rs +++ b/audio/lewton/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/audio/lewton/tests/lewtondec.rs b/audio/lewton/tests/lewtondec.rs index 559d9080..814c2b95 100644 --- a/audio/lewton/tests/lewtondec.rs +++ b/audio/lewton/tests/lewtondec.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/generic/file/Cargo.toml b/generic/file/Cargo.toml index a49d342c..4267ca77 100644 --- a/generic/file/Cargo.toml +++ b/generic/file/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-file" version = "0.8.3" authors = ["Sebastian Dröge "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Rust File Plugin" edition = "2021" rust-version = "1.56" diff --git a/generic/file/src/file_location.rs b/generic/file/src/file_location.rs index daad3b30..83fa75d8 100644 --- a/generic/file/src/file_location.rs +++ b/generic/file/src/file_location.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use url::Url; diff --git a/generic/file/src/filesink/imp.rs b/generic/file/src/filesink/imp.rs index 8b0e9f05..1e210894 100644 --- a/generic/file/src/filesink/imp.rs +++ b/generic/file/src/filesink/imp.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/generic/file/src/filesink/mod.rs b/generic/file/src/filesink/mod.rs index 3df7c152..71bb42cf 100644 --- a/generic/file/src/filesink/mod.rs +++ b/generic/file/src/filesink/mod.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs index dab3b708..4bfc7841 100644 --- a/generic/file/src/filesrc/imp.rs +++ b/generic/file/src/filesrc/imp.rs @@ -7,7 +7,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/generic/file/src/filesrc/mod.rs b/generic/file/src/filesrc/mod.rs index 7ad38da5..e100ac01 100644 --- a/generic/file/src/filesrc/mod.rs +++ b/generic/file/src/filesrc/mod.rs @@ -7,7 +7,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/generic/file/src/lib.rs b/generic/file/src/lib.rs index 9d97d628..cdcf505b 100644 --- a/generic/file/src/lib.rs +++ b/generic/file/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/net/reqwest/Cargo.toml b/net/reqwest/Cargo.toml index 1e45678c..739f8765 100644 --- a/net/reqwest/Cargo.toml +++ b/net/reqwest/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-reqwest" version = "0.8.3" authors = ["Sebastian Dröge "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Rust HTTP Plugin" edition = "2021" rust-version = "1.56" diff --git a/net/reqwest/src/lib.rs b/net/reqwest/src/lib.rs index 34506915..ac421464 100644 --- a/net/reqwest/src/lib.rs +++ b/net/reqwest/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/net/reqwest/src/reqwesthttpsrc/imp.rs b/net/reqwest/src/reqwesthttpsrc/imp.rs index 2622a26e..22cab62b 100644 --- a/net/reqwest/src/reqwesthttpsrc/imp.rs +++ b/net/reqwest/src/reqwesthttpsrc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use std::sync::{Arc, Mutex}; use std::time::Duration; use std::u64; diff --git a/net/reqwest/src/reqwesthttpsrc/mod.rs b/net/reqwest/src/reqwesthttpsrc/mod.rs index e2d5852d..39003ad6 100644 --- a/net/reqwest/src/reqwesthttpsrc/mod.rs +++ b/net/reqwest/src/reqwesthttpsrc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/net/reqwest/tests/reqwesthttpsrc.rs b/net/reqwest/tests/reqwesthttpsrc.rs index e34b8f6a..90c827b9 100644 --- a/net/reqwest/tests/reqwesthttpsrc.rs +++ b/net/reqwest/tests/reqwesthttpsrc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::single_match)] diff --git a/tutorial/Cargo.toml b/tutorial/Cargo.toml index 15baec24..03bf1800 100644 --- a/tutorial/Cargo.toml +++ b/tutorial/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-tutorial" version = "0.8.3" authors = ["Sebastian Dröge "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.56" description = "Rust Tutorial Plugin" diff --git a/tutorial/src/identity/imp.rs b/tutorial/src/identity/imp.rs index a48311ad..426fa59d 100644 --- a/tutorial/src/identity/imp.rs +++ b/tutorial/src/identity/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/identity/mod.rs b/tutorial/src/identity/mod.rs index 67fbac19..bbe1a5f7 100644 --- a/tutorial/src/identity/mod.rs +++ b/tutorial/src/identity/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/lib.rs b/tutorial/src/lib.rs index 9a4a8eeb..9f7998ef 100644 --- a/tutorial/src/lib.rs +++ b/tutorial/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/tutorial/src/progressbin/imp.rs b/tutorial/src/progressbin/imp.rs index 38a65400..e2f0c12b 100644 --- a/tutorial/src/progressbin/imp.rs +++ b/tutorial/src/progressbin/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::gst_info; diff --git a/tutorial/src/progressbin/mod.rs b/tutorial/src/progressbin/mod.rs index a572125e..792004fe 100644 --- a/tutorial/src/progressbin/mod.rs +++ b/tutorial/src/progressbin/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/rgb2gray/imp.rs b/tutorial/src/rgb2gray/imp.rs index 26cb799a..0703f643 100644 --- a/tutorial/src/rgb2gray/imp.rs +++ b/tutorial/src/rgb2gray/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/rgb2gray/mod.rs b/tutorial/src/rgb2gray/mod.rs index 3473f29c..dbe75af3 100644 --- a/tutorial/src/rgb2gray/mod.rs +++ b/tutorial/src/rgb2gray/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs index 91c5da60..447ea60f 100644 --- a/tutorial/src/sinesrc/imp.rs +++ b/tutorial/src/sinesrc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/sinesrc/mod.rs b/tutorial/src/sinesrc/mod.rs index 7f1887a2..5b5f5d92 100644 --- a/tutorial/src/sinesrc/mod.rs +++ b/tutorial/src/sinesrc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/tutorial-1.md b/tutorial/tutorial-1.md index f1f5688c..d20b535f 100644 --- a/tutorial/tutorial-1.md +++ b/tutorial/tutorial-1.md @@ -35,7 +35,7 @@ name = "gst-plugin-tutorial" version = "0.1.0" authors = ["Sebastian Dröge "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" description = "Rust Tutorial Plugin" diff --git a/video/cdg/Cargo.toml b/video/cdg/Cargo.toml index c991426f..5df6cd74 100644 --- a/video/cdg/Cargo.toml +++ b/video/cdg/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-cdg" version = "0.8.3" authors = ["Guillaume Desmottes "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "CDG Plugin" edition = "2021" rust-version = "1.56" diff --git a/video/cdg/src/cdgdec/imp.rs b/video/cdg/src/cdgdec/imp.rs index 7b4c8510..b798dafb 100644 --- a/video/cdg/src/cdgdec/imp.rs +++ b/video/cdg/src/cdgdec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::gst_debug; diff --git a/video/cdg/src/cdgdec/mod.rs b/video/cdg/src/cdgdec/mod.rs index 71d51993..6fe484cb 100644 --- a/video/cdg/src/cdgdec/mod.rs +++ b/video/cdg/src/cdgdec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/cdg/src/cdgparse/imp.rs b/video/cdg/src/cdgparse/imp.rs index da1fbd2b..a434da43 100644 --- a/video/cdg/src/cdgparse/imp.rs +++ b/video/cdg/src/cdgparse/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::format::Bytes; use gst::glib; diff --git a/video/cdg/src/cdgparse/mod.rs b/video/cdg/src/cdgparse/mod.rs index b5cb2618..7af4a974 100644 --- a/video/cdg/src/cdgparse/mod.rs +++ b/video/cdg/src/cdgparse/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/cdg/src/constants.rs b/video/cdg/src/constants.rs index 69b8cf13..6f11f49c 100644 --- a/video/cdg/src/constants.rs +++ b/video/cdg/src/constants.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 pub(crate) const CDG_PACKET_SIZE: i32 = 24; diff --git a/video/cdg/src/lib.rs b/video/cdg/src/lib.rs index 78a70753..bbf9bcfd 100644 --- a/video/cdg/src/lib.rs +++ b/video/cdg/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/cdg/src/typefind.rs b/video/cdg/src/typefind.rs index 2802c970..feff41ce 100644 --- a/video/cdg/src/typefind.rs +++ b/video/cdg/src/typefind.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; diff --git a/video/cdg/tests/cdgdec.rs b/video/cdg/tests/cdgdec.rs index d5a9ca66..750ab359 100644 --- a/video/cdg/tests/cdgdec.rs +++ b/video/cdg/tests/cdgdec.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; use std::path::PathBuf; diff --git a/video/dav1d/Cargo.toml b/video/dav1d/Cargo.toml index 74afb9cb..f0dc22d7 100644 --- a/video/dav1d/Cargo.toml +++ b/video/dav1d/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Philippe Normand "] edition = "2021" rust-version = "1.56" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Dav1d Plugin" [dependencies] diff --git a/video/dav1d/src/dav1ddec/imp.rs b/video/dav1d/src/dav1ddec/imp.rs index 8b0f6035..b9332ab7 100644 --- a/video/dav1d/src/dav1ddec/imp.rs +++ b/video/dav1d/src/dav1ddec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/dav1d/src/dav1ddec/mod.rs b/video/dav1d/src/dav1ddec/mod.rs index 83e11587..b8d42f75 100644 --- a/video/dav1d/src/dav1ddec/mod.rs +++ b/video/dav1d/src/dav1ddec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/dav1d/src/lib.rs b/video/dav1d/src/lib.rs index ae63f523..a63ee025 100644 --- a/video/dav1d/src/lib.rs +++ b/video/dav1d/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/ffv1/Cargo.toml b/video/ffv1/Cargo.toml index ee894f75..f141c2e3 100644 --- a/video/ffv1/Cargo.toml +++ b/video/ffv1/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-ffv1" version = "0.8.3" authors = ["Arun Raghavan "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "FFV1 Decoder Plugin" edition = "2021" rust-version = "1.56" diff --git a/video/ffv1/src/ffv1dec/imp.rs b/video/ffv1/src/ffv1dec/imp.rs index 81a31e24..a8ff4c91 100644 --- a/video/ffv1/src/ffv1dec/imp.rs +++ b/video/ffv1/src/ffv1dec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use ffv1::constants::{RGB, YCBCR}; use ffv1::decoder::{Decoder, Frame}; diff --git a/video/ffv1/src/ffv1dec/mod.rs b/video/ffv1/src/ffv1dec/mod.rs index dfbc2dd8..767439da 100644 --- a/video/ffv1/src/ffv1dec/mod.rs +++ b/video/ffv1/src/ffv1dec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/ffv1/src/lib.rs b/video/ffv1/src/lib.rs index 03572c2d..2fb0e972 100644 --- a/video/ffv1/src/lib.rs +++ b/video/ffv1/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] mod ffv1dec; diff --git a/video/ffv1/tests/ffv1dec.rs b/video/ffv1/tests/ffv1dec.rs index a431ff4c..dd5b9c30 100644 --- a/video/ffv1/tests/ffv1dec.rs +++ b/video/ffv1/tests/ffv1dec.rs @@ -7,7 +7,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/flavors/Cargo.toml b/video/flavors/Cargo.toml index d498fe99..e660abf0 100644 --- a/video/flavors/Cargo.toml +++ b/video/flavors/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-flavors" version = "0.8.3" authors = ["Sebastian Dröge "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.56" description = "Rust FLV Plugin" diff --git a/video/flavors/src/bytes.rs b/video/flavors/src/bytes.rs index f02b8166..02263993 100644 --- a/video/flavors/src/bytes.rs +++ b/video/flavors/src/bytes.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 pub use byteorder::{BigEndian, LittleEndian, ReadBytesExt, WriteBytesExt}; use std::io; diff --git a/video/flavors/src/flvdemux/imp.rs b/video/flavors/src/flvdemux/imp.rs index b210ed1e..8fab28e8 100644 --- a/video/flavors/src/flvdemux/imp.rs +++ b/video/flavors/src/flvdemux/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use std::cmp; use std::sync::Mutex; diff --git a/video/flavors/src/flvdemux/mod.rs b/video/flavors/src/flvdemux/mod.rs index f0415bcc..4926320e 100644 --- a/video/flavors/src/flvdemux/mod.rs +++ b/video/flavors/src/flvdemux/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/flavors/src/lib.rs b/video/flavors/src/lib.rs index 70d0a498..95bf6501 100644 --- a/video/flavors/src/lib.rs +++ b/video/flavors/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/gif/Cargo.toml b/video/gif/Cargo.toml index 49c94b16..a652626d 100644 --- a/video/gif/Cargo.toml +++ b/video/gif/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-gif" version = "0.8.3" authors = ["Markus Ebner "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.56" description = "GStreamer GIF plugin" diff --git a/video/gif/examples/testvideosrc2gif.rs b/video/gif/examples/testvideosrc2gif.rs index 106f4ffa..4e7848b2 100644 --- a/video/gif/examples/testvideosrc2gif.rs +++ b/video/gif/examples/testvideosrc2gif.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/video/gif/src/gifenc/imp.rs b/video/gif/src/gifenc/imp.rs index 39b64cfe..371bad91 100644 --- a/video/gif/src/gifenc/imp.rs +++ b/video/gif/src/gifenc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use atomic_refcell::AtomicRefCell; use gst::glib; diff --git a/video/gif/src/gifenc/mod.rs b/video/gif/src/gifenc/mod.rs index 87ebc62c..12bd617f 100644 --- a/video/gif/src/gifenc/mod.rs +++ b/video/gif/src/gifenc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/gif/src/lib.rs b/video/gif/src/lib.rs index 25cf64df..0ae16abf 100644 --- a/video/gif/src/lib.rs +++ b/video/gif/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/gif/tests/gifenc.rs b/video/gif/tests/gifenc.rs index 525b3e46..8d9ce9a6 100644 --- a/video/gif/tests/gifenc.rs +++ b/video/gif/tests/gifenc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 fn init() { use std::sync::Once; diff --git a/video/hsv/Cargo.toml b/video/hsv/Cargo.toml index 1dcee8f6..7af46632 100644 --- a/video/hsv/Cargo.toml +++ b/video/hsv/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-hsv" version = "0.8.3" authors = ["Julien Bardagi "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.56" description = "HSV manipulation elements, written in Rust" diff --git a/video/hsv/src/hsvdetector/imp.rs b/video/hsv/src/hsvdetector/imp.rs index 36e3891c..ed8d05a1 100644 --- a/video/hsv/src/hsvdetector/imp.rs +++ b/video/hsv/src/hsvdetector/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/hsv/src/hsvdetector/mod.rs b/video/hsv/src/hsvdetector/mod.rs index 66140707..80530b0a 100644 --- a/video/hsv/src/hsvdetector/mod.rs +++ b/video/hsv/src/hsvdetector/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/hsv/src/hsvfilter/imp.rs b/video/hsv/src/hsvfilter/imp.rs index 391de8a9..2573043d 100644 --- a/video/hsv/src/hsvfilter/imp.rs +++ b/video/hsv/src/hsvfilter/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::gst_info; diff --git a/video/hsv/src/hsvfilter/mod.rs b/video/hsv/src/hsvfilter/mod.rs index 95f83202..561dd014 100644 --- a/video/hsv/src/hsvfilter/mod.rs +++ b/video/hsv/src/hsvfilter/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/hsv/src/hsvutils.rs b/video/hsv/src/hsvutils.rs index 5577e591..c1d7ad4c 100644 --- a/video/hsv/src/hsvutils.rs +++ b/video/hsv/src/hsvutils.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 // Reference used for implementation: https://en.wikipedia.org/wiki/HSL_and_HSV diff --git a/video/hsv/src/lib.rs b/video/hsv/src/lib.rs index 7b56aefc..f2ea26b3 100644 --- a/video/hsv/src/lib.rs +++ b/video/hsv/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/rav1e/Cargo.toml b/video/rav1e/Cargo.toml index 84faddae..2ffa89ae 100644 --- a/video/rav1e/Cargo.toml +++ b/video/rav1e/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-rav1e" version = "0.8.3" authors = ["Sebastian Dröge "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "rav1e AV1 Encoder Plugin" edition = "2021" rust-version = "1.56" diff --git a/video/rav1e/src/lib.rs b/video/rav1e/src/lib.rs index 6e5b42c8..bfc8bf9d 100644 --- a/video/rav1e/src/lib.rs +++ b/video/rav1e/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/rav1e/src/rav1enc/imp.rs b/video/rav1e/src/rav1enc/imp.rs index 4929b60c..62eea2c3 100644 --- a/video/rav1e/src/rav1enc/imp.rs +++ b/video/rav1e/src/rav1enc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use atomic_refcell::AtomicRefCell; use gst::glib; diff --git a/video/rav1e/src/rav1enc/mod.rs b/video/rav1e/src/rav1enc/mod.rs index 09269cf7..016f5822 100644 --- a/video/rav1e/src/rav1enc/mod.rs +++ b/video/rav1e/src/rav1enc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/rav1e/tests/rav1enc.rs b/video/rav1e/tests/rav1enc.rs index 85619a05..13d8a063 100644 --- a/video/rav1e/tests/rav1enc.rs +++ b/video/rav1e/tests/rav1enc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/video/rspng/Cargo.toml b/video/rspng/Cargo.toml index f65cdd4c..31f9b63e 100644 --- a/video/rspng/Cargo.toml +++ b/video/rspng/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-rspng" version = "0.8.3" authors = ["Natanael Mojica "] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.56" description = "An PNG encoder/decoder written in pure Rust" diff --git a/video/rspng/examples/pngenc.rs b/video/rspng/examples/pngenc.rs index d543b912..0ed81975 100644 --- a/video/rspng/examples/pngenc.rs +++ b/video/rspng/examples/pngenc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/video/rspng/src/lib.rs b/video/rspng/src/lib.rs index 38040e41..d05a4d73 100644 --- a/video/rspng/src/lib.rs +++ b/video/rspng/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/rspng/src/pngenc/imp.rs b/video/rspng/src/pngenc/imp.rs index 704c767e..cf3c3912 100644 --- a/video/rspng/src/pngenc/imp.rs +++ b/video/rspng/src/pngenc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use std::{io, io::Write, sync::Arc}; diff --git a/video/rspng/src/pngenc/mod.rs b/video/rspng/src/pngenc/mod.rs index ca7c62a3..b19215b6 100644 --- a/video/rspng/src/pngenc/mod.rs +++ b/video/rspng/src/pngenc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/rspng/tests/pngenc.rs b/video/rspng/tests/pngenc.rs index ace393d2..bcac6e1f 100644 --- a/video/rspng/tests/pngenc.rs +++ b/video/rspng/tests/pngenc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 fn init() { use std::sync::Once;