public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/pitivi/, media-video/pitivi/files/
@ 2016-10-15 15:42 Gilles Dartiguelongue
  0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2016-10-15 15:42 UTC (permalink / raw
  To: gentoo-commits

commit:     cb7dbc61a99c90cbde0c4052783bc58302455633
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 15:36:50 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 15:42:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7dbc61

media-video/pitivi: version bump 0.96-r1 → 0.97

Gentoo-bug: 594096

Package-Manager: portage-2.3.1

 media-video/pitivi/Manifest                        |   1 +
 .../files/pitivi-0.97.1-optional-tests.patch       |  21 +++++
 media-video/pitivi/pitivi-0.97.1.ebuild            | 105 +++++++++++++++++++++
 3 files changed, 127 insertions(+)

diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 4176221..29191e7 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,2 +1,3 @@
 DIST pitivi-0.95.tar.xz 3341488 SHA256 5f15220bcc3d02cef4edacaa19da284014caf725e41fc9cbec70469582e1d313 SHA512 e628302ecbb790e955459a4dc124e8580081f6eff8abde210a1b537ae18696c3861bd619efe1434e8e1cf1069adb72cbff0cf44c64706c4046d2cfb7f9aecdfa WHIRLPOOL df6e625dddcf113a8e84aabf5a7a40d90e6b38130e63201a1674f4a576a735696c6b9a9a35b2743cbe5bac8d444c04cd0ea9c5a43358718e1b32b6ebc97f435c
 DIST pitivi-0.96.tar.xz 3324396 SHA256 fa0b469bb71ea10138144ec2adbe3e575d33678b5e48fc906e5e8cb8eb19ad84 SHA512 dd608effc1f7196ac4784d707ec5a6f25088a3a216262a004ed81fd4e078bc80dde67c0601cc690b4b6a3a8febeef6bd841c30513449cbf722aa23d5d655f00d WHIRLPOOL 4a61842cbd7704e2c2445fb47ce8016fc96be543b72825d092bfbcf6d35fdd3944d5395a09386c6102ffb1fc672a1c8226f7c48390cce43bcb23563b3fce6478
+DIST pitivi-0.97.1.tar.xz 5096672 SHA256 41b23cfd21353647e55a0b2e86bab368b61d6f1a76cc132e80ca0dd27f000e77 SHA512 be5fcf5148349f685f0ee23a82b36d90fe0b7ff6d1d8cdcaf73272b8e5c29ddfe1d6c21353eb95f2d786fe4922a93c747403e5e27141d815f5b46f846a1d95ba WHIRLPOOL dae38565e8665abdf4eacb76ecc87530f2a429266572bbd5db3138e31fa1ae949dafb077dcfffb75fe094c3b55839fba2259690aa5faa1258647b546f661e2e0

diff --git a/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch b/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch
new file mode 100644
index 00000000..cfc86dc
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch
@@ -0,0 +1,21 @@
+make tests optional
+
+--- a/meson_options.txt	2016-09-19 23:35:54.944511834 +0200
++++ b/meson_options.txt	2016-09-19 23:36:10.693485976 +0200
+@@ -1,2 +1,3 @@
+ option('enable-xunit', type : 'boolean', value : false)
+ option('disable-help', type : 'boolean', value : false)
++option('enable-tests', type : 'boolean', value : false)
+--- a/meson.build	2016-09-19 23:35:06.694590798 +0200
++++ b/meson.build	2016-09-19 23:35:45.092527990 +0200
+@@ -57,7 +57,9 @@
+ if not get_option('disable-help')
+     subdir('help')
+ endif
+-subdir('tests')
++if get_option('enable-tests')
++    subdir('tests')
++endif
+ 
+ archiver = find_program('git-archive-all', required : false)
+ if archiver.found()

diff --git a/media-video/pitivi/pitivi-0.97.1.ebuild b/media-video/pitivi/pitivi-0.97.1.ebuild
new file mode 100644
index 00000000..0108a3f
--- /dev/null
+++ b/media-video/pitivi/pitivi-0.97.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome2 python-single-r1 virtualx
+
+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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# some of the tests fail with timeouts, others with VA errors
+RESTRICT="test"
+
+# XXX: recommends gst-plugins-libav and frei0r-plugins
+
+# Do not forget to check pitivi/check.py for dependencies!!!
+# pycanberra, gnome-desktop, libav, libnotify and liwnck are optional
+GST_VER="1.8.2"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
+	>=x11-libs/cairo-1.10
+
+	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
+	>=media-plugins/gst-transcoder-1.8.1
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.30.0:2
+
+	>=dev-libs/gobject-introspection-1.34:=
+	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/pycanberra[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+
+	gnome-base/librsvg:=
+	gnome-base/gnome-desktop:3=[introspection]
+
+	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
+	>=media-libs/gst-plugins-good-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
+
+	x11-libs/libnotify[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}
+	app-text/yelp-tools
+	dev-python/setuptools
+	>=dev-util/intltool-0.35.5
+	>=dev-util/meson-0.28.0
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	# Make tests optional, bug #594096
+	"${FILESDIR}"/${P}-optional-tests.patch
+)
+
+src_configure() {
+	# Not a normal configure
+	# --buildtype=plain needed for honoring CFLAGS/CXXFLAGS and not
+	# defaulting to debug
+	./configure \
+		--prefix=/usr \
+		--buildtype=plain \
+		-Denable-tests=$(usex test true false) \
+		|| die
+}
+
+src_compile() {
+	# We cannot use 'make' as it won't allow us to build verbosely
+	cd mesonbuild && ninja -v
+}
+
+src_test() {
+	export PITIVI_TOP_LEVEL_DIR="${S}"
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${D}"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/pitivi/, media-video/pitivi/files/
@ 2021-04-28 15:36 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-04-28 15:36 UTC (permalink / raw
  To: gentoo-commits

commit:     2eb15e6a23ee419081ae9cf954e9087f39ac7202
Author:     Poncho <poncho <AT> spahan <DOT> ch>
AuthorDate: Sun Apr 18 07:22:24 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 15:35:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb15e6a

media-video/pitivi: revision bump, support python3.8

Closes: https://bugs.gentoo.org/771000
Closes: https://bugs.gentoo.org/722446
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Daniel Brandt <poncho <AT> spahan.ch>
Closes: https://github.com/gentoo/gentoo/pull/20436
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../pitivi/files/pitivi-0.999-metainfo.patch       |  12 +++
 .../pitivi/files/pitivi-0.999-python38.patch       |  49 +++++++++
 media-video/pitivi/pitivi-0.999-r4.ebuild          | 113 +++++++++++++++++++++
 3 files changed, 174 insertions(+)

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 00000000000..830a246e60d
--- /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 00000000000..3c240d94911
--- /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 00000000000..0fea03048c4
--- /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}"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/pitivi/, media-video/pitivi/files/
@ 2021-12-28  1:24 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-12-28  1:24 UTC (permalink / raw
  To: gentoo-commits

commit:     9ada748e8e0dff302c0f528e44915349e8d8a851
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 01:20:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 01:24:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ada748e

media-video/pitivi: allow building with newer GStreamer (1.18+)

- Package bundled/bundles parts of gst-transcoder. We now
  forcefully disable building of that copy and remove
  the bundled version/subproject as a safety measure.

  (Not that it should be needed now; it shouldn't
  try to use that version anymore, because...)

- ... patch the build system (upstream patch, long in a release)
  to allow gst 1.18+ / recognise the version of transcoder that
  gst 1.18 has (it's now in gst-plugins-bad).

This actually fixes the sandbox failure too in addition to the
collision with gst-plugins-bad because we're no longer building
a copy of gst-transcoder w/o needed workarounds.

(Wasn't able to reproduce the sandbox failure at first:
ended up installing all gst-* packages, then temporarily
restoring the bundled copy to hit it. leio did suggest
gst-plugins-v4l2 may be enough but I only realised I needed
the bundled copy of gst-transcoder to trigger the failure
after I'd installed everything and it's irrelevant now anyway.)

Closes: https://bugs.gentoo.org/804945
Closes: https://bugs.gentoo.org/830123
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../pitivi/files/pitivi-0.999-gst-0.18.patch       |  39 +++++++
 media-video/pitivi/pitivi-0.999-r5.ebuild          | 121 +++++++++++++++++++++
 2 files changed, 160 insertions(+)

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..8e55460d1868
--- /dev/null
+++ b/media-video/pitivi/pitivi-0.999-r5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 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}"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/pitivi/, media-video/pitivi/files/
@ 2022-05-31  4:46 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-05-31  4:46 UTC (permalink / raw
  To: gentoo-commits

commit:     21dfed0cc6d952b5bd1103c3377d354b895c4c3d
Author:     Daniel Brandt <poncho <AT> spahan <DOT> ch>
AuthorDate: Tue Mar  1 08:45:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 04:30:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21dfed0c

media-video/pitivi: version bump

Closes: https://bugs.gentoo.org/749032
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel Brandt <poncho <AT> spahan.ch>
Closes: https://github.com/gentoo/gentoo/pull/23101
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/pitivi/Manifest                        |  1 +
 .../files/pitivi-2021.05-meson-compatibility.patch | 45 ++++++++++++
 media-video/pitivi/pitivi-2021.05.ebuild           | 85 ++++++++++++++++++++++
 3 files changed, 131 insertions(+)

diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 4c40a41dfd05..6d5daf2867a2 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1 +1,2 @@
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
+DIST pitivi-2021.05.tar.xz 11303884 BLAKE2B f87f16cc1ab7ea0f97bc92cdd9f1d5993051ed67b26473748aeb327a4cb51bb32510c845e1665ec3eb3b67c3f0f113c05a514076bad4e13d0fadbd725bcb6bb6 SHA512 3ecb571d501b634ca3a369d4020954cc0b2bc101ceb12bee74d6b38c9ca8f2bf15fe94030421c43503870128d8218548feca7d32cf25b4afcf610365784ca9bb

diff --git a/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch b/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch
new file mode 100644
index 000000000000..990f84b06795
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch
@@ -0,0 +1,45 @@
+From ddf2369d1fc6fddd63f676cc905a8b8e96291a4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Tue, 25 Jan 2022 15:37:34 +0200
+Subject: [PATCH] Fix compatibility with meson 0.61
+
+Previously positional arguments to i18n.merge_files() were just ignored
+but this became an error.
+---
+ data/meson.build | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2ea82cf12..60d23169b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -6,7 +6,7 @@ install_subdir('audiopresets', install_dir: pkgdatadir)
+ install_subdir('videopresets', install_dir: pkgdatadir)
+ install_subdir('gstpresets', install_dir: pkgdatadir)
+ 
+-desktop_file = i18n.merge_file('org.pitivi.Pitivi.desktop',
++desktop_file = i18n.merge_file(
+     type: 'desktop',
+     output : 'org.pitivi.Pitivi.desktop',
+     input : 'org.pitivi.Pitivi.desktop.in',
+@@ -25,7 +25,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('org.pitivi.Pitivi.appdata.xml',
++appdata_file = i18n.merge_file(
+     type: 'xml',
+     output : 'org.pitivi.Pitivi.appdata.xml',
+     input : 'org.pitivi.Pitivi.appdata.xml.in',
+@@ -43,7 +43,7 @@ if appstream_util.found()
+   )
+ endif
+ 
+-i18n.merge_file('org.pitivi.Pitivi-mime.xml',
++i18n.merge_file(
+     output : 'org.pitivi.Pitivi-mime.xml',
+     input : 'org.pitivi.Pitivi-mime.xml.in',
+     po_dir: podir,
+-- 
+GitLab
+

diff --git a/media-video/pitivi/pitivi-2021.05.ebuild b/media-video/pitivi/pitivi-2021.05.ebuild
new file mode 100644
index 000000000000..e5a66ed35143
--- /dev/null
+++ b/media-video/pitivi/pitivi-2021.05.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome.org meson python-single-r1 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=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Do not forget to check pitivi/check.py for dependencies!!!
+# gsound, libav, libnotify and v4l are optional
+GST_VER="1.18.4"
+
+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]
+"
+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/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]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/yelp-tools
+	dev-python/setuptools
+	>=dev-util/intltool-0.35.5
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c
+	"${FILESDIR}"/${P}-meson-compatibility.patch
+)
+
+src_configure() {
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/pitivi/, media-video/pitivi/files/
@ 2022-10-10  2:34 Matt Turner
  0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2022-10-10  2:34 UTC (permalink / raw
  To: gentoo-commits

commit:     9c679200f60260832a48fcd725c48354465de180
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  9 23:48:37 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 02:34:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c679200

media-video/pitivi: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-video/pitivi/Manifest                        |  1 -
 .../files/pitivi-2021.05-meson-compatibility.patch | 45 -----------
 media-video/pitivi/pitivi-2021.05-r1.ebuild        | 91 ----------------------
 3 files changed, 137 deletions(-)

diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index c68de366d021..5bba247d761b 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,2 +1 @@
-DIST pitivi-2021.05.tar.xz 11303884 BLAKE2B f87f16cc1ab7ea0f97bc92cdd9f1d5993051ed67b26473748aeb327a4cb51bb32510c845e1665ec3eb3b67c3f0f113c05a514076bad4e13d0fadbd725bcb6bb6 SHA512 3ecb571d501b634ca3a369d4020954cc0b2bc101ceb12bee74d6b38c9ca8f2bf15fe94030421c43503870128d8218548feca7d32cf25b4afcf610365784ca9bb
 DIST pitivi-2022.06.tar.xz 11352412 BLAKE2B f7d14f9bff136a8b50c0ce82e66fad92ba7df429d8cf588c526ae04f673617d882a0cc024c5a21c97471d2b31cb0001cefdeb8e32c9f62e1c6600d9500d1e428 SHA512 649c8e61d9545cbf35a0a0c8f648490c14c8bfb6c6637794887c03bffd6998c63cb2cc22102cd2f7a59974f79488a13f29beceadab29ddd1c1c01abff33a85fa

diff --git a/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch b/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch
deleted file mode 100644
index 990f84b06795..000000000000
--- a/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ddf2369d1fc6fddd63f676cc905a8b8e96291a4c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Tue, 25 Jan 2022 15:37:34 +0200
-Subject: [PATCH] Fix compatibility with meson 0.61
-
-Previously positional arguments to i18n.merge_files() were just ignored
-but this became an error.
----
- data/meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2ea82cf12..60d23169b 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -6,7 +6,7 @@ install_subdir('audiopresets', install_dir: pkgdatadir)
- install_subdir('videopresets', install_dir: pkgdatadir)
- install_subdir('gstpresets', install_dir: pkgdatadir)
- 
--desktop_file = i18n.merge_file('org.pitivi.Pitivi.desktop',
-+desktop_file = i18n.merge_file(
-     type: 'desktop',
-     output : 'org.pitivi.Pitivi.desktop',
-     input : 'org.pitivi.Pitivi.desktop.in',
-@@ -25,7 +25,7 @@ if desktop_file_validate.found()
-   )
- endif
- 
--appdata_file = i18n.merge_file('org.pitivi.Pitivi.appdata.xml',
-+appdata_file = i18n.merge_file(
-     type: 'xml',
-     output : 'org.pitivi.Pitivi.appdata.xml',
-     input : 'org.pitivi.Pitivi.appdata.xml.in',
-@@ -43,7 +43,7 @@ if appstream_util.found()
-   )
- endif
- 
--i18n.merge_file('org.pitivi.Pitivi-mime.xml',
-+i18n.merge_file(
-     output : 'org.pitivi.Pitivi-mime.xml',
-     input : 'org.pitivi.Pitivi-mime.xml.in',
-     po_dir: podir,
--- 
-GitLab
-

diff --git a/media-video/pitivi/pitivi-2021.05-r1.ebuild b/media-video/pitivi/pitivi-2021.05-r1.ebuild
deleted file mode 100644
index 92d0aad1b722..000000000000
--- a/media-video/pitivi/pitivi-2021.05-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="https://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Do not forget to check pitivi/check.py for dependencies!!!
-# gsound, libav, libnotify and v4l are optional
-GST_VER="1.18.4"
-
-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]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.30.0:2
-
-	>=dev-libs/gobject-introspection-1.34:=
-
-	dev-libs/libpeas[${PYTHON_SINGLE_USEDEP}]
-
-	$(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/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]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/yelp-tools
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=dev-util/intltool-0.35.5
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c
-	"${FILESDIR}"/${P}-meson-compatibility.patch
-	"${FILESDIR}"/${P}-python-collections.patch
-)
-
-src_configure() {
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-10-10  2:34 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-15 15:42 [gentoo-commits] repo/gentoo:master commit in: media-video/pitivi/, media-video/pitivi/files/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2021-04-28 15:36 Michał Górny
2021-12-28  1:24 Sam James
2022-05-31  4:46 Sam James
2022-10-10  2:34 Matt Turner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox