commit: ba3cc8ee70dd6b3ef4daa0ea883cbfdadf1ce5ea parent ff551e9656b224d22350a234b17f67a79aef860a Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Wed, 17 Mar 2021 12:09:57 +0100 Fixup gstreamerDiffstat:
7 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass @@ -115,11 +115,11 @@ S="${WORKDIR}/${GST_ORG_MODULE}-${PV}" RDEPEND=" >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${GST_MIN_PV}:${SLOT}[${MULTILIB_USEDEP},test?] + >=media-libs/gstreamer-${GST_MIN_PV}:${SLOT}[${MULTILIB_USEDEP}] " BDEPEND=" >=sys-apps/sed-4 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " # Export common multilib phases. @@ -138,7 +138,10 @@ if [[ ${PN} != ${GST_ORG_MODULE} ]]; then else IUSE="nls test" RESTRICT="!test? ( test )" - BDEPEND="${DEPEND} nls? ( >=sys-devel/gettext-0.17 )" + BDEPEND="${DEPEND} + nls? ( >=sys-devel/gettext-0.17 ) + test? ( media-libs/gstreamer[test] ) + " multilib_src_compile() { eninja; } multilib_src_test() { eninja test; } diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild @@ -12,12 +12,14 @@ DESCRIPTION="Less plugins for GStreamer" HOMEPAGE="https://gstreamer.freedesktop.org/" LICENSE="LGPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" # TODO: egl and gtk IUSE only for transition IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant # X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin # We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here) +# FIXME gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] ) RDEPEND=" >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=] @@ -31,7 +33,6 @@ RDEPEND=" >=dev-libs/wayland-protocols-1.4 ) - gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] ) orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) " diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for gstreamer" HOMEPAGE="https://gstreamer.freedesktop.org/" LICENSE="GPL-2+ LGPL-2+" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" # For OpenGL we have three separate concepts, with a list of possibilities in each: # * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.18.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.18.4.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for GStreamer" HOMEPAGE="https://gstreamer.freedesktop.org/" LICENSE="LGPL-2.1+" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="+orc" RDEPEND=" diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild @@ -12,6 +12,7 @@ DESCRIPTION="Basepack of plugins for gstreamer" HOMEPAGE="https://gstreamer.freedesktop.org/" LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" RDEPEND=" >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}] diff --git a/media-libs/gstreamer/gstreamer-1.18.4.ebuild b/media-libs/gstreamer/gstreamer-1.18.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz" LICENSE="LGPL-2+" SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+caps +introspection +orc unwind" RDEPEND=" diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.18.4.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.18.4.ebuild @@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good inherit gstreamer-meson DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="" RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"