gentoo resync : 28.04.2021

4 files changed, 177 insertions, 0 deletions

diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index c3ab961e8376..1db34ddc4753 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,4 +1,7 @@
+AUX pitivi-0.999-metainfo.patch 734 BLAKE2B 6187b6d596c80e3ea00e5b79df6f9092f6be1f3e90037ea7f4638aba60fe47cf77e4a9dd4b77d716fd7b3793da0c501b29462b9e98918fc1de089615de2d4f0c SHA512 dfd9c1e9c84de7883b386dcc9b555d904b5633cdfaa0670de7e95ac3561ff45e4f692fcea77cd6b6d4082d834a41026a73b80d0916c81cb15c95d1508534a599
 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f
+AUX pitivi-0.999-python38.patch 1809 BLAKE2B fe95c44a409f0a629602d4656cfc90a02e2e676a40d3d3f232457e2a506225f25ab86d585f26ddbaf8551c5efc54e13f474b8b259dd05c2a8285c0b98b9249ba SHA512 f90523242fd8acaa4f0637b8facc5a528186c5dd371f67049b11b307bd6f06c693dd79bb305f2163bed4bd0140bd7fcee86fe7d4b2239be82a7dea47c6038026
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
 EBUILD pitivi-0.999-r3.ebuild 2541 BLAKE2B 583615b1bfee4b7b4074f21cbfcf1a10b1b221a6e16a758480f4c031335fb510cc46477c92421430f6240a47f3dbbf88584de53216caf865ad436ec1fd033584 SHA512 a190374c1527ad7febb37a1f74aee427c90d613c977b37ca541decc8469035cb41e815eba9aabb10c3042daa0700d282fa0d981fc22d8bd356339df5e21b4707
+EBUILD pitivi-0.999-r4.ebuild 2733 BLAKE2B 7fc6bc19f41af949929b213de602a597b10b3313f3b35080ab54b63fcd8cd3a2c961d01655d68772227659906828a07f4b43a62929e2e80ac2a6e32e822f63c9 SHA512 f28fb45cc38c78b38874ae215880599d9c9db0d9719d81e4595d8f1b3a3fd111ff4bc0ef089bbf0828776365b156d58d93f39ce77a957a96ab37eaa3a3aebd34
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/files/pitivi-0.999-metainfo.patch b/media-video/pitivi/files/pitivi-0.999-metainfo.patch
new file mode 100644
index 000000000000..830a246e60dd
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.999-metainfo.patch
@@ -0,0 +1,12 @@
+diff --unified --new-file --recursive --show-c-function '--color=auto' pitivi-0.999/data/meson.build pitivi-0.999-fix/data/meson.build
+--- pitivi-0.999/data/meson.build	2018-08-29 16:05:21.000000000 +0200
++++ pitivi-0.999-fix/data/meson.build	2021-04-18 09:10:56.067231216 +0200
+@@ -18,7 +18,7 @@ custom_target('org.pitivi.Pitivi.appdata
+     input : 'org.pitivi.Pitivi.appdata.xml.in',
+     command : [intltool_merge, '--xml-style', podir, '@INPUT@', '@OUTPUT@'],
+     install : true,
+-    install_dir : join_paths(get_option('datadir'), 'appdata'))
++    install_dir : join_paths(get_option('datadir'), 'metainfo'))
+ 
+ install_data('org.pitivi.Pitivi-mime.xml',
+     install_dir : join_paths(get_option('datadir'), 'mime/packages'))
diff --git a/media-video/pitivi/files/pitivi-0.999-python38.patch b/media-video/pitivi/files/pitivi-0.999-python38.patch
new file mode 100644
index 000000000000..3c240d949112
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.999-python38.patch
@@ -0,0 +1,49 @@
+From 3c2c03828efb986e66ba2a35e341127e8161c799 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandru=20B=C4=83lu=C8=9B?= <alexandru.balut@gmail.com>
+Date: Tue, 28 Jan 2020 22:34:40 +0100
+Subject: [PATCH] meson: Support Python 3.8
+
+To link to Python we need to use python-3.8-embed.
+---
+ meson.build       | 13 ++++++++++---
+ meson_options.txt |  3 ++-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 17a7312d..289e0086 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,11 +1,18 @@
+-project('pitivi', 'c', version : '0.999', meson_version : '>= 0.41.0')
++project('pitivi', 'c', version : '0.999', meson_version : '>= 0.46.0')
+ 
+-python = find_program('python3')
+ intltool_merge = find_program('intltool-merge')
+ itstool = find_program('itstool')
+ msgfmt = find_program('msgfmt')
+ 
+-python_dep = dependency('python3', version : '>= 3.3')
++pymod = import('python')
++python = pymod.find_installation(get_option('python'))
++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.3', required: false)
++if not python_dep.found()
++  python_dep = python.dependency('python3', version: '>= 3.3')
++endif
+ 
+ if get_option('build-gst')
+     subproject('gst-build', default_options: ['enable_python=true',
+diff --git a/meson_options.txt b/meson_options.txt
+index c6590dd1..7d6bad29 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,2 +1,3 @@
+-option('disable-help', type : 'boolean', value : false)
+ option('build-gst', type : 'boolean', value : false)
++option('disable-help', type : 'boolean', value : false)
++option('python', type : 'string', value : 'python3')
+-- 
+2.26.2
+
diff --git a/media-video/pitivi/pitivi-0.999-r4.ebuild b/media-video/pitivi/pitivi-0.999-r4.ebuild
new file mode 100644
index 000000000000..0fea03048c4f
--- /dev/null
+++ b/media-video/pitivi/pitivi-0.999-r4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_8 )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome.org meson python-single-r1 virtualx xdg
+
+DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
+HOMEPAGE="http://www.pitivi.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="v4l test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# XXX: recommends gst-plugins-libav and frei0r-plugins
+
+# Do not forget to check pitivi/check.py for dependencies!!!
+# pycanberra, libav, libnotify and liwnck are optional
+GST_VER="1.14.2"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pycairo-1.10[${PYTHON_MULTI_USEDEP}]
+	')
+	>=x11-libs/cairo-1.10
+
+	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
+	>=media-plugins/gst-transcoder-1.14.1
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.30.0:2
+
+	>=dev-libs/gobject-introspection-1.34:=
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/gst-python-1.4:1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
+	')
+
+	gnome-base/librsvg:=
+	>=media-libs/gsound-1.0
+
+	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection,theora]
+	>=media-libs/gst-plugins-bad-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gtk-${GST_VER}:1.0
+	>=media-libs/gst-plugins-good-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
+
+	>=x11-libs/libnotify-0.7[introspection]
+	x11-libs/libwnck:3[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/yelp-tools
+	dev-python/setuptools
+	>=dev-util/intltool-0.35.5
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/245
+	# support python 3.8
+	"${FILESDIR}"/${P}-python38.patch
+
+	# use /usr/share/metainfo
+	"${FILESDIR}"/${P}-metainfo.patch
+
+	# Make tests optional, bug #594096
+	# https://gitlab.gnome.org/GNOME/pitivi/issues/2303
+	"${FILESDIR}"/${P}-optional-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Denable-tests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	export PITIVI_TOP_LEVEL_DIR="${S}"
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"
+}