[packages/grilo-plugins] - updated to 0.3.16 - added libdmapsharing4 patch to allow libdmapsharing4 < 3.9.11 for libsoup 2.4

[qboosh]

commit e9d2ab1eff38f8c1620dce106cfed15d91ef98c7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 9 11:46:59 2023 +0200

    - updated to 0.3.16
    - added libdmapsharing4 patch to allow libdmapsharing4 < 3.9.11 for libsoup 2.4
    - disable libgdata (youtube plugin) for libsoup3

 grilo-plugins-libdmapsharing4.patch | 20 ++++++++++++++++++++
 grilo-plugins.spec                  | 36 ++++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 12 deletions(-)
---
diff --git a/grilo-plugins.spec b/grilo-plugins.spec
index 23c89ac..3f03191 100644
--- a/grilo-plugins.spec
+++ b/grilo-plugins.spec
@@ -1,22 +1,34 @@
 #
 # Conditional build:
-%bcond_without	libdmapsharing4		# libdmapsharing 4 (3.9.x) instead of 3 (2.9.x)
+%bcond_without	libdmapsharing4	# libdmapsharing 4 (3.9.x) instead of 3 (2.9.x) for libsoup 2.4
+%bcond_without	libgdata	# libgdata based youtube support (libsoup 2.4 only)
 
+%define		soup_api	%(pkg-config --variable=soupapiversion grilo-net-0.3 2>/dev/null || echo 2.4)
+
+%if "%{soup_api}" == "2.4"
+%undefine	with_libgdata
 %if %{with libdmapsharing4}
 %define		libdmapsharing_ver	3.9.9
+%define		libdmapsharing_ver_lt	3.9.11
 %else
 %define		libdmapsharing_ver	2.9.12
+%define		libdmapsharing_ver_lt	3.9
 %endif
-%define		soup_api	%(pkg-config --variable=soupapiversion grilo-net-0.3)
+%else
+%define		libdmapsharing_ver	3.9.11
+%define		libdmapsharing_ver_lt	4.9
+%endif
+
 Summary:	Collection of plugins for Grilo
 Summary(pl.UTF-8):	Zestaw wtyczek dla Grilo
 Name:		grilo-plugins
-Version:	0.3.15
+Version:	0.3.16
 Release:	1
 License:	LGPL v2.1+
 Group:		Applications/Multimedia
 Source0:	https://download.gnome.org/sources/grilo-plugins/0.3/%{name}-%{version}.tar.xz
-# Source0-md5:	b2a12b3a244b4a8841dd56f1511586d3
+# Source0-md5:	0b80dfb3622293b0f170c72e2f08b3d0
+Patch0:		%{name}-libdmapsharing4.patch
 URL:		https://wiki.gnome.org/Projects/Grilo
 BuildRequires:	avahi-glib-devel
 BuildRequires:	avahi-gobject-devel
@@ -30,12 +42,8 @@ BuildRequires:	gstreamer-devel >= 1.0
 BuildRequires:	json-glib-devel
 BuildRequires:	libarchive-devel
 BuildRequires:	libdmapsharing-devel >= %{libdmapsharing_ver}
-%if %{with libdmapsharing4}
-BuildRequires:	libdmapsharing-devel < 4.9
-%else
-BuildRequires:	libdmapsharing-devel < 3.9
-%endif
-BuildRequires:	libgdata-devel >= 0.17.0
+BuildRequires:	libdmapsharing-devel < %{libdmapsharing_ver_lt}
+%{?with_libgdata:BuildRequires:	libgdata-devel >= 0.17.0}
 BuildRequires:	libmediaart2-devel >= 1.9
 BuildRequires:	liboauth-devel
 %if "%{soup_api}" == "2.4"
@@ -61,7 +69,7 @@ Requires:	gnome-online-accounts-libs >= 3.18.0
 Requires:	gom >= 0.4
 Requires:	grilo >= 0.3.8
 Requires:	libdmapsharing >= %{libdmapsharing_ver}
-Requires:	libgdata >= 0.17.0
+%{?with_libgdata:Requires:	libgdata >= 0.17.0}
 Requires:	totem-pl-parser >= 3.4.1
 Requires:	tracker3 >= 3.0
 Suggests:	dleyna-server
@@ -79,10 +87,12 @@ różnych dostawców treści multimedialnych.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson build \
-	-Denable-tracker=no
+	-Denable-tracker=no \
+	%{!?with_libgdata:-Denable-youtube=no}
 
 %ninja_build -C build
 
@@ -121,7 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/grilo-0.3/libgrlthetvdb.so
 %attr(755,root,root) %{_libdir}/grilo-0.3/libgrltmdb.so
 %attr(755,root,root) %{_libdir}/grilo-0.3/libgrltracker3.so
+%if %{with libgdata}
 %attr(755,root,root) %{_libdir}/grilo-0.3/libgrlyoutube.so
+%endif
 %dir %{_datadir}/grilo-plugins
 %dir %{_datadir}/grilo-plugins/grl-lua-factory
 %{_datadir}/grilo-plugins/grl-lua-factory/grl-acoustid.lua
diff --git a/grilo-plugins-libdmapsharing4.patch b/grilo-plugins-libdmapsharing4.patch
new file mode 100644
index 0000000..8b0d0a9
--- /dev/null
+++ b/grilo-plugins-libdmapsharing4.patch
@@ -0,0 +1,20 @@
+--- grilo-plugins-0.3.16/meson.build.orig	2023-04-03 11:39:37.000000000 +0200
++++ grilo-plugins-0.3.16/meson.build	2023-04-09 11:23:58.650337715 +0200
+@@ -84,10 +84,15 @@ else
+   libgdata_dep = dependency('unresolvable-dep', required: false)
+ endif
+ 
+-libdmapsharing4_dep = dependency('libdmapsharing-4.0', version: '>= 3.9.11', required: false)
+ if soup_api_version == '2.4'
+-  libdmapsharing_dep = dependency('libdmapsharing-3.0', version: '>= 2.9.12', required: false)
++  libdmapsharing4_dep = dependency('libdmapsharing-4.0', version: '< 3.9.11', required: false)
++  if libdmapsharing4_dep.found()
++    libdmapsharing_dep = libdmapsharing4_dep
++  else
++    libdmapsharing_dep = dependency('libdmapsharing-3.0', version: '>= 2.9.12', required: false)
++  endif
+ else
++  libdmapsharing4_dep = dependency('libdmapsharing-4.0', version: '>= 3.9.11', required: false)
+   libdmapsharing_dep = libdmapsharing4_dep
+ endif
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grilo-plugins.git/commitdiff/e9d2ab1eff38f8c1620dce106cfed15d91ef98c7