Merge and update to 0.6.6-3

SOURCES/rav1e-fix-metadata-auto.diff

@@ -1,6 +1,6 @@
 --- rav1e-0.6.6/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ rav1e-0.6.6/Cargo.toml	2023-06-27T18:50:13.590213+00:00
++++ rav1e-0.6.6/Cargo.toml	2023-12-05T15:31:19.481323+00:00
-@@ -342,24 +342,6 @@
+@@ -342,24 +342,7 @@
  unstable = []
  wasm = ["wasm-bindgen"]
  
@@ -25,3 +25,4 @@
  [target."cfg(unix)".dependencies.signal-hook]
  version = "0.3"
  optional = true
++

SOURCES/rav1e-fix-metadata.diff

@@ -1,15 +1,16 @@
 --- rav1e-0.6.6/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ rav1e-0.6.6/Cargo.toml	2023-06-27T18:52:48.813784+00:00
++++ rav1e-0.6.6/Cargo.toml	2023-12-05T15:33:39.388912+00:00
-@@ -30,7 +30,7 @@
+@@ -33,6 +33,9 @@
- default-run = "rav1e"
+ license = "BSD-2-Clause"
- description = "The fastest and safest AV1 encoder"
- readme = "README.md"
--license = "BSD-2-Clause"
-+license = "BSD-2-Clause AND ISC"
  repository = "https://github.com/xiph/rav1e/"
  
++[package.metadata.capi.library]
++version_suffix_components = 1
++
  [package.metadata.docs.rs]
-@@ -72,11 +72,6 @@
+ no-default-features = true
+ 
+@@ -72,11 +75,6 @@
      "unstable",
  ]
  
@@ -21,7 +22,7 @@
  [dependencies.aom-sys]
  version = "0.3.2"
  optional = true
-@@ -88,7 +83,7 @@
+@@ -88,7 +86,7 @@
  version = "0.7"
  
  [dependencies.av-metrics]
@@ -30,7 +31,7 @@
  optional = true
  default-features = false
  
-@@ -111,7 +106,7 @@
+@@ -111,7 +109,7 @@
  version = "1.0"
  
  [dependencies.clap]
@@ -39,7 +40,7 @@
  features = [
      "color",
      "std",
-@@ -125,10 +120,6 @@
+@@ -125,10 +123,6 @@
  version = "4.0.3"
  optional = true
  
@@ -50,7 +51,7 @@
  [dependencies.console]
  version = "0.15"
  optional = true
-@@ -191,9 +182,6 @@
+@@ -191,9 +185,6 @@
  default-features = false
  package = "maybe-rayon"
  
@@ -60,7 +61,7 @@
  [dependencies.scan_fmt]
  version = "0.2.3"
  optional = true
-@@ -221,12 +209,8 @@
+@@ -221,12 +212,8 @@
  [dependencies.v_frame]
  version = "0.3.3"
  
@@ -74,7 +75,7 @@
  optional = true
  
  [dependencies.y4m]
-@@ -234,10 +218,7 @@
+@@ -234,10 +221,7 @@
  optional = true
  
  [dev-dependencies.assert_cmd]
@@ -86,7 +87,7 @@
  
  [dev-dependencies.interpolate_name]
  version = "0.2.2"
-@@ -246,13 +227,13 @@
+@@ -246,13 +230,13 @@
  version = "7.1.1"
  
  [dev-dependencies.predicates]
@@ -103,7 +104,7 @@
  
  [dev-dependencies.pretty_assertions]
  version = "1.3.0"
-@@ -271,10 +252,6 @@
+@@ -271,10 +255,6 @@
  
  [dev-dependencies.semver]
  version = "1.0"
@@ -114,7 +115,7 @@
  
  [build-dependencies.cc]
  version = "1.0"
-@@ -294,7 +271,6 @@
+@@ -294,7 +274,6 @@
      "nasm-rs",
      "cc",
  ]
@@ -122,7 +123,7 @@
  binaries = [
      "ivf",
      "y4m",
-@@ -316,7 +292,6 @@
+@@ -316,7 +295,6 @@
      "asm",
      "threading",
      "signal_support",
@@ -130,7 +131,7 @@
  ]
  desync_finder = ["backtrace"]
  dump_ivf = ["ivf"]
-@@ -324,7 +299,6 @@
+@@ -324,7 +302,6 @@
      "byteorder",
      "image",
  ]
@@ -138,7 +139,7 @@
  quick_test = []
  scenechange = []
  serialize = [
-@@ -335,12 +309,7 @@
+@@ -335,12 +312,7 @@
  ]
  signal_support = ["signal-hook"]
  threading = ["rayon/threads"]

SPECS/rust-rav1e.spec

@@ -1,3 +1,13 @@
+## START: Set by rpmautospec
+## (rpmautospec version 0.3.5)
+## RPMAUTOSPEC: autorelease, autochangelog
+%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
+    release_number = 3;
+    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
+    print(release_number + base_release_number - 1);
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
+## END: Set by rpmautospec
+
 # Generated by rust2rpm 24
 %bcond_without check
 
@@ -33,6 +43,9 @@ Patch:          rav1e-fix-metadata-auto.diff
 # * drop unused and outdated optional clap_lex dependency
 # * drop WASM-specific wasm-bindgen dependency and wasm feature
 # * drop unused, benchmark-only criterion dev-dependency
+# * compatibility fixes for cargo-c v0.9.26 and newer:
+#   https://github.com/lu-zero/cargo-c/pull/346
+#   https://github.com/lu-zero/cargo-c/pull/352
 Patch:          rav1e-fix-metadata.diff
 Patch:          0001-remove-references-to-removed-built-and-rust_hawktrac.patch
 
@@ -577,23 +590,13 @@ echo "cargo-c"
 
 %build
 %cargo_build -f binaries,channel-api,unstable
-%__cargo cbuild --release \
+%cargo_cbuild -f binaries,channel-api,unstable
-    --destdir=%{buildroot} \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir} \
-    --includedir=%{_includedir} \
-    --pkgconfigdir=%{_libdir}/pkgconfig
 %cargo_license_summary -f binaries,channel-api,unstable
 %{cargo_license -f binaries,channel-api,unstable} > LICENSE.dependencies
 
 %install
 %cargo_install -f binaries,channel-api,unstable
-%__cargo cinstall --release \
+%cargo_cinstall  -f binaries,channel-api,unstable
-    --destdir=%{buildroot} \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir} \
-    --includedir=%{_includedir} \
-    --pkgconfigdir=%{_libdir}/pkgconfig
 rm -v %{buildroot}%{_libdir}/librav1e.a
 
 %if %{with check}
@@ -602,9 +605,18 @@ rm -v %{buildroot}%{_libdir}/librav1e.a
 %endif
 
 %changelog
+* Tue Dec 05 2023 Fabio Valentini <decathorpe@gmail.com> - 0.6.6-3
+- Compatibility fixes for cargo-c v0.9.26 and newer
+
+* Tue Dec 05 2023 Fabio Valentini <decathorpe@gmail.com> - 0.6.6-2
+- Migrate to new cargo_cbuild and cargo_cinstall macros
+
 * Fri Oct 13 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.6.6-1
 - Update to 0.6.6
 
+* Wed Jun 28 2023 Fabio Valentini <decathorpe@gmail.com> - 0.6.6-1
+- Update to version 0.6.6; Fixes RHBZ#2149770
+
 * Sun Jul 02 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 0.5.1-8
 - Rebuilt for MSVSphere 9.2
 
@@ -703,3 +715,4 @@ rm -v %{buildroot}%{_libdir}/librav1e.a
 
 * Tue Feb 11 01:28:07 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 0.3.0-1
 - Initial package
+