Accepting request 1119215 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/1119215
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rav1e?expand=0&rev=18

_service

@@ -1,26 +1,26 @@
 <services>
-  <service mode="disabled" name="obs_scm">
+  <service mode="manual" name="obs_scm">
     <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.4</param>
+    <param name="revision">v0.6.6</param>
     <param name="match-tag">*</param>
-    <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
+    <param name="versionrewrite-pattern">v(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>
-    <param name="changesgenerate">enable</param>
+<!--    <param name="changesgenerate">enable</param> -->
   </service>
-  <service mode="disabled" name="tar" />
-  <service mode="disabled" name="recompress">
+  <service mode="buildtime" name="tar" />
+  <service mode="buildtime" name="recompress">
     <param name="file">*.tar</param>
-    <param name="compression">xz</param>
+    <param name="compression">zst</param>
   </service>
-  <service mode="disabled" name="set_version"/>
-  <service name="cargo_vendor" mode="disabled">
+  <service mode="manual" name="set_version"/>
+  <service name="cargo_vendor" mode="manual">
      <param name="srcdir">rav1e</param>
-     <param name="compression">xz</param>
+     <param name="compression">zst</param>
      <param name="update">true</param>
   </service>
-  <service name="cargo_audit" mode="disabled">
+  <service name="cargo_audit" mode="manual">
      <param name="srcdir">rav1e</param>
   </service>
 </services>

_servicedata

@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">https://github.com/xiph/rav1e.git</param>
-              <param name="changesrevision">7121c0df0fd2443887b6ba5bd8eacfde60874d0c</param></service></servicedata>

baselibs.conf

@@ -1 +1 @@
-librav1e0
+librav1e0_6

rav1e-0.6.4+0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51cc4a72eb27ba70fd1b4809d0c2d924a7760c504982c9796e0d82e2e68b07e9
-size 2323200

rav1e.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Oct 19 08:38:11 UTC 2023 - bjorn.lie@gmail.com
+
+- Update to version 0.6.6:
+  * Sync the assembly with dav1d
+  * Additional improvements and cleanups
+  * Overall speed-up typically 5.2%
+- Change soname to 0_6, and at the same time set min version for
+  cargo-c BuildRequires to > 0.9.26, as this is needed for the new
+  soname to be built correctly.
+- Modernize _service and spec to more current way of doing rust
+  packaging.
+- Use ldconfig_scriptlets macro for post(un) handling.
+- Fix license tag to BSD-2-Clause AND ISC
+
+-------------------------------------------------------------------
+Thu Apr 20 07:28:40 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
+
+- Fix license tag to BSD-2-Clause and AOMPL-1.0.
+
 -------------------------------------------------------------------
 Tue Apr 11 09:53:40 UTC 2023 - asn@cryptomilk.org
 

rav1e.obsinfo

@@ -1,4 +1,4 @@
 name: rav1e
-version: 0.6.4+0
-mtime: 1681053966
-commit: 7121c0df0fd2443887b6ba5bd8eacfde60874d0c
+version: 0.6.6
+mtime: 1684219782
+commit: 7c9db10494c2fffa98a572027d756e55bf754036

rav1e.spec

@@ -18,22 +18,24 @@
 
 
 Name:           rav1e
-Version:        0.6.4+0
+Version:        0.6.6
 Release:        0
 Summary:        Fastest and safest AV1 encoder
-License:        BSD-2-Clause
+# rav1e is published under the terms of the BSD-2-Clause license,
+# with the exception of one file: "src/ext/x86/x86inc.asm" (ISC license)
+License:        BSD-2-Clause AND ISC
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 URL:            https://github.com/xiph/rav1e
 #
-Source0:        %{name}-%{version}.tar.xz
-Source1:        vendor.tar.xz
+Source0:        %{name}-%{version}.tar.zst
+Source1:        vendor.tar.zst
 Source2:        cargo_config
 Source98:       README.suse-maint
 Source99:       baselibs.conf
 #
 Patch0:         rav1e-cargo-no-git-default.patch
 #
-BuildRequires:  cargo-c
+BuildRequires:  cargo-c > 0.9.26
 BuildRequires:  cargo-packaging
 BuildRequires:  nasm
 
@@ -60,11 +62,11 @@ rav1e features:
 * Variable speed settings
 * Near real-time encoding at high speed levels
 
-%package -n librav1e0
+%package -n librav1e0_6
 Summary:        AV1 encoder library
 Group:          System/Libraries
 
-%description -n librav1e0
+%description -n librav1e0_6
 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.
@@ -72,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 = %{version}
+Requires:       librav1e0_6 = %{version}
 
 %description devel
 The rav1e-devel package contains libraries and header files for
@@ -80,27 +82,19 @@ developing applications that use rav1e.
 
 %prep
 %autosetup -a1 -p1
-
-install -d -m 0755 .cargo
-cat >.cargo/config <<EOF
-[source.crates-io]
-registry = 'https://github.com/rust-lang/crates.io-index'
-replace-with = 'vendored-sources'
-[source.vendored-sources]
-directory = './vendor'
-[term]
-verbose = true
-EOF
-rm -f Cargo.lock
+mkdir .cargo
+cp %{SOURCE2} .cargo/config
 
 # Disable rav1e_js
 sed -i 's/"rav1e_js", //' Cargo.toml
 
 %build
+export RUSTFLAGS="%{build_rustflags}"
 %{cargo_build}
 CFLAGS="%{optflags}" cargo cbuild
 
 %install
+export RUSTFLAGS="%{build_rustflags}"
 %{cargo_install}
 rm -rf %{buildroot}%{_datadir}/cargo
 
@@ -113,13 +107,12 @@ cargo cinstall \
 rm -f %{buildroot}%{_libdir}/librav1e.a
 rm -f %{buildroot}%{_prefix}/.crates*
 
-%post   -n librav1e0 -p /sbin/ldconfig
-%postun -n librav1e0 -p /sbin/ldconfig
+%ldconfig_scriptlets -n librav1e0_6
 
 %files
 %{_bindir}/rav1e
 
-%files -n librav1e0
+%files -n librav1e0_6
 %license LICENSE
 %{_libdir}/librav1e.so.*
 

vendor.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01a3039dba4f057fe9e811458557217ac7255c74c89c05ee18515ac50d4ea372
-size 24443640