Accepting request 852570 from home:alarrosa:branches:multimedia:libs

- Update to git version 0.6.0+git20201201.58786fa
- Use obs-service-cargo_vendor in the _service file and replace
  vendor-cargo-config with cargo_config
- Enable the build of sodium and threadshare plugins
- Remove special Cargo.lock source file which is not needed anymore

- Fix version, since the initial release wasn't 1.18.0 but 0.6.0
- Update to git version 0.6.0+git20201026.d16e7d1

OBS-URL: https://build.opensuse.org/request/show/852570
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-rs?expand=0&rev=3

_service

@@ -2,15 +2,17 @@
   <service name="tar_scm" mode="disabled">
     <param name="url">https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git</param>
     <param name="filename">gstreamer-plugins-rs</param>
-<!--    <param name="versionformat">@PARENT_TAG@+git%cd.%h</param>-->
+    <param name="versionformat">0.6.0+git%cd.%h</param>
-    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="revision">master</param>
-    <param name="revision">1.18.0</param>
     <param name="scm">git</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="compression">xz</param>
     <param name="file">*.tar</param>
   </service>
+  <service name="cargo_vendor" mode="disabled">
+    <param name="srcdir">gst-plugins-rs</param>
+  </service>
   <service name="set_version" mode="disabled" />
 </services>
 

cargo_config

@@ -0,0 +1,22 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."https://github.com/fengalin/tokio"]
+git = "https://github.com/fengalin/tokio"
+tag = "tokio-0.2.13-throttling"
+replace-with = "vendored-sources"
+
+[source."https://github.com/gtk-rs/gtk-rs"]
+git = "https://github.com/gtk-rs/gtk-rs"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-av/flavors"]
+git = "https://github.com/rust-av/flavors"
+replace-with = "vendored-sources"
+
+[source."https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"]
+git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"

gstreamer-plugins-rs-0.6.0+git20201201.58786fa.tar.xz

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

gstreamer-plugins-rs-1.18.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c4852177c66f797d1c5b16f2c1d7f97dd6f815c6c7bc498054c2385d369499d
-size 397980

gstreamer-plugins-rs.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Dec  1 11:28:33 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
+
+- Update to git version 0.6.0+git20201201.58786fa
+- Use obs-service-cargo_vendor in the _service file and replace
+  vendor-cargo-config with cargo_config
+- Enable the build of sodium and threadshare plugins
+- Remove special Cargo.lock source file which is not needed anymore
+
+-------------------------------------------------------------------
+Wed Oct 28 16:42:07 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
+
+- Fix version, since the initial release wasn't 1.18.0 but 0.6.0
+- Update to git version 0.6.0+git20201026.d16e7d1
+
 -------------------------------------------------------------------
 Sat Oct 24 12:59:22 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 

gstreamer-plugins-rs.spec

@@ -16,23 +16,23 @@
 #
 
 
+%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
 %define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//")
 
 %define _name gstreamer-plugins-rs
 %define gst_branch 1.0
 
 Name:           gstreamer-plugins-rs
-Version:        1.18.0
+Version:        0.6.0+git20201201.58786fa
 Release:        0
 Summary:        GStreamer Streaming-Media Framework Plug-Ins
 License:        LGPL-2.1-or-later
 Group:          Productivity/Multimedia/Other
 URL:            https://gstreamer.freedesktop.org/
-Source0:        https://gstreamer.freedesktop.org/src/gst-plugins-good/%{_name}-%{version}.tar.xz
+Source0:        %{_name}-%{version}.tar.xz
 Source1:        vendor.tar.xz
-Source2:        vendor-cargo-config
+Source2:        cargo_config
 Source3:        gstreamer-plugins-rs.appdata.xml
-Source4:        Cargo.lock
 Source99:       baselibs.conf
 BuildRequires:  cargo
 BuildRequires:  csound-devel
@@ -40,7 +40,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  llvm-devel
 BuildRequires:  meson >= 0.47.0
 BuildRequires:  pkgconfig
-BuildRequires:  rust
+BuildRequires:  rust >= 1.40
 BuildRequires:  rust-packaging
 BuildRequires:  rust-std
 BuildRequires:  pkgconfig(cairo) >= 1.10.0
@@ -67,10 +67,6 @@ processing capabilities can be added simply by installing new plug-ins.
 %define cargo_registry $(pwd)/vendor
 mkdir .cargo
 cp %{SOURCE2} .cargo/config
-cp %{SOURCE4} .
-sed -i -e "s,^directory = .*,directory = \"$PWD/vendor\"," .cargo/config
-sed -i -e "/generic\/threadshare/d" Cargo.toml
-sed -i -e "/generic\/sodium/d" Cargo.toml
 sed -i -e "/video\/dav1d/d" Cargo.toml
 
 
@@ -79,6 +75,7 @@ sed -i -e "/video\/dav1d/d" Cargo.toml
 
 %build
 #export CARGO_HOME=$PWD/vendor
+export RUSTFLAGS=%{rustflags}
 export CSOUND_LIB_DIR=%{_libdir}
 %meson \
 	-Dpackage-name='openSUSE GStreamer-plugins-rs package' \
@@ -90,6 +87,7 @@ cd %_vpath_builddir
 %{cargo_build}
 
 %install
+export RUSTFLAGS=%{rustflags}
 mkdir -p %{buildroot}%{_libdir}/gstreamer-%{gst_branch}/
 cp target/release/*.so %{buildroot}%{_libdir}/gstreamer-%{gst_branch}/
 
@@ -116,7 +114,10 @@ cp %{SOURCE3} %{buildroot}%{_datadir}/appdata/
 %{_libdir}/gstreamer-%{gst_branch}/libgstrstextwrap.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstrstutorial.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstrusoto.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstsodium.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstthreadshare.so
 %{_libdir}/gstreamer-%{gst_branch}/libgsttogglerecord.so
+
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/gstreamer-plugins-rs.appdata.xml
 

vendor-cargo-config

@@ -1,70 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/atk"]
-git = "https://github.com/gtk-rs/atk"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/cairo"]
-git = "https://github.com/gtk-rs/cairo"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/gdk"]
-git = "https://github.com/gtk-rs/gdk"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/gdk-pixbuf"]
-git = "https://github.com/gtk-rs/gdk-pixbuf"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/gio"]
-git = "https://github.com/gtk-rs/gio"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/glib"]
-git = "https://github.com/gtk-rs/glib"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/gtk"]
-git = "https://github.com/gtk-rs/gtk"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/pango"]
-git = "https://github.com/gtk-rs/pango"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/pangocairo"]
-git = "https://github.com/gtk-rs/pangocairo"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/gtk-rs/sys"]
-git = "https://github.com/gtk-rs/sys"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/rust-av/flavors"]
-git = "https://github.com/rust-av/flavors"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"]
-git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://gitlab.freedesktop.org/gstreamer/gstreamer-rs-sys"]
-git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs-sys"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"

vendor.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a17424fea3cfb34c57fc3d3ea7c8a545462f4f932a5b2247f924593cbfc4d82
+oid sha256:bf03c4e31ad921bc2995dc77b7cf20551067df4b42ab0b9dd1a783c32fb2b808
-size 29862128
+size 31468288