Accepting request 921909 from home:firstyear:branches:multimedia:libs

- Replace rust-packaging with cargo-packaging

OBS-URL: https://build.opensuse.org/request/show/921909
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/rav1e?expand=0&rev=33
This commit is contained in:
Andreas Schneider 2021-09-28 07:27:58 +00:00 committed by Git OBS Bridge
parent 1736ace1f2
commit 31ad6128f8
2 changed files with 8 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 28 04:37:57 UTC 2021 - William Brown <william.brown@suse.com>
- Replace rust-packaging with cargo-packaging
-------------------------------------------------------------------
Fri Jul 9 06:11:11 UTC 2021 - Andreas Schneider <asn@cryptomilk.org>

View File

@ -17,7 +17,6 @@
#
%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
Name: rav1e
Version: 0.4.1
Release: 0
@ -35,10 +34,9 @@ Source99: baselibs.conf
# Fix squared artefacts on image when converting to AVIF
Patch0: https://github.com/xiph/rav1e/commit/f553646d70fba8e265d436103a73520eb7adec8c.patch
#
BuildRequires: cargo
BuildRequires: cargo-c
BuildRequires: cargo-packaging
BuildRequires: nasm
BuildRequires: rust-packaging
%description
rav1e is an AV1 video encoder.
@ -91,10 +89,6 @@ registry = 'https://github.com/rust-lang/crates.io-index'
replace-with = 'vendored-sources'
[source.vendored-sources]
directory = './vendor'
[build]
rustc = "%{__rustc}"
rustdoc = "%{__rustdoc}"
rustflags = %{__global_rustflags_toml}
[term]
verbose = true
EOF
@ -104,13 +98,11 @@ rm -f Cargo.lock
sed -i 's/"rav1e_js", //' Cargo.toml
%build
export RUSTFLAGS=%{rustflags}
cargo build --offline --release
%{cargo_build}
CFLAGS="%{optflags}" cargo cbuild
%install
export RUSTFLAGS=%{rustflags}
cargo install --offline --root=%{buildroot}%{_prefix} --path .
%{cargo_install}
rm -rf %{buildroot}%{_datadir}/cargo
cargo cinstall \