From ba6effbcc0d8d9795c4f496457ddfdd024b6e864 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 Apr 2024 02:14:11 +0100 Subject: gentoo auto-resync : 02:04:2024 - 02:14:11 --- media-plugins/gst-plugins-vaapi/Manifest | 8 +- .../gst-plugins-vaapi-1.20.5.ebuild | 4 +- .../gst-plugins-vaapi-1.20.6.ebuild | 4 +- .../gst-plugins-vaapi-1.22.11.ebuild | 98 ++++++++++++++++++++++ .../gst-plugins-vaapi-1.22.3-r1.ebuild | 98 ---------------------- 5 files changed, 108 insertions(+), 104 deletions(-) create mode 100644 media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.11.ebuild delete mode 100644 media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.3-r1.ebuild (limited to 'media-plugins/gst-plugins-vaapi') diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest index fd95566314ff..b4cf93400243 100644 --- a/media-plugins/gst-plugins-vaapi/Manifest +++ b/media-plugins/gst-plugins-vaapi/Manifest @@ -1,7 +1,7 @@ DIST gstreamer-vaapi-1.20.5.tar.xz 801628 BLAKE2B 4c3203baefafccbf8983c9e1da17a3455a0566d27b9a12b4d30292289cded803fb4ae8de1f26ff3536c632984227809df69fa9de78af4190acc30b6750c2d27c SHA512 fd24a58c83b0f820b1b2ca3c179228574a16b9f2657988de0c4569d925f01eb131853b0a322ce95b8523578e66ca66443900af1a5e022ecb4081bfe86a2e23bc DIST gstreamer-vaapi-1.20.6.tar.xz 801364 BLAKE2B 891e84099a558b31a152b6be2062753201a3958ce5fb67af37525c7b548404636cfeaa9578cdd485fbaddfabfd929f008ea07d0107975cc8174c58e38e791311 SHA512 3c386400b90ce7a90c0bec2244f0ef1a069cea053915abad3803e67ef7b859276f91a859ba1c959aedbfcb395058a0b0d917e9dd2f148b1cc038469996388af3 -DIST gstreamer-vaapi-1.22.3.tar.xz 535108 BLAKE2B a4c7bf18c448a3c1201c4173da02bb14ee0e5ab7c0a841638b8e101800ff85c1709a7faf3655d6ec432ec646405ad394f646b7e77f5aa3670ccd2569dd006429 SHA512 ffbc70d25bc56de0b21fef6cf30f025ccb8d92c981254dcc278a866101812908aacefcbdb745857dff613f81c713ba86ceac1a9b0296324607f0baa7a12f7399 -EBUILD gst-plugins-vaapi-1.20.5.ebuild 4161 BLAKE2B e7c097d914609537e7593c1f00e9fd0c65c7f63a74db1b6c8c145c63742382a23874785eb27a5fd400250a77c335fe9e4ff01b90d60ed731de7f98893e540526 SHA512 38a72317e61061530d7ecfdc82019ccc7b90a7f2d91c5ed60dc7525ae3043a0920b34a80067d6414adfd1e6e3be6c0692233b90dd25c11d70800b7f959badb11 -EBUILD gst-plugins-vaapi-1.20.6.ebuild 4161 BLAKE2B e7c097d914609537e7593c1f00e9fd0c65c7f63a74db1b6c8c145c63742382a23874785eb27a5fd400250a77c335fe9e4ff01b90d60ed731de7f98893e540526 SHA512 38a72317e61061530d7ecfdc82019ccc7b90a7f2d91c5ed60dc7525ae3043a0920b34a80067d6414adfd1e6e3be6c0692233b90dd25c11d70800b7f959badb11 -EBUILD gst-plugins-vaapi-1.22.3-r1.ebuild 4130 BLAKE2B d48cdf30e075ddaec6accab840ff4b4b6b3033e8ad636d2116da6432668d262274e51cfcd3b38c281f3323103cb0e287538ac35367b9e4041d4786651c0dec8f SHA512 fe8886e9e244e9d400827834010da6c7d20acefd297642e5ea9dfeed19b6ef8d770f67032f81212092b9c1511efb46eef056fcf345366b89fb3cba7fe9858ede +DIST gstreamer-vaapi-1.22.11.tar.xz 552468 BLAKE2B 0353699651add70639a4f7d591eccb646f5d6cda3ba8832553597b7b4e9bd3ebfe07d9eb1ac6e078219ee630131d502adccc8106a2207bb0234353905bafd8cd SHA512 939b748fea88c94ad59c1d4610a872a794b383382096a8f5f011a21d4c8fb041c28e1aa9a8d54f519fb3e48a69ed79622b0d45be01d2d5a900738a7928401563 +EBUILD gst-plugins-vaapi-1.20.5.ebuild 4192 BLAKE2B 27d3aacf434df974e01798e5568850cffdde58342f31577325706e3859eed5ed2743076465ab0f9ac773b621f56db32e5148ef88bb8af7e4b67318b2f3dce759 SHA512 4f9a23f5be760d517f3a73abd742993fdd05d0efe03882f83e4766d43ca4fed1b53b09f330c80c7b4f94ccb172f5ec2d4ac3f69838b9f147c9e04f9f8d37ec9a +EBUILD gst-plugins-vaapi-1.20.6.ebuild 4192 BLAKE2B 27d3aacf434df974e01798e5568850cffdde58342f31577325706e3859eed5ed2743076465ab0f9ac773b621f56db32e5148ef88bb8af7e4b67318b2f3dce759 SHA512 4f9a23f5be760d517f3a73abd742993fdd05d0efe03882f83e4766d43ca4fed1b53b09f330c80c7b4f94ccb172f5ec2d4ac3f69838b9f147c9e04f9f8d37ec9a +EBUILD gst-plugins-vaapi-1.22.11.ebuild 4105 BLAKE2B 3292698269727730f80e3b1452462a5e7cedaf6b402a0e6c8af6098d105b7c455e40f2d80dde282ac4cd0eec8113d5fe3f66d2bb37ee64f3d6e3320ddb9b7bc2 SHA512 74ba64dfebd2f4420872175fe75ed69a23b5a0aa2daf5b74d0b939c938b3867c10191a3382c864e5df744127aebf78f553132127d61df06d01853eb99bd23332 MISC metadata.xml 389 BLAKE2B 5bc087279f785f79761e488cbe11d0ecbdb3eba144a9f7312521ef98aed1f380acd1a0bdeeb041939dc3eeefe5df6b9ce95def5cad190f48ef600e1a2a9db661 SHA512 5ea6c64550ee823a3e74bf9dde214fb89967df663f32cde421e9d50f3cbc88f4de3598da976d3bebe57274f18c642c42b68705cc67af8268d022220371958a75 diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.5.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.5.ebuild index eda69333148d..0bc025df3130 100644 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.5.ebuild +++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -72,6 +72,8 @@ S="${WORKDIR}/${MY_PN}-${PV}" RESTRICT="test" multilib_src_configure() { + GST_PLUGINS_NOAUTO="wayland" + local emesonargs=( -Dwith_encoders=yes -Dwith_drm=$(usex drm yes no) diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.6.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.6.ebuild index eda69333148d..0bc025df3130 100644 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.6.ebuild +++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -72,6 +72,8 @@ S="${WORKDIR}/${MY_PN}-${PV}" RESTRICT="test" multilib_src_configure() { + GST_PLUGINS_NOAUTO="wayland" + local emesonargs=( -Dwith_encoders=yes -Dwith_drm=$(usex drm yes no) diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.11.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.11.ebuild new file mode 100644 index 000000000000..8f7698e27087 --- /dev/null +++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.11.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gstreamer-meson + +MY_PN="gstreamer-vaapi" +DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer" +HOMEPAGE="https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi" +SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="1.0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="+drm +egl +gles2 opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva + +# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises, +# we design gst-vaapi ebuild in terms of GL API as main choice as well, meaning that USE opengl and/or gles2 is required to +# enable opengl support at all and choices get chained from there. +# One or multiple video output are required: drm, x11, glx, egl and/or wayland; +# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled; +# So "|| ( drm egl opengl wayland X )" would be wrong, because egl isn't built with USE="egl -opengl -gles2", ending up with no video outputs. +# As we ensure at least one working GL output with other REQUIRED_USE, we can put gles2/opengl in REQUIRED_USE instead of egl, solving the issue. +# gles2 API only supported windowing system (on linux) is EGL, so require it +# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X") +REQUIRED_USE=" + || ( drm gles2 opengl wayland X ) + gles2? ( egl ) + opengl? ( || ( egl X ) ) + wayland? ( drm ) +" + +# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c +# USE flag behavior: +# 'drm' enables vaapi drm support +# 'egl' enables EGL platform support (but only if also 'opengl||gles2') +# - 'egl' is exposed as a USE flag mainly to get EGL support instead of or in addition to GLX support with desktop GL while keeping it optional for pure GLX cases; +# it's always required with USE=gles2, thus USE="gles2 opengl X" will require and build desktop GL EGL platform support as well on top of GLX, which doesn't add extra deps at that point. +# 'gles2' enables GLESv2 or GLESv3 based GL API support +# 'opengl' enables desktop OpenGL based GL API support +# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2') +# 'X' enables non-GL X support; GLX support when combined with 'opengl' +# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16) +GST_REQ="${PV}" +GL_DEPS=" + >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?] + media-libs/mesa[gles2?,egl(+)?,X?,${MULTILIB_USEDEP}] +" +RDEPEND=" + >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}] + >=media-libs/libva-1.10.0:=[drm(+)?,wayland?,X?,${MULTILIB_USEDEP}] + drm? ( + >=virtual/libudev-208:=[${MULTILIB_USEDEP}] + >=x11-libs/libdrm-2.4.98[${MULTILIB_USEDEP}] + ) + gles2? ( ${GL_DEPS} ) + opengl? ( ${GL_DEPS} ) + wayland? ( >=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] + x11-libs/libXrender[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +# FIXME: "Failed to create vaapipostproc element" +RESTRICT="test" + +multilib_src_configure() { + GST_PLUGINS_NOAUTO="wayland" + + local emesonargs=( + -Dencoders=enabled + $(meson_feature drm) + $(meson_feature X x11) + $(meson_feature wayland) + ) + + if use opengl || use gles2; then + emesonargs+=( $(meson_feature egl) ) + else + emesonargs+=( -Degl=disabled ) + fi + + if use opengl && use X; then + emesonargs+=( -Dglx=enabled ) + else + emesonargs+=( -Dglx=disabled ) + fi + + # Workaround EGL/eglplatform.h being built with X11 present + use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11" + + gstreamer_multilib_src_configure +} diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.3-r1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.3-r1.ebuild deleted file mode 100644 index 69a7ccfc8d05..000000000000 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.3-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..11} ) - -inherit gstreamer-meson python-any-r1 - -MY_PN="gstreamer-vaapi" -DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer" -HOMEPAGE="https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi" -SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="1.0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva - -# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises, -# we design gst-vaapi ebuild in terms of GL API as main choice as well, meaning that USE opengl and/or gles2 is required to -# enable opengl support at all and choices get chained from there. -# One or multiple video output are required: drm, x11, glx, egl and/or wayland; -# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled; -# So "|| ( drm egl opengl wayland X )" would be wrong, because egl isn't built with USE="egl -opengl -gles2", ending up with no video outputs. -# As we ensure at least one working GL output with other REQUIRED_USE, we can put gles2/opengl in REQUIRED_USE instead of egl, solving the issue. -# gles2 API only supported windowing system (on linux) is EGL, so require it -# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X") -REQUIRED_USE=" - || ( drm gles2 opengl wayland X ) - gles2? ( egl ) - opengl? ( || ( egl X ) ) -" - -# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c -# USE flag behavior: -# 'drm' enables vaapi drm support -# 'egl' enables EGL platform support (but only if also 'opengl||gles2') -# - 'egl' is exposed as a USE flag mainly to get EGL support instead of or in addition to GLX support with desktop GL while keeping it optional for pure GLX cases; -# it's always required with USE=gles2, thus USE="gles2 opengl X" will require and build desktop GL EGL platform support as well on top of GLX, which doesn't add extra deps at that point. -# 'gles2' enables GLESv2 or GLESv3 based GL API support -# 'opengl' enables desktop OpenGL based GL API support -# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2') -# 'X' enables non-GL X support; GLX support when combined with 'opengl' -# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16) -GST_REQ="${PV}" -GL_DEPS=" - >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?] - media-libs/mesa[gles2?,egl(+)?,X?,${MULTILIB_USEDEP}] -" -RDEPEND=" - >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}] - >=media-libs/libva-1.10.0:=[drm(+)?,wayland?,X?,${MULTILIB_USEDEP}] - drm? ( - >=virtual/libudev-208:=[${MULTILIB_USEDEP}] - >=x11-libs/libdrm-2.4.98[${MULTILIB_USEDEP}] - ) - gles2? ( ${GL_DEPS} ) - opengl? ( ${GL_DEPS} ) - wayland? ( >=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -# FIXME: "Failed to create vaapipostproc element" -RESTRICT="test" - -multilib_src_configure() { - local emesonargs=( - -Dencoders=enabled - $(meson_feature drm) - $(meson_feature X x11) - $(meson_feature wayland) - ) - - if use opengl || use gles2; then - emesonargs+=( $(meson_feature egl) ) - else - emesonargs+=( -Degl=disabled ) - fi - - if use opengl && use X; then - emesonargs+=( -Dglx=enabled ) - else - emesonargs+=( -Dglx=disabled ) - fi - - # Workaround EGL/eglplatform.h being built with X11 present - use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11" - - gstreamer_multilib_src_configure -} -- cgit v1.2.3