Sync from SUSE:SLFO:Main rav1e revision 3d37eeda900dfb8e2ea842f6d4770c9a

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:
+You need the obs_scm and cargo_vendor obs services installed:
-  zypper in obs-service-download_files obs-service-cargo_vendor
+  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
+  osc service mr obs_scm
-
-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.
 
 Run the cargo_vendor service with:
-  osc service disabledrun
+  osc service mr cargo_vendor
 
 Update the changelog file with the upstream release notes.

_service

@@ -3,7 +3,7 @@
     <param name="url">https://github.com/xiph/rav1e.git</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="scm">git</param>
-    <param name="revision">v0.6.6</param>
+    <param name="revision">v0.7.1</param>
     <param name="match-tag">*</param>
     <param name="versionrewrite-pattern">v(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>
@@ -20,7 +20,4 @@
      <param name="compression">zst</param>
      <param name="update">true</param>
   </service>
-  <service name="cargo_audit" mode="manual">
-     <param name="srcdir">rav1e</param>
-  </service>
 </services>

baselibs.conf

@@ -1 +1 @@
-librav1e0_6
+librav1e0_7

cargo_config

@@ -1,5 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"

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-0.7.1.orig/Cargo.toml
-+++ rav1e/Cargo.toml	2023-01-02 17:06:28.018646860 +0100
++++ rav1e-0.7.1/Cargo.toml
 @@ -38,7 +38,7 @@ binaries = [
-     "av-metrics",
+   "av-metrics",
-     "nom",
+   "nom",
  ]
 -default = ["binaries", "asm", "threading", "signal_support", "git_version"]
 +default = ["binaries", "asm", "threading", "signal_support"]

rav1e.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Aug 27 08:43:21 UTC 2024 - Enrico Belleri <kilgore.trout@idesmi.eu>
+
+- 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
 

rav1e.obsinfo

@@ -1,4 +1,4 @@
 name: rav1e
-version: 0.6.6
+version: 0.7.1
-mtime: 1684219782
+mtime: 1704876138
-commit: 7c9db10494c2fffa98a572027d756e55bf754036
+commit: a8d05d0c43826a465b60dbadd0ab7f1327d75371

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 <asn@cryptomilk.org>.
 #
 # 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.*