From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- dev-python/gst-python/Manifest | 5 +- dev-python/gst-python/files/1.16.2-python3.8.patch | 39 ------------- dev-python/gst-python/gst-python-1.16.2.ebuild | 64 ---------------------- dev-python/gst-python/gst-python-1.16.3.ebuild | 2 +- 4 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 dev-python/gst-python/files/1.16.2-python3.8.patch delete mode 100644 dev-python/gst-python/gst-python-1.16.2.ebuild (limited to 'dev-python/gst-python') diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest index 593e1f7d12db..d98311ec72bb 100644 --- a/dev-python/gst-python/Manifest +++ b/dev-python/gst-python/Manifest @@ -1,6 +1,3 @@ -AUX 1.16.2-python3.8.patch 1400 BLAKE2B 67e870a837f8fe2a2b7a5cc38ed0528a1afc56035074e95437df260fbea52834217617a18520dea55e71fc5b71b4f86120125b1ef35d88daf19f35504ab6fd5f SHA512 1dd7623488f9612ad195f3e920e1ff8bab321c9009dcecc0d359807c2cef6b733777c6aed8f500c0925c3a6dba356a3e2a333991bf232f302e0f028eb3de1234 -DIST gst-python-1.16.2.tar.xz 414912 BLAKE2B 016e59fc7d29047dcf49901d4ccb1ff2e96950dc723cd7e9dd31e0fe92257e881ced1c93e7e4e531320be8fb9d6cb8382d2c31e460448d5d630ec7c8a0378024 SHA512 c274591cb820a2576ca236de0d1a2c2c53a9db11afc689e0385afe3d38fadc59c9230d65198e79e4059abb90c0e5b6d71f1ee4cf1439d92feaaffd2ab5cd3a23 DIST gst-python-1.16.3.tar.xz 419932 BLAKE2B 3c3d7d8dbde7d77d57e340c68503c436ab03f8768be4dd67561b13712bf88d7f8025118cf6a2ff115fbd41b28dc9a3208f612d1b72bf449fd7b23be4437f837f SHA512 2b038c4fc4891ddcf09e58c9e3e8d8462c150589dbb8a1f8d0a1266cffe49fd83531b2eb97cd57baab0f416a2bb1ba81383b55bb953545f3eedc50b6895986c4 -EBUILD gst-python-1.16.2.ebuild 1607 BLAKE2B 1aa78d47124bbf30ebb5935aadaa604da1e210be332b6729e1fecd3f5ec236391cba222768331c0636037f2a966868a862130ef370c9840baaf3d6edb3026984 SHA512 1468188abf402361dd050bf9cf74b41e672e8d51eed084fe80d59a2344aae86b207269114dd342955b82c5596240f887d9071432df65d9dc50e7ca32ea437c31 -EBUILD gst-python-1.16.3.ebuild 1558 BLAKE2B 4309170c795f3e85264118217e35a0c4de8dd450dbaf9d8c8747c3bc7ad20e5c624c25aa1c5b07a309510a753db09ba0c53692f6f7ba725e7738e695e145029d SHA512 e7b41500c58db496a581e0630b71ba5759736b4e486bdd87812c9207214036f4fa64043763e3126cb153fb5afde1babb65720a607d2f87ace3b13ea9a2745976 +EBUILD gst-python-1.16.3.ebuild 1557 BLAKE2B f450322c1a7c716e7925f4ee4bb43d18735d67a51c7241f1a405334cf99a546c83ce629ea7be0870252200e5ebb724ba959727be64a43127a929c758153e24b1 SHA512 8650098d45ff16f614430a0588db3a0cb6d3f941723e0aca9709b34f1128386113bfc19bb6dd08407afb223b359b69148ce91fe18a86e61f9b024f5bf349f128 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75 diff --git a/dev-python/gst-python/files/1.16.2-python3.8.patch b/dev-python/gst-python/files/1.16.2-python3.8.patch deleted file mode 100644 index c4b4ddd11221..000000000000 --- a/dev-python/gst-python/files/1.16.2-python3.8.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 22f28155d86e27c4134de4ed2861264003fcfd23 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Fri, 13 Dec 2019 10:46:20 +0200 -Subject: [PATCH] Fix build with Python 3.8 by also checking for - python-3.X-embed.pc - -Since Python 3.8 the normal checks don't include the Python libraries -anymore and linking of the gst-python module would fail. - -See also https://github.com/mesonbuild/meson/issues/5629 - -Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28 ---- - meson.build | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 744b7ce..fe4ca7a 100644 ---- a/meson.build -+++ b/meson.build -@@ -24,7 +24,14 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d - - pymod = import('python') - python = pymod.find_installation(get_option('python')) --python_dep = python.dependency(required : true) -+pythonver = python.language_version() -+ -+# Workaround for https://github.com/mesonbuild/meson/issues/5629 -+# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28 -+python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=3', required: false) -+if not python_dep.found() -+ python_dep = python.dependency(required : true) -+endif - - python_abi_flags = python.get_variable('ABIFLAGS', '') - pylib_loc = get_option('libpython-dir') --- -2.20.1 - diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild deleted file mode 100644 index 77499a6a6ae8..000000000000 --- a/dev-python/gst-python/gst-python-1.16.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) - -inherit meson python-r1 xdg-utils - -DESCRIPTION="A Python Interface to GStreamer" -HOMEPAGE="https://gstreamer.freedesktop.org/" -SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="1.0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=media-libs/gstreamer-${PV}:1.0[introspection] - >=media-libs/gst-plugins-base-${PV}:1.0[introspection] - >=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PV}-python3.8.patch -) - -src_prepare() { - default - # Avoid building plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously. - # Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a - # separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory. - sed -e '/subdir.*plugin/d' -i meson.build || die - xdg_environment_reset -} - -src_configure() { - configuring() { - meson_src_configure \ - -Dpython="${EPYTHON}" - } - python_foreach_impl configuring -} - -src_compile() { - python_foreach_impl meson_src_compile -} - -src_test() { - python_foreach_impl meson_src_test -} - -src_install() { - installing() { - meson_src_install - python_optimize - } - python_foreach_impl installing -} diff --git a/dev-python/gst-python/gst-python-1.16.3.ebuild b/dev-python/gst-python/gst-python-1.16.3.ebuild index 11df6763cff4..eeca9ad3564c 100644 --- a/dev-python/gst-python/gst-python-1.16.3.ebuild +++ b/dev-python/gst-python/gst-python-1.16.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz" LICENSE="LGPL-2+" SLOT="1.0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} -- cgit v1.2.3