From 220abc9d65c385cc4eb125e58477d8c49a0bd1a0d312bb320f32d2648d66f423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Feb 2025 10:03:43 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main rav1e revision 3d37eeda900dfb8e2ea842f6d4770c9a --- README.suse-maint | 18 +++++------------- _service | 5 +---- baselibs.conf | 2 +- cargo_config | 5 ----- rav1e-0.6.6.obscpio | 3 --- rav1e-0.7.1.obscpio | 3 +++ rav1e-cargo-no-git-default.patch | 10 +++++----- rav1e.changes | 18 ++++++++++++++++++ rav1e.obsinfo | 6 +++--- rav1e.spec | 20 +++++++++----------- vendor.tar.zst | 4 ++-- 11 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 cargo_config delete mode 100644 rav1e-0.6.6.obscpio create mode 100644 rav1e-0.7.1.obscpio diff --git a/README.suse-maint b/README.suse-maint index 80abe77..11f6397 100644 --- a/README.suse-maint +++ b/README.suse-maint @@ -1,25 +1,17 @@ # How to update the rav1e package ## Prerequisites: -You need the download_files and cargo_vendor obs services installed: - zypper in obs-service-download_files obs-service-cargo_vendor +You need the obs_scm and cargo_vendor obs services installed: + zypper in obs-service-obs_scm obs-service-cargo_vendor ## Updating to a new version from upstream -Edit the spec file and update the version variable. +Edit the _service file and update the revision parameter. Download the new source file by running: - osc service ra download_files - -Uncompress the rav1e-%{version}.tar.gz file: - tar xf rav1e-*.tar.gz - -This will create a rav1e-%{version} directory - -Edit the _service file and set the srcdir param -to the extracted directory. + osc service mr obs_scm Run the cargo_vendor service with: - osc service disabledrun + osc service mr cargo_vendor Update the changelog file with the upstream release notes. diff --git a/_service b/_service index 30be2b9..964efc1 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/xiph/rav1e.git @PARENT_TAG@+@TAG_OFFSET@ git - v0.6.6 + v0.7.1 * v(.*)\+0 \1 @@ -20,7 +20,4 @@ zst true - - rav1e - diff --git a/baselibs.conf b/baselibs.conf index 4d1a7dc..9fa5796 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -librav1e0_6 +librav1e0_7 diff --git a/cargo_config b/cargo_config deleted file mode 100644 index 6fb4ff4..0000000 --- a/cargo_config +++ /dev/null @@ -1,5 +0,0 @@ -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" \ No newline at end of file diff --git a/rav1e-0.6.6.obscpio b/rav1e-0.6.6.obscpio deleted file mode 100644 index 6c6784c..0000000 --- a/rav1e-0.6.6.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26fcca27827aa8b3b3c2785e369870e0d039d7272d96d9f4f9a497e6b9444db3 -size 12052493 diff --git a/rav1e-0.7.1.obscpio b/rav1e-0.7.1.obscpio new file mode 100644 index 0000000..11223fb --- /dev/null +++ b/rav1e-0.7.1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92f0133519762d09d72dc0d4f11d474d6da0ea07b4321fa320f0ffaab849b9c6 +size 12341773 diff --git a/rav1e-cargo-no-git-default.patch b/rav1e-cargo-no-git-default.patch index d49be21..3f7bc68 100644 --- a/rav1e-cargo-no-git-default.patch +++ b/rav1e-cargo-no-git-default.patch @@ -1,10 +1,10 @@ -Index: rav1e/Cargo.toml +Index: rav1e-0.7.1/Cargo.toml =================================================================== ---- rav1e.orig/Cargo.toml 2023-01-02 16:54:30.914458207 +0100 -+++ rav1e/Cargo.toml 2023-01-02 17:06:28.018646860 +0100 +--- rav1e-0.7.1.orig/Cargo.toml ++++ rav1e-0.7.1/Cargo.toml @@ -38,7 +38,7 @@ binaries = [ - "av-metrics", - "nom", + "av-metrics", + "nom", ] -default = ["binaries", "asm", "threading", "signal_support", "git_version"] +default = ["binaries", "asm", "threading", "signal_support"] diff --git a/rav1e.changes b/rav1e.changes index 9de1967..cd940e4 100644 --- a/rav1e.changes +++ b/rav1e.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Aug 27 08:43:21 UTC 2024 - Enrico Belleri + +- remove cargo_config: contained in vendor.tar +- remove cargo_audit service: now part of cargo_vendor +- Update to version 0.7.1: + * Remove some now-unneeded dependencies + * Make sure av1-grain matches the rav1e serialize feature (serde is back optional) + * Make sure to use a version of ivf that does not depends on bitstream-io 1 + * More internal cleanups + * Sync up assembly with dav1d 1.2.1 + * More encoder-specific assembly for both x86_64 and aarch64 + * Many internal cleanups and fixes + * The Channel API does not rely on crossbeam-channel anymore + * Initial Speed level rebalance +- Update README.suse-maint +- Update baselibs.conf + ------------------------------------------------------------------- Thu Oct 19 08:38:11 UTC 2023 - bjorn.lie@gmail.com diff --git a/rav1e.obsinfo b/rav1e.obsinfo index 1794fa4..b0ae9ab 100644 --- a/rav1e.obsinfo +++ b/rav1e.obsinfo @@ -1,4 +1,4 @@ name: rav1e -version: 0.6.6 -mtime: 1684219782 -commit: 7c9db10494c2fffa98a572027d756e55bf754036 +version: 0.7.1 +mtime: 1704876138 +commit: a8d05d0c43826a465b60dbadd0ab7f1327d75371 diff --git a/rav1e.spec b/rav1e.spec index 4bdeb8b..25cb65b 100644 --- a/rav1e.spec +++ b/rav1e.spec @@ -1,7 +1,7 @@ # # spec file for package rav1e # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2020 Andreas Schneider . # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: rav1e -Version: 0.6.6 +Version: 0.7.1 Release: 0 Summary: Fastest and safest AV1 encoder # rav1e is published under the terms of the BSD-2-Clause license, @@ -29,7 +29,6 @@ URL: https://github.com/xiph/rav1e # Source0: %{name}-%{version}.tar.zst Source1: vendor.tar.zst -Source2: cargo_config Source98: README.suse-maint Source99: baselibs.conf # @@ -37,7 +36,8 @@ Patch0: rav1e-cargo-no-git-default.patch # BuildRequires: cargo-c > 0.9.26 BuildRequires: cargo-packaging -BuildRequires: nasm +BuildRequires: nasm >= 2.14.02 +BuildRequires: rust >= 1.70.0 %description rav1e is an AV1 video encoder. @@ -62,11 +62,11 @@ rav1e features: * Variable speed settings * Near real-time encoding at high speed levels -%package -n librav1e0_6 +%package -n librav1e0_7 Summary: AV1 encoder library Group: System/Libraries -%description -n librav1e0_6 +%description -n librav1e0_7 rav1e is an AV1 video encoder libary. It is designed to eventually cover all use cases, though in its current form it is most suitable for cases where libaom (the reference encoder) is too slow. @@ -74,7 +74,7 @@ libaom (the reference encoder) is too slow. %package devel Summary: Development files for rav1e Group: Development/Libraries/C and C++ -Requires: librav1e0_6 = %{version} +Requires: librav1e0_7 = %{version} %description devel The rav1e-devel package contains libraries and header files for @@ -82,8 +82,6 @@ developing applications that use rav1e. %prep %autosetup -a1 -p1 -mkdir .cargo -cp %{SOURCE2} .cargo/config # Disable rav1e_js sed -i 's/"rav1e_js", //' Cargo.toml @@ -107,12 +105,12 @@ cargo cinstall \ rm -f %{buildroot}%{_libdir}/librav1e.a rm -f %{buildroot}%{_prefix}/.crates* -%ldconfig_scriptlets -n librav1e0_6 +%ldconfig_scriptlets -n librav1e0_7 %files %{_bindir}/rav1e -%files -n librav1e0_6 +%files -n librav1e0_7 %license LICENSE %{_libdir}/librav1e.so.* diff --git a/vendor.tar.zst b/vendor.tar.zst index cc41db8..a24763f 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa2f32ad737a950d682825ce94ad359cd04c8a30bbf17466841f6429285f5b02 -size 25794771 +oid sha256:157009e31d0ca0de2d1ca2ad651fcad6155f958ac9a14b12a53aa19b5f9bcdb9 +size 35617427