Accepting request 886891 from home:alarrosa:branches:multimedia:libs:gstreamer

- Update to 0.6.0+git20210412.c3fb55f
- Add patch to fix build in the i586 architecture
  (Submitted in glfo#gstreamer/gst-plugins-rs#502):
  * 0001-Fix-cast-to-f64-so-it-builds-in-i586.patch

OBS-URL: https://build.opensuse.org/request/show/886891
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-rs?expand=0&rev=5
This commit is contained in:
Antonio Larrosa 2021-04-22 07:45:09 +00:00 committed by Git OBS Bridge
parent 3a1ace4048
commit fbefc6da12
7 changed files with 82 additions and 8 deletions

View File

@ -0,0 +1,37 @@
From 9f39c3276e2d9a373e80a83ef127527bfff8f1f7 Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <antonio.larrosa@gmail.com>
Date: Tue, 20 Apr 2021 07:35:59 +0200
Subject: [PATCH] Fix cast to f64 so it builds in i586
For some reason (compiler bug?), the rust compiler fails to compare
u32 and f64 types on i586 with the following error:
error[E0282]: type annotations needed
--> audio/csound/src/filter/imp.rs:611:47
|
611 | if rate != out_info.rate() || rate != csound.get_sample_rate() as _ {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type
|
= note: type must be known at this point
Using an explicit cast solves the issue.
---
audio/csound/src/filter/imp.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs
index 9ab2292..3059ccb 100644
--- a/audio/csound/src/filter/imp.rs
+++ b/audio/csound/src/filter/imp.rs
@@ -608,7 +608,7 @@ impl BaseTransformImpl for CsoundFilter {
let rate = in_info.rate();
// Check if the negotiated caps are the right ones
- if rate != out_info.rate() || rate != csound.get_sample_rate() as _ {
+ if rate != out_info.rate() || rate as f64 != csound.get_sample_rate() {
return Err(loggable_error!(
CAT,
"Failed to negotiate caps: invalid sample rate {}",
--
2.31.1

View File

@ -10,9 +10,9 @@
<param name="compression">xz</param> <param name="compression">xz</param>
<param name="file">*.tar</param> <param name="file">*.tar</param>
</service> </service>
<service name="set_version" mode="disabled" />
<service name="cargo_vendor" mode="disabled"> <service name="cargo_vendor" mode="disabled">
<param name="srcdir">gst-plugins-rs</param> <param name="srcdir">gst-plugins-rs</param>
</service> </service>
<service name="set_version" mode="disabled" />
</services> </services>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a5c563b9c46342ea2e29ec4edf769d5774106eae9c188f1bb4796a7ebc63372
size 32356164

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44043d0eaa36d93ac5dcfa4ab3452becbaef5977501877c7727199f7482dfda5
size 33694416

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Apr 19 15:00:36 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
- Update to 0.6.0+git20210412.c3fb55f
- Add patch to fix build in the i586 architecture
(Submitted in glfo#gstreamer/gst-plugins-rs#502):
* 0001-Fix-cast-to-f64-so-it-builds-in-i586.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 24 13:28:20 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com> Thu Dec 24 13:28:20 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -21,9 +21,10 @@
%define _name gstreamer-plugins-rs %define _name gstreamer-plugins-rs
%define gst_branch 1.0 %define gst_branch 1.0
%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
Name: gstreamer-plugins-rs Name: gstreamer-plugins-rs
Version: 0.6.0+git20201201.58786fa Version: 0.6.0+git20210416.61214b5
Release: 0 Release: 0
Summary: GStreamer Streaming-Media Framework Plug-Ins Summary: GStreamer Streaming-Media Framework Plug-Ins
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -35,15 +36,17 @@ Source1: vendor.tar.xz
Source2: cargo_config Source2: cargo_config
Source3: gstreamer-plugins-rs.appdata.xml Source3: gstreamer-plugins-rs.appdata.xml
Source99: baselibs.conf Source99: baselibs.conf
Patch0: 0001-Fix-cast-to-f64-so-it-builds-in-i586.patch
BuildRequires: cargo BuildRequires: cargo
BuildRequires: cargo-c
BuildRequires: clang BuildRequires: clang
BuildRequires: csound-devel BuildRequires: csound-devel
BuildRequires: llvm BuildRequires: llvm
BuildRequires: meson >= 0.47.0 BuildRequires: meson >= 0.47.0
BuildRequires: nasm BuildRequires: nasm
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: rust >= 1.40 BuildRequires: rust >= 1.51
BuildRequires: rust-packaging BuildRequires: rust-packaging
BuildRequires: rust-std BuildRequires: rust-std
BuildRequires: pkgconfig(cairo) >= 1.10.0 BuildRequires: pkgconfig(cairo) >= 1.10.0
@ -66,6 +69,22 @@ videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new processing capabilities can be added simply by installing new
plug-ins. plug-ins.
%package devel
Summary: GStreamer Streaming-Media Framework Plug-Ins development files
Group: Development/Libraries/Other
Requires: %{name} = %{version}
%description devel
GStreamer is a streaming media framework based on graphs of filters
that operate on media data. Applications using this library can do
anything media-related, from real-time sound processing to playing
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new
plug-ins.
This package contains the pkgconfig development files for the rust
plugins.
%prep %prep
%autosetup -n %{_name}-%{version} -p1 %autosetup -n %{_name}-%{version} -p1
@ -76,6 +95,8 @@ cp %{SOURCE2} .cargo/config
%build %build
export CSOUND_LIB_DIR=%{_libdir} export CSOUND_LIB_DIR=%{_libdir}
export RUSTFLAGS=%{rustflags}
%meson \ %meson \
-Ddav1d=auto \ -Ddav1d=auto \
-Dsodium=system \ -Dsodium=system \
@ -84,6 +105,7 @@ export CSOUND_LIB_DIR=%{_libdir}
%meson_build %meson_build
%install %install
export RUSTFLAGS=%{rustflags}
%meson_install %meson_install
mkdir -p %{buildroot}%{_datadir}/appdata mkdir -p %{buildroot}%{_datadir}/appdata
cp %{SOURCE3} %{buildroot}%{_datadir}/appdata/ cp %{SOURCE3} %{buildroot}%{_datadir}/appdata/
@ -98,6 +120,7 @@ cp %{SOURCE3} %{buildroot}%{_datadir}/appdata/
%{_libdir}/gstreamer-%{gst_branch}/libgstrsdav1d.so %{_libdir}/gstreamer-%{gst_branch}/libgstrsdav1d.so
%{_libdir}/gstreamer-%{gst_branch}/libgstfallbackswitch.so %{_libdir}/gstreamer-%{gst_branch}/libgstfallbackswitch.so
%{_libdir}/gstreamer-%{gst_branch}/libgstgif.so %{_libdir}/gstreamer-%{gst_branch}/libgstgif.so
%{_libdir}/gstreamer-%{gst_branch}/libgsthsv.so
%{_libdir}/gstreamer-%{gst_branch}/libgstlewton.so %{_libdir}/gstreamer-%{gst_branch}/libgstlewton.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrav1e.so %{_libdir}/gstreamer-%{gst_branch}/libgstrav1e.so
%{_libdir}/gstreamer-%{gst_branch}/libgstreqwest.so %{_libdir}/gstreamer-%{gst_branch}/libgstreqwest.so
@ -105,8 +128,11 @@ cp %{SOURCE3} %{buildroot}%{_datadir}/appdata/
%{_libdir}/gstreamer-%{gst_branch}/libgstrsclosedcaption.so %{_libdir}/gstreamer-%{gst_branch}/libgstrsclosedcaption.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrsfile.so %{_libdir}/gstreamer-%{gst_branch}/libgstrsfile.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrsflv.so %{_libdir}/gstreamer-%{gst_branch}/libgstrsflv.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrsjson.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrspng.so %{_libdir}/gstreamer-%{gst_branch}/libgstrspng.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrsregex.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrstextwrap.so %{_libdir}/gstreamer-%{gst_branch}/libgstrstextwrap.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrswebp.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrusoto.so %{_libdir}/gstreamer-%{gst_branch}/libgstrusoto.so
%{_libdir}/gstreamer-%{gst_branch}/libgstsodium.so %{_libdir}/gstreamer-%{gst_branch}/libgstsodium.so
%{_libdir}/gstreamer-%{gst_branch}/libgstthreadshare.so %{_libdir}/gstreamer-%{gst_branch}/libgstthreadshare.so
@ -114,4 +140,7 @@ cp %{SOURCE3} %{buildroot}%{_datadir}/appdata/
%dir %{_datadir}/appdata %dir %{_datadir}/appdata
%{_datadir}/appdata/gstreamer-plugins-rs.appdata.xml %{_datadir}/appdata/gstreamer-plugins-rs.appdata.xml
%files devel
%{_libdir}/pkgconfig/*.pc
%changelog %changelog

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:bf03c4e31ad921bc2995dc77b7cf20551067df4b42ab0b9dd1a783c32fb2b808 oid sha256:485cb4a2b51e6dbb3f422e9228300743fc62cc64bb2ab5dec07d24f16c96e693
size 31468288 size 32616456