diff --git a/.gitignore b/.gitignore index a380cd2..56977c7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /v_frame-0.2.1.crate /v_frame-0.2.5.crate /v_frame-0.3.4.crate +/v_frame-0.3.7.crate diff --git a/0001-remove-noop-hawktracer-macros.patch b/0001-remove-noop-hawktracer-macros.patch deleted file mode 100644 index 79978f1..0000000 --- a/0001-remove-noop-hawktracer-macros.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8a7af9959ad71192951c734e3c91aac5b29165c2 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Tue, 27 Jun 2023 19:32:07 +0200 -Subject: [PATCH] remove noop hawktracer macros - ---- - src/plane.rs | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/plane.rs b/src/plane.rs -index 7979edc..6e81a24 100644 ---- a/src/plane.rs -+++ b/src/plane.rs -@@ -7,7 +7,6 @@ - // Media Patent License 1.0 was not distributed with this source code in the - // PATENTS file, you can obtain it at www.aomedia.org/license/patent. - --use rust_hawktracer::*; - use std::alloc::handle_alloc_error; - use std::iter::FusedIterator; - use std::marker::PhantomData; -@@ -592,7 +591,6 @@ impl Plane { - /// # Panics - /// - /// - If the current plane's width and height are not at least `SCALE` times the `in_plane`'s -- #[hawktracer(downscale_in_place)] - pub fn downscale_in_place(&self, in_plane: &mut Plane) { - let stride = in_plane.cfg.stride; - let width = in_plane.cfg.width; --- -2.41.0 - diff --git a/0001-remove-noop-profiling-macros.patch b/0001-remove-noop-profiling-macros.patch new file mode 100644 index 0000000..f79369b --- /dev/null +++ b/0001-remove-noop-profiling-macros.patch @@ -0,0 +1,24 @@ +From e8c304aa3a7bff59d8a5cd7d69c3df6cd6704410 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Mon, 15 Jan 2024 16:44:33 +0100 +Subject: [PATCH] remove noop profiling macros + +--- + src/plane.rs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/plane.rs b/src/plane.rs +index 66cfa07..0c5fe73 100644 +--- a/src/plane.rs ++++ b/src/plane.rs +@@ -621,7 +621,6 @@ impl Plane { + /// # Panics + /// + /// - If the current plane's width and height are not at least `SCALE` times the `in_plane`'s +- #[profiling::function(downscale_in_place)] + pub fn downscale_in_place(&self, in_plane: &mut Plane) { + let stride = in_plane.cfg.stride; + let width = in_plane.cfg.width; +-- +2.43.0 + diff --git a/rust-v_frame.spec b/rust-v_frame.spec index e88fca5..76c496b 100644 --- a/rust-v_frame.spec +++ b/rust-v_frame.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate v_frame Name: rust-v_frame -Version: 0.3.4 +Version: 0.3.7 Release: %autorelease Summary: Video Frame data structures, originally part of rav1e @@ -13,13 +13,13 @@ License: BSD-2-Clause URL: https://crates.io/crates/v_frame Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# * drop unused, no-op rust_hawktracer dependency and tracing feature +# * drop unused, no-op tracing/profiling support # * drop WASM-specific wasm-bindgen dependency and wasm feature # * drop unused, benchmark-only criterion dev-dependency Patch: v_frame-fix-metadata.diff -Patch: 0001-remove-noop-hawktracer-macros.patch +Patch: 0001-remove-noop-profiling-macros.patch -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Video Frame data structures, originally part of rav1e.} @@ -78,7 +78,7 @@ use the "serialize" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires diff --git a/sources b/sources index b7f33f0..5d3b40d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v_frame-0.3.4.crate) = 04dfe50c2aa23e0eee9b7a5075a46ca1aa2864e3e6e9e3831d3f0cfe38337e8b7ca7e22184d8af3af3c25d3afb2e59521654daff321885b3332e98b060d47b55 +SHA512 (v_frame-0.3.7.crate) = 4d521513d0129ba37458a44bc423df9ae53d3ae108e818125f1611890fdf78f9367589677a3fab84f5f6d37223a0b454fc162f545392f6a19e4c5a7b2b83243e diff --git a/v_frame-fix-metadata.diff b/v_frame-fix-metadata.diff index d8798eb..adf6607 100644 --- a/v_frame-fix-metadata.diff +++ b/v_frame-fix-metadata.diff @@ -1,26 +1,44 @@ ---- v_frame-0.3.4/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ v_frame-0.3.4/Cargo.toml 2023-06-27T17:27:48.196399+00:00 -@@ -35,23 +35,10 @@ +--- v_frame-0.3.7/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ v_frame-0.3.7/Cargo.toml 2024-01-15T15:41:08.434659+00:00 +@@ -19,10 +19,6 @@ + license = "BSD-2-Clause" + repository = "https://github.com/rust-av/v_frame" + +-[[bench]] +-name = "bench" +-harness = false +- + [dependencies.cfg-if] + version = "1.0" + +@@ -35,30 +31,10 @@ [dependencies.num-traits] version = "0.2" --[dependencies.rust_hawktracer] --version = "0.7.0" +-[dependencies.profiling] +-version = "1" - [dependencies.serde] version = "1.0" features = ["derive"] optional = true +-[dependencies.tracing] +-version = "0.1.40" +-optional = true +- -[dependencies.wasm-bindgen] -version = "0.2.63" -optional = true - -[dev-dependencies.criterion] --version = "0.4" +-version = "0.5" -features = ["html_reports"] - [features] serialize = ["serde"] --tracing = ["rust_hawktracer/profiling_enabled"] +-tracing = [ +- "profiling/profile-with-tracing", +- "dep:tracing", +-] -wasm = ["wasm-bindgen"]