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/, media-plugins/gst-plugins-vaapi/files/
Date: Mon, 22 Nov 2021 17:37:17
Message-Id: 1637602559.71597a2506a6df852cde9b4c693c88972b5065e4.floppym@gentoo
1 commit: 71597a2506a6df852cde9b4c693c88972b5065e4
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 22 17:35:59 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 22 17:35:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71597a25
7
8 media-plugins/gst-plugins-vaapi: avoid calling python3
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 | 4 ++++
15 2 files changed, 30 insertions(+)
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 new file mode 100644
19 index 000000000000..4a1d19fa487a
20 --- /dev/null
21 +++ b/media-plugins/gst-plugins-vaapi/files/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch
22 @@ -0,0 +1,26 @@
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 c1c1a02a825d..4fca3ec4362a 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 @@ -72,6 +72,10 @@ S="${WORKDIR}/${MY_PN}-${PV}"
55 # FIXME: "Failed to create vaapipostproc element"
56 RESTRICT="test"
57
58 +PATCHES=(
59 + "${FILESDIR}/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch"
60 +)
61 +
62 multilib_src_configure() {
63 local emesonargs=(
64 -Dwith_encoders=yes