diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-23 07:00:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-23 07:00:28 +0100 |
commit | e23cdda4dbb0c83b9e682ab5e916085a35203da5 (patch) | |
tree | 5a4ac448a3b288b731c24d947e0ce52df3cab07b /media-plugins/gst-plugins-vaapi | |
parent | 8187a741807f3e9a9e26304973cf18087dcf2560 (diff) |
gentoo resync : 23.06.2018
Diffstat (limited to 'media-plugins/gst-plugins-vaapi')
6 files changed, 152 insertions, 67 deletions
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest index 6dcdade13d96..5cb948b4b734 100644 --- a/media-plugins/gst-plugins-vaapi/Manifest +++ b/media-plugins/gst-plugins-vaapi/Manifest @@ -1,5 +1,6 @@ -DIST gstreamer-vaapi-1.12.3.tar.xz 996360 BLAKE2B d34804f278780e073b553542258f865a93e62d48b0cd276fa7fa47e54f03a5484d7ddc61851f75e583dbcc03d6dbfce6a9c8df0e4c1c6174dfaefdcf867ca068 SHA512 c70da985b1c0c5048be8d83ba62622b9064d78193433b897d54824125de3eeabe4f9765ec0a5199a2d9eaa91d0625dfa2b7ef3d8245b23cf57361691d72b1dc4 +AUX 1.14.1-fix_no_GL.patch 968 BLAKE2B 31c0857fd971f574455d9fb74ae73590f868c50f60d145fb16a2370ed84a34d3069b68ec3d4b810e023f4fe76dc0608281a0d68f5169ec1e7fa17c0424b09eb1 SHA512 56bb4fcede23a85b52efdd4c008665caef1c78097c899261c8ea702bf04cb91a12175eedcf00b0b3f74de43b80d83dee2a043f1552e2f852f7d372e7b112f5e0 DIST gstreamer-vaapi-1.12.4.tar.xz 998844 BLAKE2B e37d6f66054e46e421ffbd4c27362bba0fb2ad57bfccb4891ba85573dec18ca304654336768a519c202bda0e829b80ab75a5708ddfc1dc9751774b4ef783a16d SHA512 2251395f77be8d17837f4b0d38a2271155a5fbd57560fac9334660abb34a4f609dda8d9714bfa8f64395a85d3fa336f7ad1b8e8e7490b5288843fbe3d1dbd7f5 -EBUILD gst-plugins-vaapi-1.12.3.ebuild 1790 BLAKE2B 90fc4340a7302f767070ac173262bb0371a6cac96b72488082add93a33ef88b58178265820933c5479e1009542e2e113b8e353bf86d86de7f78158cd2a2af960 SHA512 ccad5147d9b655c34c5b2dc3ed0deafafc9a415b76a6480834daf7cc7cbf88a8cbc8ce9a92ff4a32534b20ca56efd4dfc8880185ff6420de5bc73fefac4b8655 -EBUILD gst-plugins-vaapi-1.12.4.ebuild 1774 BLAKE2B b596ef3e65fe129d27e029f7363a4bc8278665c7d9f702d2060b05871a9253e3a874c4017bd22ff5cffc92ba177f4b4272c04b76e2a3fbdbec829b90e9d0f28c SHA512 d9db508f53ba7864a827069360f452b6b36622b88f6fa84f5cf5063b9ad55fc1ea6f9a501c11a59a51e9af47c056a85c7235a18380867a03ad8ca381c5845ddb -MISC metadata.xml 372 BLAKE2B 6c8f75330683b6f2f4ec04c6de7d7e603ea3f40201b7e6fe702044f3d2e4788f3c72bd9b315e9a8c209d3e5f54f94af463adf0aac96c28ffbef6c48b39077eaa SHA512 98e71b01695b8b009a6ca3e909b0c94d9e113f0f7ae04fe69c5bfd702602db192aa41b6f918517b6a275497a011ecbadc5351d1a17d328d94607daa66698c157 +DIST gstreamer-vaapi-1.14.1.tar.xz 1064992 BLAKE2B bae42e3cafc6d1e5799a8ef795f9e1f6a6ac60b6878aea1aed81550fd7e408c5104b5ea89d6e5f7535ac8d21fe5f14fccf061e15eb68a7c1c60c29ad4a4deabb SHA512 f1eecb61cb92439d93a47ac162a5cda8a456dbb205594f378e8adf98c45e4cd59553ccfd3bbcf1c6a568c6af5e7834bbfb0ea17610f0c7e7c9e268a4eeb5b020 +EBUILD gst-plugins-vaapi-1.12.4.ebuild 1775 BLAKE2B 1c603d48215c62da100941f7f18de48a11c3a255b5dd56a2fee03e0131b97383f1e7b5411eafdbdb5cd7512722ee8a3f6aba8061be1b5fb71aa23b332ee6409b SHA512 d468d8a55e17d85745788a690c00ef91c1b8b5a45046fc1177cedb48f32ae737a69ee29344b21985de74b5b80c6ad86919782caa0d6c884d2dabc9c994d38e1c +EBUILD gst-plugins-vaapi-1.14.1.ebuild 4367 BLAKE2B fec047c0c70d723318d0c4f28bf810f1ce6820a425020077ca247e74f2bba34a63d2bdbc08f08c33a3018420e5a51fd7e8f4cfa9c92f30a0095491b3efb6d786 SHA512 95093152f3e85f4990ae5942269144157f1f00af87d052176588eb90f0ac569cec7dff336b09e3782e485591ede23ff80dfab625f16489357b515d7f4c5fdf5b +MISC metadata.xml 433 BLAKE2B d46828441b89363cce84ff10747ad13f30329aea96cf2acd2fc7deb786c3f3ec0ec5a86011657d39ac905f9f33a3904b38860b16f53cfb150530cc4142f1beed SHA512 366bbe78a862a65a8b82ee43521508db5766cde3a72f4ad8e7f0b703dc23347589e07dcfdb3f3ec12e62ac91adb38b2a58cee5dff4732069ac2b8724524a405b diff --git a/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch b/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch new file mode 100644 index 000000000000..d0a34b5bd0c2 --- /dev/null +++ b/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch @@ -0,0 +1,33 @@ +From 45fb111850955d9192e43b9dbcb2ef8e3974e58d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= + <vjaquez@igalia.com> +Date: Mon, 21 May 2018 13:27:14 +0200 +Subject: plugins: guard GstGL code + +--- + gst/vaapi/gstvaapipluginutil.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c +index fa25131..648c91b 100644 +--- a/gst/vaapi/gstvaapipluginutil.c ++++ b/gst/vaapi/gstvaapipluginutil.c +@@ -246,6 +246,7 @@ gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object) + static void + gst_vaapi_find_gl_context (GstElement * element) + { ++#if USE_GST_GL_HELPERS + GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element); + + /* if the element is vaapisink or any vaapi encoder it doesn't need +@@ -282,6 +283,7 @@ no_valid_gl_display: + gst_object_replace (&plugin->gl_other_context, NULL); + return; + } ++#endif + } + + gboolean +-- +cgit v1.1 + diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.12.3.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.12.3.ebuild deleted file mode 100644 index 59515fff50ad..000000000000 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.12.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils multilib-minimal - -MY_PN="gstreamer-vaapi" -DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer" -HOMEPAGE="https://cgit.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 x86" - -IUSE="+drm egl opengl wayland +X" -REQUIRED_USE="|| ( drm opengl wayland X )" - -RDEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-bad-${PV}:${SLOT}[opengl?,${MULTILIB_USEDEP}] - >=x11-libs/libva-1.4.0[drm?,X?,opengl?,wayland?,${MULTILIB_USEDEP}] - <x11-libs/libva-1.99 - drm? ( - >=virtual/libudev-208:=[${MULTILIB_USEDEP}] - >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] ) - egl? ( - >=media-libs/gst-plugins-bad-${PV}:${SLOT}[opengl,${MULTILIB_USEDEP}] ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.12 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --disable-static \ - $(use_enable drm) \ - $(use_enable egl) \ - $(use_enable opengl glx) \ - $(use_enable wayland) \ - $(use_enable X x11) -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --modules -} diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.12.4.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.12.4.ebuild index 58e712987104..1227c4df21ba 100644 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.12.4.ebuild +++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.12.4.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStre HOMEPAGE="https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi" SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="1.0" KEYWORDS="amd64 ~arm64 x86" diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild new file mode 100644 index 000000000000..6f51d379aecf --- /dev/null +++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit ltprune multilib-minimal + +MY_PN="gstreamer-vaapi" +DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer" +HOMEPAGE="https://cgit.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 ~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="1.14.1" +GL_DEPS=" + >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?] + media-libs/mesa[gles2?,egl?,${MULTILIB_USEDEP}] +" +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}] + drm? ( + >=virtual/libudev-208:=[${MULTILIB_USEDEP}] + >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] + ) + gles2? ( ${GL_DEPS} ) + opengl? ( ${GL_DEPS} ) + wayland? ( >=dev-libs/wayland-1.0.6[${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} + >=dev-util/gtk-doc-am-1.12 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +PATCHES=( "${FILESDIR}"/${PV}-fix_no_GL.patch ) + +multilib_src_configure() { + local myconf=() + if use opengl || use gles2; then + myconf+=( + $(use_enable egl) + --with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed + ) + else + myconf+=( + --disable-egl + --without-glapi + ) + fi + + if use opengl && use X; then + myconf+=( --enable-glx ) + else + myconf+=( --disable-glx ) + fi + + ECONF_SOURCE=${S} \ + econf \ + --disable-static \ + --disable-debug \ + --disable-examples \ + --enable-encoders \ + $(use_enable drm) \ + $(use_enable X x11) \ + $(use_enable wayland) \ + --without-gtk \ + "${myconf[@]}" +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files --modules +} diff --git a/media-plugins/gst-plugins-vaapi/metadata.xml b/media-plugins/gst-plugins-vaapi/metadata.xml index be2c01c84135..73b9785ae4dc 100644 --- a/media-plugins/gst-plugins-vaapi/metadata.xml +++ b/media-plugins/gst-plugins-vaapi/metadata.xml @@ -8,5 +8,6 @@ <use> <flag name="drm">Enable DRM renderer</flag> <flag name="egl">Enable EGL support</flag> + <flag name="gles2">Enable GLESv2 and GLESv3 support</flag> </use> </pkgmetadata> |