diff options
| author | Bastien Nocera <hadess@hadess.net> | 2022-09-28 15:00:19 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2022-09-29 11:50:45 +0000 |
| commit | bd1e5c51eb1dc0cc1fdaf763e6063bee599c4362 (patch) | |
| tree | b8f57d3a0c3f6b1f44af62834e33d945ca0986f2 | |
| parent | fef8823db9f7558b7e5524595b345031eb22b2a1 (diff) | |
| download | grilo-plugins-bd1e5c51eb1dc0cc1fdaf763e6063bee599c4362.tar.gz | |
ci: Don't install libsoup-devel when building soup3 variant
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c3bab8..413651f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: DEPENDENCIES_GRILO: gobject-introspection-devel libxml2-devel - libsoup-devel glib2-devel gtk3-devel liboauth-devel @@ -20,6 +19,8 @@ variables: DEPENDENCY_GRILO_SOUP2: libsoup-devel + libdmapsharing-devel + libgdata-devel DEPENDENCY_GRILO_SOUP3: libsoup3-devel @@ -34,11 +35,9 @@ variables: json-glib-devel avahi-gobject-devel rest-devel - libdmapsharing-devel libmediaart-devel gom-devel gnome-online-accounts-devel - libgdata-devel gstreamer1-plugins-good gstreamer1-plugins-bad-free-extras python3-gobject-base @@ -95,14 +94,14 @@ build_soup3: before_script: - dnf update -y --nogpgcheck script: - - dnf install -y --nogpgcheck $DEPENDENCIES_GRILO $DEPENDENCIES $DEPENDENCY_GRILO_SOUP3 + - dnf install -y --nogpgcheck --exclude=libsoup-devel $DEPENDENCIES_GRILO $DEPENDENCIES $DEPENDENCY_GRILO_SOUP3 # As part of configuring grilo-plugins.git for build, the latest code from # grilo.git will be fetched by Meson and it will be built as a subproject. - meson . _build --prefix=/usr -Dgrilo:soup3=true -Denable-bookmarks=yes -Denable-chromaprint=yes -Denable-dleyna=yes - -Denable-dmap=yes + -Denable-dmap=no -Denable-filesystem=yes -Denable-flickr=yes -Denable-freebox=yes |