diff options
| author | W. Michael Petullo <mike@flyn.org> | 2022-12-14 11:26:33 -0600 |
|---|---|---|
| committer | W. Michael Petullo <mike@flyn.org> | 2022-12-14 11:26:36 -0600 |
| commit | ae34da2264eab49eceaeeb0d1510b952a65ae030 (patch) | |
| tree | 532e2a6a31acdd12cce3fdc70c514fda8a88d4df | |
| parent | 491f19e84d14079efcc7b75ce274910e6b579271 (diff) | |
| download | grilo-plugins-ae34da2264eab49eceaeeb0d1510b952a65ae030.tar.gz | |
build: Build dmap plugin when soup 3 is used
Versions of libdmapsharing >= 3.9.11 (API 4.0) support libsoup
3.0. Building against libsoup 2.4 requires libdmapsharing's older 3.0 API,
which grilo-plugins will now select when building against libsoup 2.4.
Signed-off-by: W. Michael Petullo <mike@flyn.org>
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | meson.build | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cbee23..ac9017b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,11 +19,11 @@ variables: DEPENDENCY_GRILO_SOUP2: libsoup-devel - libdmapsharing-devel libgdata-devel DEPENDENCY_GRILO_SOUP3: libsoup3-devel + libdmapsharing-devel DEPENDENCIES: sqlite-devel @@ -101,7 +101,7 @@ build_soup3: -Denable-bookmarks=yes -Denable-chromaprint=yes -Denable-dleyna=yes - -Denable-dmap=no + -Denable-dmap=yes -Denable-filesystem=yes -Denable-flickr=yes -Denable-freebox=yes diff --git a/meson.build b/meson.build index 3215d4a..fb683ec 100644 --- a/meson.build +++ b/meson.build @@ -84,14 +84,10 @@ else 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 + libdmapsharing_dep = dependency('libdmapsharing-3.0', version: '>= 2.9.12', required: false) else - libdmapsharing_dep = disabler() + libdmapsharing4_dep = dependency('libdmapsharing-4.0', version: '>= 3.9.11', required: false) + libdmapsharing_dep = libdmapsharing4_dep endif libxml_dep = dependency('libxml-2.0', required: false) |