gentoo resync : 04.01.2022

3 files changed, 162 insertions, 0 deletions

diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index a557851bfe1e..85530e3a76af 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,6 +1,8 @@
+AUX pitivi-0.999-gst-0.18.patch 1753 BLAKE2B fa8c3f8226987667285817853f8a9f86fe44ad891f6f3b093c3af991c0d964282c9e8a49e77e97af294403dc66eddaf4087c3a316ad8cef9f8bab53cb0f95980 SHA512 8e9bb71209ad9bc1bcbdee431233c3cd8b1fb030bd8255a247e8d33cfc7e9ee18841e319ac045b03db88f165d4817556f89dd061c84be3108ca03c6d1bbfd15e
 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-r4.ebuild 2739 BLAKE2B 551e39afea4389eb5d7c928b8c4990536542bdfe791f9de6a020bca0a3a6cbfbb0b2fe645b54123feb4c7c9b9d666565a2ef3723411db9aeff7103803d22a059 SHA512 57dd791c91816f6c06dd3705e08fef1175400057a910b055af61fd190ba6966633d6579077339fbc4d040291b3fc458f800535dc34370dcd311db007b87d2c87
+EBUILD pitivi-0.999-r5.ebuild 2909 BLAKE2B 5d001d48f4b21bea4f68e37f75f1045edeb69cc165d72f02cb31ebfad97c14e138e57ef2c77b1e7efb34caee6e7ce1239f07b1d8a2ab65509a050248c3271dfe SHA512 21319eca68211cdd35b3cec7fe8ed6e2d09efc5cd29cbdb1a660b91d78a3505ff18fb653dba553100661ffae9b112e79a21ea80c763b088daf86dbb17c75059d
 MISC metadata.xml 380 BLAKE2B 3ba78024c7a1f5dd825bdb63ea42c4a4c6fef74a881f5acbfb6d707c27f9e0bddab88470f03cb663f564e26a3343e8a849d9f000ba7cf3e1df437ba5ae66086a SHA512 2c728bee57e023b734c64c65824c25ab02744bf49b33f91bc231a5a2ea47f821e5951f628fd558de55e0cad0cc6b95faecb924e226c581008ee342b4e58d6459
diff --git a/media-video/pitivi/files/pitivi-0.999-gst-0.18.patch b/media-video/pitivi/files/pitivi-0.999-gst-0.18.patch
new file mode 100644
index 000000000000..13d375f3a4e5
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.999-gst-0.18.patch
@@ -0,0 +1,39 @@
+https://gitlab.gnome.org/GNOME/pitivi/-/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch (rebased)
+https://bugs.gentoo.org/804945
+
+--- a/meson.build
++++ b/meson.build
+@@ -22,7 +22,6 @@ if get_option('build-gst')
+         'gst-plugins-base:disable_gtkdoc=true',
+         'gstreamer:disable_gtkdoc=true',
+         ])
+-    subproject('gst-transcoder')
+ endif
+ 
+ gst_dep = dependency('gstreamer-1.0', version : '>= 1.14.2',
+@@ -30,9 +29,6 @@ gst_dep = dependency('gstreamer-1.0', version : '>= 1.14.2',
+ cairo_dep = dependency('cairo')
+ pycairo_dep = dependency('py3cairo')
+ 
+-gst_transcoder_dep = dependency('gst-transcoder-1.0', version : '>= 1.8.1',
+-    fallback : ['gst-transcoder', 'gst_transcoder_dep'])
+-
+ pkgdatadir = join_paths(get_option('datadir'), meson.project_name())
+ 
+ git = find_program('git', required : false)
+--- a/tests/__init__.py
++++ b/tests/__init__.py
+@@ -59,12 +59,7 @@ def setup():
+ 
+     # Make available the compiled C code.
+     sys.path.append(configure.BUILDDIR)
+-    subproject_paths = os.path.join(configure.BUILDDIR, "subprojects", "gst-transcoder")
+-
+-    _prepend_env_paths(LD_LIBRARY_PATH=subproject_paths,
+-                       GST_PLUGIN_PATH=subproject_paths,
+-                       GI_TYPELIB_PATH=subproject_paths,
+-                       GST_PRESET_PATH=[os.path.join(pitivi_dir, "data", "videopresets"),
++    _prepend_env_paths(GST_PRESET_PATH=[os.path.join(pitivi_dir, "data", "videopresets"),
+                                         os.path.join(pitivi_dir, "data", "audiopresets")],
+                        GST_ENCODING_TARGET_PATH=[os.path.join(pitivi_dir, "tests", "test-encoding-targets"),
+                                                  os.path.join(pitivi_dir, "data", "encoding-profiles")])
diff --git a/media-video/pitivi/pitivi-0.999-r5.ebuild b/media-video/pitivi/pitivi-0.999-r5.ebuild
new file mode 100644
index 000000000000..10273cdad9aa
--- /dev/null
+++ b/media-video/pitivi/pitivi-0.999-r5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+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_USEDEP}]
+	')
+	>=x11-libs/cairo-1.10
+
+	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
+	>media-libs/gst-plugins-bad-1.18
+"
+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_USEDEP}]
+		>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.8:3[${PYTHON_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_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
+
+	# Backport upstream commit to allow building w/ newer gst
+	# bug #804945 and bug #830123
+	"${FILESDIR}"/${P}-gst-0.18.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop bundled gst, just in case
+	rm -r "${S}"/subprojects/gst-transcoder || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable-tests=$(usex test true false)
+		-Dbuild-gst=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export PITIVI_TOP_LEVEL_DIR="${S}"
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"
+}