[grilo-plugins] Revert "build: Don't build dmap plugin when soup 3 is used"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] Revert "build: Don't build dmap plugin when soup 3 is used"
- Date: Fri, 23 Sep 2022 14:18:44 +0000 (UTC)
commit 233ed982f112d3d6f88709ff2bf0a62dfa50c6e9
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Fri Sep 23 14:18:43 2022 +0000
Revert "build: Don't build dmap plugin when soup 3 is used"
This reverts commit 8bcf29ed63c05257df3703bb91bdd6680a9ae850
meson.build | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index 7c313a24..dce2069a 100644
--- a/meson.build
+++ b/meson.build
@@ -67,6 +67,12 @@ gstreamer_dep = dependency('gstreamer-1.0', required: false)
gthread_dep = dependency('gthread-2.0', required: false)
json_glib_dep = dependency('json-glib-1.0', required: false)
libarchive_dep = dependency('libarchive', required: false)
+libdmapsharing4_dep = dependency('libdmapsharing-4.0', version: '>= 3.9.9', required: false)
+if libdmapsharing4_dep.found()
+ libdmapsharing_dep = libdmapsharing4_dep
+else
+ libdmapsharing_dep = dependency('libdmapsharing-3.0', version: '>= 2.9.12', required: false)
+endif
libmediaart_dep = dependency('libmediaart-2.0', required: false)
if soup_api_version == '2.4'
libsoup_dep = dependency('libsoup-2.4', required: false)
@@ -79,15 +85,6 @@ else
libsoup24_dep = dependency('unresolvable-dep', required: false)
libgdata_dep = dependency('unresolvable-dep', required: false)
endif
-if soup_api_version == '2.4'
- libdmapsharing4_dep = dependency('libdmapsharing-4.0', version: '>= 3.9.9', required: false)
- if libdmapsharing4_dep.found()
- libdmapsharing_dep = libdmapsharing4_dep
- else
- libdmapsharing_dep = dependency('libdmapsharing-3.0', version: '>= 2.9.12', required: false)
- endif
-endif
-
libxml_dep = dependency('libxml-2.0', required: false)
oauth_dep = dependency('oauth', required: false)
sqlite3_dep = dependency('sqlite3', required: false)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]