commit:     6ebee8f56b07d37f890bf092671189c39ad7579a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 21:06:49 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 21:08:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ebee8f5

media-plugins/gst-plugins-vaapi: inherit python-any-r1

Closes: https://bugs.gentoo.org/823701
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 ...calling-python3-script-to-enable-git-hook.patch | 26 ----------------------
 .../gst-plugins-vaapi-1.18.4-r2.ebuild             |  8 +++----
 2 files changed, 3 insertions(+), 31 deletions(-)

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
deleted file mode 100644
index 4a1d19fa487a..000000000000
--- 
a/media-plugins/gst-plugins-vaapi/files/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a417420d30ed258143259de4706795e0515ad795 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <[email protected]>
-Date: Mon, 22 Nov 2021 12:31:57 -0500
-Subject: [PATCH] Avoid calling python3 script to enable git hook
-
-This has not been submitted upstream: the gstreamer-vaapi repo appears
-to be merging into the gstreamer "mono" repo, where this issue does not
-exist.
----
- meson.build | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 60e26e0f..05aefff7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -207,6 +207,3 @@ if gst_version_nano == 0
- endif
- 
- configure_file(output: 'config.h', configuration: cdata)
--
--python3 = import('python').find_installation()
--run_command(python3, '-c', 'import shutil; 
shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')
--- 
-2.34.0
-

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
index 4fca3ec4362a..f56f160b793d 100644
--- 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
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit gstreamer-meson
+inherit gstreamer-meson python-any-r1
 
 MY_PN="gstreamer-vaapi"
 DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for 
GStreamer"
@@ -66,16 +67,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
        >=dev-util/gtk-doc-am-1.12
 "
+BDEPEND="${PYTHON_DEPS}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 # FIXME: "Failed to create vaapipostproc element"
 RESTRICT="test"
 
-PATCHES=(
-       
"${FILESDIR}/1.18.4-Avoid-calling-python3-script-to-enable-git-hook.patch"
-)
-
 multilib_src_configure() {
        local emesonargs=(
                -Dwith_encoders=yes

Reply via email to