From 387a43e368ccda88aa6cbc72737c6c7d95dacd5d Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 9 Dec 2024 17:44:34 +0100
Subject: [PATCH] Update to version 3.3.1; Fixes RHBZ#2303330

---
 dolby_vision-fix-metadata.diff | 19 ++++++++++---------
 rust-dolby_vision.spec         | 17 +++++++++++------
 rust2rpm.toml                  |  3 ++-
 sources                        |  2 +-
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/dolby_vision-fix-metadata.diff b/dolby_vision-fix-metadata.diff
index 62d1e9c..9d77415 100644
--- a/dolby_vision-fix-metadata.diff
+++ b/dolby_vision-fix-metadata.diff
@@ -1,20 +1,21 @@
---- dolby_vision-3.3.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ dolby_vision-3.3.0/Cargo.toml	2024-04-19T13:18:11.600532+00:00
-@@ -39,10 +39,7 @@
- 
- [lib]
+--- dolby_vision-3.3.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ dolby_vision-3.3.1/Cargo.toml	2024-12-09T16:42:38.838749+00:00
+@@ -46,11 +46,7 @@
+ name = "dolby_vision"
+ path = "src/lib.rs"
  doctest = false
 -
 -[[bench]]
 -name = "bench_main"
+-path = "benches/bench_main.rs"
 -harness = false
 +crate-type = ["lib", "cdylib"]
  
  [dependencies.anyhow]
- version = "1.0.81"
-@@ -76,9 +73,6 @@
- features = ["preserve_order"]
- optional = true
+ version = "1.0.86"
+@@ -88,9 +84,6 @@
+ version = "1.6.0"
+ features = ["rustc_1_55"]
  
 -[dev-dependencies.criterion]
 -version = "0.5.1"
diff --git a/rust-dolby_vision.spec b/rust-dolby_vision.spec
index 5c3acd2..70ce8b3 100644
--- a/rust-dolby_vision.spec
+++ b/rust-dolby_vision.spec
@@ -1,10 +1,10 @@
-# Generated by rust2rpm 26
-%bcond_without check
+# Generated by rust2rpm 27
+%bcond check 1
 
 %global crate dolby_vision
 
 Name:           rust-dolby_vision
-Version:        3.3.0
+Version:        3.3.1
 Release:        %autorelease
 Summary:        Dolby Vision metadata parsing and writing
 
@@ -12,7 +12,7 @@ License:        MIT
 URL:            https://crates.io/crates/dolby_vision
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
-# * drop unused, benchmark-only criterion dev-dependency to speed up builds
+# * drop unused, benchmark-only criterion dev-dependency
 # * explicitly mark library as a "cdylib" type to fix spec generation
 Patch:          dolby_vision-fix-metadata.diff
 
@@ -30,7 +30,9 @@ Summary:        %{summary}
 # Apache-2.0 OR MIT
 # MIT
 # MIT OR Apache-2.0
-License:        MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT)
+# Unlicense OR MIT
+# Zlib OR Apache-2.0 OR MIT
+License:        MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
 # LICENSE.dependencies contains a full license breakdown
 
 %description -n libdovi %{_description}
@@ -166,7 +168,10 @@ rm %{buildroot}/%{_libdir}/libdovi.a
 %if %{with check}
 %check
 # * skip tests that require files that are not included in published crates
-%cargo_test -a -- -- --skip rpu::generate::tests::config_with_frame_edits --skip xml::tests::parse
+%{cargo_test -a -- -- %{shrink:
+    --skip rpu::generate::tests::config_with_frame_edits
+    --skip xml::tests::parse
+}}
 %endif
 
 %changelog
diff --git a/rust2rpm.toml b/rust2rpm.toml
index e72acf6..22021c4 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,12 +1,13 @@
 [package]
 bin-package-name = "libdovi"
 cargo-toml-patch-comments = [
-    "drop unused, benchmark-only criterion dev-dependency to speed up builds",
+    "drop unused, benchmark-only criterion dev-dependency",
     "explicitly mark library as a \"cdylib\" type to fix spec generation",
 ]
 extra-files = [
     "%{_libdir}/libdovi.so.3{,.*}",
 ]
+suppress-cdylib-install-fixme = true
 
 [features]
 enable-all = true
diff --git a/sources b/sources
index 8f4acc4..98113fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dolby_vision-3.3.0.crate) = 0096aa233565932c4631715c5a9ff83e4215b55ef96ab7dbf854eb4f18fd47fb10e91ff5d01b144cfc50b9fd177748db9326f0bc4f0e9f7aa15391c21c7217e9
+SHA512 (dolby_vision-3.3.1.crate) = f75f3e5641146b1728486ffd03d301d8cdad8c1c5599cf9ee7683c09e3fc8e791c9f163f41845ce674b45409dda546080a3298e43422253f90a2bfab78bbf63f