gentoo resync : 04.08.2018

3 files changed, 114 insertions, 2 deletions

diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 0da49aeac42b..e0ed42b848e8 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,6 +1,8 @@
 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
 DIST gstreamer-vaapi-1.14.1.tar.xz 1064992 BLAKE2B bae42e3cafc6d1e5799a8ef795f9e1f6a6ac60b6878aea1aed81550fd7e408c5104b5ea89d6e5f7535ac8d21fe5f14fccf061e15eb68a7c1c60c29ad4a4deabb SHA512 f1eecb61cb92439d93a47ac162a5cda8a456dbb205594f378e8adf98c45e4cd59553ccfd3bbcf1c6a568c6af5e7834bbfb0ea17610f0c7e7c9e268a4eeb5b020
+DIST gstreamer-vaapi-1.14.2.tar.xz 1068872 BLAKE2B 835eb394d81b4de671703b2ff05b3bf57d2d09bc15d01c865c1c74cf6aad61071149c1f78f693b47b81d4c28f580d5fd6b004a99c26972ac67e5dca13abc8dfa SHA512 7297dc04c116cab5cb066efc2dc34f9510927fadf696475c14ca3b3a3befe8c0ed5c63c9a4039f1f268e79a967c89a34d74048da92198f05833315f90d503202
 EBUILD gst-plugins-vaapi-1.12.4.ebuild 1775 BLAKE2B 1c603d48215c62da100941f7f18de48a11c3a255b5dd56a2fee03e0131b97383f1e7b5411eafdbdb5cd7512722ee8a3f6aba8061be1b5fb71aa23b332ee6409b SHA512 d468d8a55e17d85745788a690c00ef91c1b8b5a45046fc1177cedb48f32ae737a69ee29344b21985de74b5b80c6ad86919782caa0d6c884d2dabc9c994d38e1c
-EBUILD gst-plugins-vaapi-1.14.1.ebuild 4366 BLAKE2B 6d8c3c7ee16cd69058370a222c0278bdcbef3eaea1a5b06c9915f67d54bc763e303c7026569f5cd249e80ef2aac08ce70f5a1d17c04b22f6f0cbfe9f710a3616 SHA512 17b919fdc09360c12add228088ef56640a45b4c1bb18d6b557353f31a57a51cd22bfc5dd07804c908bdf7846712e23b0791b3f1687812f4ce9ccd47970e50454
+EBUILD gst-plugins-vaapi-1.14.1.ebuild 4365 BLAKE2B ed0b9f29fad413cd5889d7c4d16f09d39d9958a95e74c2deab2b1cb67a643916eafd33eb34d65cc9b9a4e722d0a50e5bd41fbdccfaed060300d27740c8bf1905 SHA512 708b42b1e3fc8ab6fbadc0c741f6ee257ce5984fc2d4310142556b34f21b5c9991ea65dc0a48941bcde68126317fc6e634b9a833002e008735fb8774eaf3e941
+EBUILD gst-plugins-vaapi-1.14.2.ebuild 4320 BLAKE2B 8e5f33dc5708969ef7f97db1f5210155e1be268d8345e9f8d8ab31585c3a4f29caad7af5e1a9a95b19a890013a4edb12d0c3ab84c5f8c18e3e020e76f6f7a265 SHA512 3434954aa49ff2168b929b63fd4bf750b726a26411934f1486d170f97b25fbf888facfdb49f36da7a9d4dbef7e2aaf9d5216e44420fe6dcf238a625333bb6528
 MISC metadata.xml 433 BLAKE2B d46828441b89363cce84ff10747ad13f30329aea96cf2acd2fc7deb786c3f3ec0ec5a86011657d39ac905f9f33a3904b38860b16f53cfb150530cc4142f1beed SHA512 366bbe78a862a65a8b82ee43521508db5766cde3a72f4ad8e7f0b703dc23347589e07dcfdb3f3ec12e62ac91adb38b2a58cee5dff4732069ac2b8724524a405b
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
index 7b86dfe360c1..d4dbc76c4689 100644
--- 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
@@ -12,7 +12,7 @@ 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"
+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,
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.2.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.2.ebuild
new file mode 100644
index 000000000000..181114b5eb83
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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="${PV}"
+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}"
+
+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
+	find "${ED}" -name '*.la' -delete || die
+}