Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-vaapi/, media-plugins/gst-plugins-vaapi/files/
Date: Wed, 01 Jan 2020 15:08:50
Message-Id: 1577891299.0deea97be4f5038f9da47d705c7299476e705012.leio@gentoo
1 commit: 0deea97be4f5038f9da47d705c7299476e705012
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 1 15:06:45 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 1 15:08:19 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0deea97b
7
8 media-plugins/gst-plugins-vaapi: remove old
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 media-plugins/gst-plugins-vaapi/Manifest | 2 -
14 .../gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch | 33 ------
15 .../gst-plugins-vaapi-1.14.1.ebuild | 112 ---------------------
16 .../gst-plugins-vaapi-1.14.3.ebuild | 110 --------------------
17 4 files changed, 257 deletions(-)
18
19 diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
20 index c0b345dffbb..7b5b00fb693 100644
21 --- a/media-plugins/gst-plugins-vaapi/Manifest
22 +++ b/media-plugins/gst-plugins-vaapi/Manifest
23 @@ -1,3 +1 @@
24 -DIST gstreamer-vaapi-1.14.1.tar.xz 1064992 BLAKE2B bae42e3cafc6d1e5799a8ef795f9e1f6a6ac60b6878aea1aed81550fd7e408c5104b5ea89d6e5f7535ac8d21fe5f14fccf061e15eb68a7c1c60c29ad4a4deabb SHA512 f1eecb61cb92439d93a47ac162a5cda8a456dbb205594f378e8adf98c45e4cd59553ccfd3bbcf1c6a568c6af5e7834bbfb0ea17610f0c7e7c9e268a4eeb5b020
25 -DIST gstreamer-vaapi-1.14.3.tar.xz 1070536 BLAKE2B 7e3458702072d96acc31c1ac5c4ec9f23f6d618ba922884fb141a0897a04959da7f34c7abff7765f086357d3f8f7532a1582508d117c199f76338ebd3723c6ae SHA512 b89acf63c2900b0cd588cce1a06d959a4f8bbe929c237fce985d3cfce7b94d43a3317f06a42fa77e3ff790fff8a81c8bbeeed7ac797794e4cc3342f18faa69e3
26 DIST gstreamer-vaapi-1.14.5.tar.xz 1068344 BLAKE2B b98363981dc7f111fc8c15188d31dea394b7f6cf300050b95d564b75020931a0f8690d11410f2d3d18d6649ef2ee290c933c3731b4bc3ca43bffb57a4c1bf542 SHA512 287df56ad9bb3fd0754b9f307082eb180c8f0b622e2c9436c5dcf2272a5fb620cb18970726d231688837d52cb169a10e98e14160e51fd82198c34ea612c0d60b
27
28 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
29 deleted file mode 100644
30 index d0a34b5bd0c..00000000000
31 --- a/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch
32 +++ /dev/null
33 @@ -1,33 +0,0 @@
34 -From 45fb111850955d9192e43b9dbcb2ef8e3974e58d Mon Sep 17 00:00:00 2001
35 -From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
36 - <vjaquez@××××××.com>
37 -Date: Mon, 21 May 2018 13:27:14 +0200
38 -Subject: plugins: guard GstGL code
39 -
40 ----
41 - gst/vaapi/gstvaapipluginutil.c | 2 ++
42 - 1 file changed, 2 insertions(+)
43 -
44 -diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c
45 -index fa25131..648c91b 100644
46 ---- a/gst/vaapi/gstvaapipluginutil.c
47 -+++ b/gst/vaapi/gstvaapipluginutil.c
48 -@@ -246,6 +246,7 @@ gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object)
49 - static void
50 - gst_vaapi_find_gl_context (GstElement * element)
51 - {
52 -+#if USE_GST_GL_HELPERS
53 - GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element);
54 -
55 - /* if the element is vaapisink or any vaapi encoder it doesn't need
56 -@@ -282,6 +283,7 @@ no_valid_gl_display:
57 - gst_object_replace (&plugin->gl_other_context, NULL);
58 - return;
59 - }
60 -+#endif
61 - }
62 -
63 - gboolean
64 ---
65 -cgit v1.1
66 -
67
68 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
69 deleted file mode 100644
70 index c3c7c035b24..00000000000
71 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild
72 +++ /dev/null
73 @@ -1,112 +0,0 @@
74 -# Copyright 1999-2018 Gentoo Foundation
75 -# Distributed under the terms of the GNU General Public License v2
76 -
77 -EAPI=6
78 -
79 -inherit ltprune multilib-minimal
80 -
81 -MY_PN="gstreamer-vaapi"
82 -DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
83 -HOMEPAGE="https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi"
84 -SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
85 -
86 -LICENSE="LGPL-2.1+"
87 -SLOT="1.0"
88 -KEYWORDS="amd64 ~arm64 x86"
89 -IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
90 -
91 -# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
92 -# 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
93 -# enable opengl support at all and choices get chained from there.
94 -# One or multiple video output are required: drm, x11, glx, egl and/or wayland;
95 -# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled;
96 -# 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.
97 -# 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.
98 -# gles2 API only supported windowing system (on linux) is EGL, so require it
99 -# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X")
100 -REQUIRED_USE="
101 - || ( drm gles2 opengl wayland X )
102 - gles2? ( egl )
103 - opengl? ( || ( egl X ) )
104 -"
105 -
106 -# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c
107 -# USE flag behavior:
108 -# 'drm' enables vaapi drm support
109 -# 'egl' enables EGL platform support (but only if also 'opengl||gles2')
110 -# - '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;
111 -# 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.
112 -# 'gles2' enables GLESv2 or GLESv3 based GL API support
113 -# 'opengl' enables desktop OpenGL based GL API support
114 -# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2')
115 -# 'X' enables non-GL X support; GLX support when combined with 'opengl'
116 -# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16)
117 -GST_REQ="1.14.1"
118 -GL_DEPS="
119 - >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
120 - media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
121 -"
122 -RDEPEND="
123 - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
124 - >=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
125 - >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
126 - >=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
127 - >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}]
128 - drm? (
129 - >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
130 - >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
131 - )
132 - gles2? ( ${GL_DEPS} )
133 - opengl? ( ${GL_DEPS} )
134 - wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
135 - X? (
136 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
137 - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
138 - x11-libs/libXrender[${MULTILIB_USEDEP}] )
139 -"
140 -DEPEND="${RDEPEND}
141 - >=dev-util/gtk-doc-am-1.12
142 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
143 -"
144 -
145 -S="${WORKDIR}/${MY_PN}-${PV}"
146 -
147 -PATCHES=( "${FILESDIR}"/${PV}-fix_no_GL.patch )
148 -
149 -multilib_src_configure() {
150 - local myconf=()
151 - if use opengl || use gles2; then
152 - myconf+=(
153 - $(use_enable egl)
154 - --with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed
155 - )
156 - else
157 - myconf+=(
158 - --disable-egl
159 - --without-glapi
160 - )
161 - fi
162 -
163 - if use opengl && use X; then
164 - myconf+=( --enable-glx )
165 - else
166 - myconf+=( --disable-glx )
167 - fi
168 -
169 - ECONF_SOURCE=${S} \
170 - econf \
171 - --disable-static \
172 - --disable-debug \
173 - --disable-examples \
174 - --enable-encoders \
175 - $(use_enable drm) \
176 - $(use_enable X x11) \
177 - $(use_enable wayland) \
178 - --without-gtk \
179 - "${myconf[@]}"
180 -}
181 -
182 -multilib_src_install_all() {
183 - einstalldocs
184 - prune_libtool_files --modules
185 -}
186
187 diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
188 deleted file mode 100644
189 index 79f8f43c479..00000000000
190 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
191 +++ /dev/null
192 @@ -1,110 +0,0 @@
193 -# Copyright 1999-2019 Gentoo Authors
194 -# Distributed under the terms of the GNU General Public License v2
195 -
196 -EAPI=6
197 -
198 -inherit multilib-minimal
199 -
200 -MY_PN="gstreamer-vaapi"
201 -DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
202 -HOMEPAGE="https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi"
203 -SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
204 -
205 -LICENSE="LGPL-2.1+"
206 -SLOT="1.0"
207 -KEYWORDS="amd64 arm64 x86"
208 -IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
209 -
210 -# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
211 -# 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
212 -# enable opengl support at all and choices get chained from there.
213 -# One or multiple video output are required: drm, x11, glx, egl and/or wayland;
214 -# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled;
215 -# 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.
216 -# 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.
217 -# gles2 API only supported windowing system (on linux) is EGL, so require it
218 -# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X")
219 -REQUIRED_USE="
220 - || ( drm gles2 opengl wayland X )
221 - gles2? ( egl )
222 - opengl? ( || ( egl X ) )
223 -"
224 -
225 -# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c
226 -# USE flag behavior:
227 -# 'drm' enables vaapi drm support
228 -# 'egl' enables EGL platform support (but only if also 'opengl||gles2')
229 -# - '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;
230 -# 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.
231 -# 'gles2' enables GLESv2 or GLESv3 based GL API support
232 -# 'opengl' enables desktop OpenGL based GL API support
233 -# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2')
234 -# 'X' enables non-GL X support; GLX support when combined with 'opengl'
235 -# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16)
236 -GST_REQ="${PV}"
237 -GL_DEPS="
238 - >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
239 - media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
240 -"
241 -RDEPEND="
242 - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
243 - >=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
244 - >=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
245 - >=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
246 - >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}]
247 - drm? (
248 - >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
249 - >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
250 - )
251 - gles2? ( ${GL_DEPS} )
252 - opengl? ( ${GL_DEPS} )
253 - wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
254 - X? (
255 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
256 - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
257 - x11-libs/libXrender[${MULTILIB_USEDEP}] )
258 -"
259 -DEPEND="${RDEPEND}
260 - >=dev-util/gtk-doc-am-1.12
261 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
262 -"
263 -
264 -S="${WORKDIR}/${MY_PN}-${PV}"
265 -
266 -multilib_src_configure() {
267 - local myconf=()
268 - if use opengl || use gles2; then
269 - myconf+=(
270 - $(use_enable egl)
271 - --with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed
272 - )
273 - else
274 - myconf+=(
275 - --disable-egl
276 - --without-glapi
277 - )
278 - fi
279 -
280 - if use opengl && use X; then
281 - myconf+=( --enable-glx )
282 - else
283 - myconf+=( --disable-glx )
284 - fi
285 -
286 - ECONF_SOURCE=${S} \
287 - econf \
288 - --disable-static \
289 - --disable-debug \
290 - --disable-examples \
291 - --enable-encoders \
292 - $(use_enable drm) \
293 - $(use_enable X x11) \
294 - $(use_enable wayland) \
295 - --without-gtk \
296 - "${myconf[@]}"
297 -}
298 -
299 -multilib_src_install_all() {
300 - einstalldocs
301 - find "${ED}" -name '*.la' -delete || die
302 -}