Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-vaapi/files/, media-plugins/gst-plugins-vaapi/
Date: Mon, 22 Nov 2021 21:11:37
Message-Id: 1637615327.6ebee8f56b07d37f890bf092671189c39ad7579a.floppym@gentoo
1 commit: 6ebee8f56b07d37f890bf092671189c39ad7579a
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 22 21:06:49 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 22 21:08:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ebee8f5
7
8 media-plugins/gst-plugins-vaapi: inherit python-any-r1
9
10 Closes: https://bugs.gentoo.org/823701
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 ...calling-python3-script-to-enable-git-hook.patch | 26 ----------------------
14 .../gst-plugins-vaapi-1.18.4-r2.ebuild | 8 +++----
15 2 files changed, 3 insertions(+), 31 deletions(-)
16
17 diff --git a/media-plugins/gst-plugins-vaapi/files/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch b/media-plugins/gst-plugins-vaapi/files/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch
18 deleted file mode 100644
19 index 4a1d19fa487a..000000000000
20 --- a/media-plugins/gst-plugins-vaapi/files/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch
21 +++ /dev/null
22 @@ -1,26 +0,0 @@
23 -From a417420d30ed258143259de4706795e0515ad795 Mon Sep 17 00:00:00 2001
24 -From: Mike Gilbert <floppym@g.o>
25 -Date: Mon, 22 Nov 2021 12:31:57 -0500
26 -Subject: [PATCH] Avoid calling python3 script to enable git hook
27 -
28 -This has not been submitted upstream: the gstreamer-vaapi repo appears
29 -to be merging into the gstreamer "mono" repo, where this issue does not
30 -exist.
31 ----
32 - meson.build | 3 ---
33 - 1 file changed, 3 deletions(-)
34 -
35 -diff --git a/meson.build b/meson.build
36 -index 60e26e0f..05aefff7 100644
37 ---- a/meson.build
38 -+++ b/meson.build
39 -@@ -207,6 +207,3 @@ if gst_version_nano == 0
40 - endif
41 -
42 - configure_file(output: 'config.h', configuration: cdata)
43 --
44 --python3 = import('python').find_installation()
45 --run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')
46 ---
47 -2.34.0
48 -
49
50 diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild
51 index 4fca3ec4362a..f56f160b793d 100644
52 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild
53 +++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild
54 @@ -2,8 +2,9 @@
55 # Distributed under the terms of the GNU General Public License v2
56
57 EAPI=7
58 +PYTHON_COMPAT=( python3_{8..10} )
59
60 -inherit gstreamer-meson
61 +inherit gstreamer-meson python-any-r1
62
63 MY_PN="gstreamer-vaapi"
64 DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
65 @@ -66,16 +67,13 @@ RDEPEND="
66 DEPEND="${RDEPEND}
67 >=dev-util/gtk-doc-am-1.12
68 "
69 +BDEPEND="${PYTHON_DEPS}"
70
71 S="${WORKDIR}/${MY_PN}-${PV}"
72
73 # FIXME: "Failed to create vaapipostproc element"
74 RESTRICT="test"
75
76 -PATCHES=(
77 - "${FILESDIR}/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch"
78 -)
79 -
80 multilib_src_configure() {
81 local emesonargs=(
82 -Dwith_encoders=yes