commit: ff551e9656b224d22350a234b17f67a79aef860a parent ec85fac7a53c1d8f6cf11e4dce1c1c1cf4a7cdbb Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Wed, 17 Mar 2021 03:16:46 +0100 gstreamer: Move to EAPI=7 only, do some cleaning, address sam@ reviewDiffstat:
27 files changed, 99 insertions(+), 107 deletions(-)
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass @@ -12,7 +12,7 @@ # zaheerm <zaheerm@gentoo.org> # Steven Newbury # Haelwenn (lanodan) Monnier <contact@hacktivis.me> -# @SUPPORTED_EAPIS: 5 6 +# @SUPPORTED_EAPIS: 7 # @BLURB: Helps building core & split gstreamer plugins. # @DESCRIPTION: # Eclass to make external gst-plugins emergable on a per-plugin basis @@ -25,16 +25,13 @@ # plugin, consider adding media-plugins/gst-plugins-meta dependency, but # also list any packages that provide explicitly requested plugins. -inherit eutils multilib meson multilib-minimal toolchain-funcs versionator xdg-utils +inherit multilib meson toolchain-funcs xdg-utils multilib-minimal case "${EAPI:-0}" in - 5|6) - ;; - 0|1|2|3|4) - die "EAPI=\"${EAPI:-0}\" is not supported anymore" + 7) ;; *) - die "EAPI=\"${EAPI}\" is not supported yet" + die "EAPI=\"${EAPI}\" is not supported" ;; esac @@ -85,10 +82,10 @@ esac # new releases. : ${GST_TARBALL_SUFFIX:="xz"} -# Even though xz-utils are in @system, they must still be added to DEPEND; see +# Even though xz-utils are in @system, they must still be added to BDEPEND; see # https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml if [[ ${GST_TARBALL_SUFFIX} == "xz" ]]; then - DEPEND="${DEPEND} app-arch/xz-utils" + BDEPEND="${BDEPEND} app-arch/xz-utils" fi # @ECLASS-VARIABLE: GST_ORG_MODULE @@ -101,7 +98,7 @@ fi # @INTERNAL # @DESCRIPTION: # Major and minor numbers of the version number. -: ${GST_ORG_PVP:=$(get_version_component_range 1-2)} +: ${GST_ORG_PVP:=$(ver_cut 1-2)} DESCRIPTION="${BUILD_GST_PLUGINS} plugin for gstreamer" @@ -117,10 +114,10 @@ esac S="${WORKDIR}/${GST_ORG_MODULE}-${PV}" RDEPEND=" - >=dev-libs/glib-2.38.2-r1:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${GST_MIN_PV}:${SLOT}[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-${GST_MIN_PV}:${SLOT}[${MULTILIB_USEDEP},test?] " -DEPEND=" +BDEPEND=" >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " @@ -139,10 +136,12 @@ if [[ ${PN} != ${GST_ORG_MODULE} ]]; then multilib_src_install() { gstreamer_multilib_src_install; } multilib_src_install_all() { gstreamer_multilib_src_install_all; } else - IUSE="nls" - DEPEND="${DEPEND} nls? ( >=sys-devel/gettext-0.17 )" + IUSE="nls test" + RESTRICT="!test? ( test )" + BDEPEND="${DEPEND} nls? ( >=sys-devel/gettext-0.17 )" multilib_src_compile() { eninja; } + multilib_src_test() { eninja test; } multilib_src_install() { DESTDIR="${D}" eninja install; } fi @@ -184,24 +183,24 @@ gstreamer_get_plugin_dir() { # @DESCRIPTION: # Handles logic common to configuring gstreamer plugins gstreamer_multilib_src_configure() { - local plugin emesonargs=() EMESON_SOURCE=${EMESON_SOURCE:-${S}} + local plugin gst_conf=( ) EMESON_SOURCE=${EMESON_SOURCE:-${S}} gstreamer_environment_reset # app-editor/vis regex for meson_options.txt: :x/option\('([^']*)'.*/ c/\1/ for plugin in ${GST_PLUGINS_DISABLED} ; do - emesonargs+=( -D${plugin}=disabled ) + gst_conf+=( -D${plugin}=disabled ) done for plugin in ${GST_PLUGINS_ENABLED} ; do - emesonargs+=( -D${plugin}=enabled ) + gst_conf+=( -D${plugin}=enabled ) done - if grep -q "option(\'orc\'" "${EMESON_SOURCE}"/meson_options.txt ; then + if grep -q "option('orc'" "${EMESON_SOURCE}"/meson_options.txt ; then if in_iuse orc ; then - emesonargs+=( -Dorc=$(usex orc enabled disabled) ) + gst_conf+=( -Dorc=$(usex orc enabled disabled) ) else - emesonargs+=( -Dorc=disabled ) + gst_conf+=( -Dorc=disabled ) fi fi @@ -214,20 +213,28 @@ gstreamer_multilib_src_configure() { fi if [[ ${PN} == ${GST_ORG_MODULE} ]]; then - emesonargs+=( $(meson_feature nls) ) + gst_conf+=( $(meson_feature nls) ) fi einfo "Configuring to build ${GST_PLUGINS_ENABLED} plugin(s) ..." - emesonargs+=( + gst_conf+=( -Dexamples=disabled -Dpackage-name="Gentoo GStreamer ebuild" -Dpackage-origin="https://www.gentoo.org" + -Dgst_debug=false + $(meson_feature test tests) "${@}" ) - meson_src_configure + meson_src_configure "${gst_conf[@]}" } -read -d '' __MESON_EXTRACT_TARGET_FILENAME <<"EOF" + +# @FUNCTION: _gstreamer_get_target_filename +# @INTERNAL +# @DESCRIPTION: +# Extracts build and target filenames from meson-data for given submatch +_gstreamer_get_target_filename() { + cat >"${WORKDIR}/_gstreamer_get_target_filename.py" <<"EOF" import json import sys @@ -241,12 +248,8 @@ for i in range(len(data)): print(target['filename'][0] + ':' + target['install_filename'][0]) EOF -# @FUNCTION: _gstreamer_get_target_filename -# @INTERNAL -# @DESCRIPTION: -# Extracts build and target filenames from meson-data for given submatch -_gstreamer_get_target_filename() { - python -c "${__MESON_EXTRACT_TARGET_FILENAME}" "$@" + ${EPYTHON} "${WORKDIR}/_gstreamer_get_target_filename.py" $@ \ + || die "Failed to extract target filenames from meson-data" } # @FUNCTION: gstreamer_multilib_src_compile @@ -255,7 +258,7 @@ _gstreamer_get_target_filename() { gstreamer_multilib_src_compile() { local plugin_dir plugin - for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do + for plugin_dir in "${GST_PLUGINS_BUILD_DIR}" ; do plugin=$(_gstreamer_get_target_filename $(gstreamer_get_plugin_dir ${plugin_dir})) plugin_path="${plugin%%:*}" eninja "${plugin_path/"${BUILD_DIR}/"}" 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 @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE="gst-plugins-bad" GST_PLUGINS_ENABLED="accurip adpcmdec adpcmenc aiff asfmux audiobuffersplit audiofxbad audiolatency audiomixmatrix audiovisualizers autoconvert bayer camerabin2 coloreffects deb ugutils dvbsubenc dvbsuboverlay dvdspu faceoverlay festival fieldanalysis freeverb frei0r gaudieffects gdp geometrictransform id3tag inter interlace ivfpars e ivtc jp2kdecimator jpegformat librfb midi mpegdemux mpegpsmux mpegtsdemux mpegtsmux mxf netsim onvif pcapparse pnm proxy rawparse removesilence rist rtmp2 rtp sdp segmentclip siren smooth speed subenc switchbin timecode videofilters videoframe_audiolevel videoparsers videosignal vmnc y4m" @@ -19,7 +19,6 @@ IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep def # 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) RDEPEND=" - >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) @@ -66,6 +65,7 @@ multilib_src_configure() { } multilib_src_test() { + # TODO: Test on machine where X11 is present unset DISPLAY # Tests are slower than upstream expects CK_DEFAULT_TIMEOUT=300 virtx eninja check 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 @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE="gst-plugins-base" GST_PLUGINS_ENABLED="adder app audioconvert audiomixer audiorate audioresample audiotestsrc compositor encoding gio gio-typefinder overlaycomposition pbtypes playback rawparse subparse tcp typefind videoconvert videorate videoscale videotestsrc volume" @@ -64,7 +64,6 @@ GL_DEPS=" RDEPEND=" app-text/iso-codes >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) @@ -113,6 +112,7 @@ multilib_src_configure() { if use opengl || use gles2; then # because meson doesn't likes extraneous commas + local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) ) local gl_platform=( $(use X && echo glx) $(use egl && echo egl) ) local gl_winsys=( $(use X && echo x11) @@ -123,7 +123,7 @@ multilib_src_configure() { emesonargs+=( -Dgl=enabled - -Dgl_api=opengl$(use gles2 && echo ,gles2) + -Dgl_api=$(IFS=, ; echo "${gl_api[*]}") -Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}") -Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}") ) 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 @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE="gst-plugins-good" GST_PLUGINS_ENABLED="alpha apetag audiofx audioparsers auparse autodetect avi cutter debugutils deinterlace dtmf effectv equalizer flv flx goom goom2k1 icydemux id3demux imagefreeze interleave isomp4 law level matroska monoscope multifile multipart replaygain rtp rtpmanager rtsp shapewipe smpte spectrum udp videobox videocrop videofilter videomixer wavenc wavparse y4m" @@ -15,9 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8 IUSE="+orc" RDEPEND=" - >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}] >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) @@ -26,6 +24,8 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 " +DOCS="AUTHORS ChangeLog NEWS README RELEASE" + multilib_src_configure() { local emesonargs=( -Dbz2=enabled ) @@ -33,7 +33,6 @@ multilib_src_configure() { } multilib_src_install_all() { - DOCS="AUTHORS ChangeLog NEWS README RELEASE" einstalldocs find "${ED}" -name '*.la' -delete || die } 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 @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE="gst-plugins-ugly" GST_PLUGINS_ENABLED="asfdemux dvdlpcmdec dvdsub realmedia xingmux" @@ -14,16 +14,15 @@ HOMEPAGE="https://gstreamer.freedesktop.org/" LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library RDEPEND=" - >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}] >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 " +DOCS="AUTHORS ChangeLog NEWS README RELEASE" + multilib_src_install_all() { - DOCS="AUTHORS ChangeLog NEWS README RELEASE" einstalldocs find "${ED}" -name '*.la' -delete || die } diff --git a/media-libs/gstreamer/gstreamer-1.18.4.ebuild b/media-libs/gstreamer/gstreamer-1.18.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit gstreamer-meson bash-completion-r1 multilib-minimal pax-utils +inherit gstreamer-meson bash-completion-r1 pax-utils DESCRIPTION="Open source multimedia framework" HOMEPAGE="https://gstreamer.freedesktop.org/" @@ -12,11 +12,9 @@ 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" -IUSE="+caps +introspection nls +orc test unwind" -RESTRICT="!test? ( test )" +IUSE="+caps +introspection +orc unwind" RDEPEND=" - >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( @@ -30,8 +28,6 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 sys-devel/bison sys-devel/flex - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - nls? ( sys-devel/gettext ) " src_configure() { @@ -57,11 +53,9 @@ multilib_src_configure() { # Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo local emesonargs=( -Dbenchmarks=enabled - -Dgst_debug=false -Dcheck=enabled $(meson_feature unwind libunwind) $(meson_feature unwind libdw) - $(meson_feature test tests) ) # -Dintrospection=$(multilib_native_usex introspection) @@ -75,7 +69,7 @@ multilib_src_configure() { ) fi - meson_src_configure + gstreamer_multilib_src_configure } multilib_src_install() { diff --git a/media-plugins/gst-plugins-aom/gst-plugins-aom-1.18.4.ebuild b/media-plugins/gst-plugins-aom/gst-plugins-aom-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.18.4.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.18.4.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.18.4.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.18.4.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-good inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit gstreamer-meson multilib-minimal +inherit gstreamer-meson MY_PN="gst-libav" MY_PV="$(ver_cut 1-3)" @@ -28,7 +28,6 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " S="${WORKDIR}/${MY_P}" 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 @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit multilib-build diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.18.4.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.18.4.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-ugly inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.18.4.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-good inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-base inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.18.4.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.18.4.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-good inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.18.4.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.18.4.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-good inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit gstreamer-meson multilib-minimal +inherit gstreamer-meson MY_PN="gstreamer-vaapi" DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer" @@ -48,7 +48,6 @@ GL_DEPS=" " RDEPEND=" >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}] >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}] >=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}] @@ -66,7 +65,6 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " S="${WORKDIR}/${MY_PN}-${PV}" 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 @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-good inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.18.4.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-good inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.18.4.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-bad inherit gstreamer-meson diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.18.4.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.18.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GST_ORG_MODULE=gst-plugins-ugly inherit gstreamer-meson