commit:     ccbddc6f17df999384f731b842d225132a2c37de
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sat Jul 31 06:48:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 05:44:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbddc6f

media-plugins/gst-plugins-jack: Fix jack2 dependency

Closes: https://bugs.gentoo.org/804957
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/21843
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ugins-jack-1.18.4.ebuild => gst-plugins-jack-1.18.4-r1.ebuild} | 8 ++++++--
 media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4.ebuild 
b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4-r1.ebuild
similarity index 54%
rename from media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4.ebuild
rename to media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4-r1.ebuild
index 66ffb80558f..6deae9a17db 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4-r1.ebuild
@@ -7,8 +7,12 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
+# >=jack-1.9.7 is provided by pipewire[jack-sdk] as well
+RDEPEND="|| (
+       media-sound/jack2[${MULTILIB_USEDEP}]
+       media-video/pipewire[jack-sdk(-),${MULTILIB_USEDEP}]
+)"
 DEPEND="${RDEPEND}"

diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild 
b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild
index b1609d83564..c73330fe22e 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/";
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass 
libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi 
vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 

Reply via email to