diff options
| author |   Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2021-05-30 17:06:09 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-05-31 07:55:08 +0000 |
| commit | 201d8f14dca0172965ff03accc8fbb6fc08491e3 (patch) | |
| tree | bfdb9bc3df651c760ced1becb4fb2ad367dc1fdc | |
| parent | games-engines/qtads: Fix build error when using >=fluidsynth-2.2 (diff) | |
| download | gentoo-201d8f14dca0172965ff03accc8fbb6fc08491e3.tar.gz gentoo-201d8f14dca0172965ff03accc8fbb6fc08491e3.tar.bz2 gentoo-201d8f14dca0172965ff03accc8fbb6fc08491e3.zip | |
gstreamer-meson.eclass: Fix cycle dependency on gstreamer
Closes: https://bugs.gentoo.org/793032
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/21052
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | eclass/gstreamer-meson.eclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass index c3c97db0690b..f1962073fd2b 100644 --- a/eclass/gstreamer-meson.eclass +++ b/eclass/gstreamer-meson.eclass @@ -126,7 +126,6 @@ esac RDEPEND=" >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${GST_MIN_PV}:${SLOT}[${MULTILIB_USEDEP}] " BDEPEND=" >=sys-apps/sed-4 @@ -134,6 +133,13 @@ BDEPEND=" virtual/perl-JSON-PP " +if [[ "${PN}" != "gstreamer" ]]; then + RDEPEND=" + ${RDEPEND} + >=media-libs/gstreamer-${GST_MIN_PV}:${SLOT}[${MULTILIB_USEDEP}] + " +fi + # Export common multilib phases. multilib_src_configure() { gstreamer_multilib_src_configure; } multilib_src_compile() { gstreamer_multilib_src_compile; } |