diff --git a/.gitignore b/.gitignore index 4aa9a6a..0d97992 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /testfiles.tar.gz /av-metrics-0.6.2.crate /av-metrics-0.7.2.crate +/av-metrics-0.9.1.crate diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7d9df05 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) +Copyright (c) 2019 Joshua Holmer + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/av-metrics-fix-metadata.diff b/av-metrics-fix-metadata.diff index 13ab2a1..1deffd2 100644 --- a/av-metrics-fix-metadata.diff +++ b/av-metrics-fix-metadata.diff @@ -1,22 +1,32 @@ ---- av-metrics-0.7.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ av-metrics-0.7.2/Cargo.toml 2023-03-12T20:42:38.038076+00:00 -@@ -22,10 +22,6 @@ +--- av-metrics-0.9.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ av-metrics-0.9.1/Cargo.toml 2023-06-27T17:40:10.392321+00:00 +@@ -14,7 +14,7 @@ + name = "av-metrics" + version = "0.9.1" + authors = ["Josh Holmer "] +-include = ["src/**/*"] ++include = ["src/**/*", "LICENSE"] + description = "A collection of algorithms for measuring audio/video metrics" + license = "MIT" + repository = "https://github.com/rust-av/av-metrics" +@@ -22,11 +22,6 @@ + [lib] bench = false - +- -[[bench]] -name = "bench" -path = "benches/bench.rs" -harness = false + [dependencies.crossbeam] version = "0.8" - -@@ -51,8 +47,6 @@ - +@@ -54,8 +49,5 @@ [dependencies.v_frame] - version = "0.2.0" --[dev-dependencies.criterion] --version = "0.3" + version = "0.3.1" +-[dev-dependencies.criterion] +-version = "0.4" +- [dev-dependencies.y4m] - version = "0.7.0" + version = "0.8.0" diff --git a/rust-av-metrics.spec b/rust-av-metrics.spec index 5610855..58740b5 100644 --- a/rust-av-metrics.spec +++ b/rust-av-metrics.spec @@ -5,14 +5,15 @@ %global crate av-metrics Name: rust-av-metrics -Version: 0.7.2 +Version: 0.9.1 Release: %autorelease Summary: Collection of algorithms for measuring audio/video metrics -# https://github.com/rust-av/av-metrics/issues/215 License: MIT URL: https://crates.io/crates/av-metrics -Source: %{crates_source} +Source0: %{crates_source} +# https://github.com/rust-av/av-metrics/pull/297 +Source1: https://github.com/rust-av/av-metrics/raw/1d43898/av_metrics/LICENSE # Manually created patch for downstream crate metadata changes # * drop unused, benchmark-only criterion dev-dependency to speed up builds Patch: av-metrics-fix-metadata.diff @@ -34,6 +35,7 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel +%license %{crate_instdir}/LICENSE %license %{crate_instdir}/src/video/ciede/delta_e/LICENSE %license %{crate_instdir}/src/video/ciede/rgbtolab/LICENSE %{crate_instdir}/ @@ -65,6 +67,7 @@ use the "serde" feature of the "%{crate}" crate. %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +cp -pav %{SOURCE1} . %generate_buildrequires %cargo_generate_buildrequires diff --git a/sources b/sources index 131015d..f83a46a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (av-metrics-0.7.2.crate) = b98571f685a0a3eadf28b2e889964b0a7ac2853405e179e7af349d416506beb8fe18b39cb9cd452a2c0167054d2203d2fc7914e6eefab164b5973f67a0ffcd61 +SHA512 (av-metrics-0.9.1.crate) = 5d9c408a4ff66ef2e163a2d83eea91fc317c80d7e36fc782f4a8b577d6a7e930d9d657f924dabb8ca28c1b2c674fe7f3348b28d6012e1fd592aa857fe98c784f