From 3c54b2473c5fb6fe0fc543b15fc4678471922cb1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Jul 2022 08:43:51 +0100 Subject: gentoo auto-resync : 21:07:2022 - 08:43:51 --- media-video/pitivi/Manifest | 6 - .../pitivi/files/pitivi-0.999-gst-0.18.patch | 39 ------- .../pitivi/files/pitivi-0.999-metainfo.patch | 12 -- .../pitivi/files/pitivi-0.999-optional-tests.patch | 18 --- .../pitivi/files/pitivi-0.999-python38.patch | 49 --------- media-video/pitivi/pitivi-0.999-r5.ebuild | 121 --------------------- 6 files changed, 245 deletions(-) delete mode 100644 media-video/pitivi/files/pitivi-0.999-gst-0.18.patch delete mode 100644 media-video/pitivi/files/pitivi-0.999-metainfo.patch delete mode 100644 media-video/pitivi/files/pitivi-0.999-optional-tests.patch delete mode 100644 media-video/pitivi/files/pitivi-0.999-python38.patch delete mode 100644 media-video/pitivi/pitivi-0.999-r5.ebuild (limited to 'media-video/pitivi') diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest index 9f9e40355ef9..01dc53ded9c5 100644 --- a/media-video/pitivi/Manifest +++ b/media-video/pitivi/Manifest @@ -1,13 +1,7 @@ -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 AUX pitivi-2021.05-meson-compatibility.patch 1452 BLAKE2B 453356f66c217b0ae527219819a5ca3ff4a7da60664e21f2fda211c846c3efd9139d8564d93eb907e72e56f2b4f497135c7f7f5d0728a2380844d5b5de040db5 SHA512 394ad3c1317598d7bb020176e1572598f310eb5fa2e37e274fd572a9c8a3338c52accd1a66be8e9322032a1c677481a219bb25da223f348d2469320bde80a2fd AUX pitivi-2021.05-python-collections.patch 406 BLAKE2B e3c70bb271d95ac5b6bd6f0fb8738b24e8db544140e565173aa71c652ee1c25f8e50f77ef822c3843e4609d531e5f9b25ce299cf82f59db975121a44c1ad0e58 SHA512 20c6c6df1d86a3e5e126b5f3d851fa56651a18a86313c358eef63a423d70e501b28abfc767e7fca8d01e0cd2106d346e2dcdbf8075f60596ac6ada8059e2f5e8 -DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8 DIST pitivi-2021.05.tar.xz 11303884 BLAKE2B f87f16cc1ab7ea0f97bc92cdd9f1d5993051ed67b26473748aeb327a4cb51bb32510c845e1665ec3eb3b67c3f0f113c05a514076bad4e13d0fadbd725bcb6bb6 SHA512 3ecb571d501b634ca3a369d4020954cc0b2bc101ceb12bee74d6b38c9ca8f2bf15fe94030421c43503870128d8218548feca7d32cf25b4afcf610365784ca9bb DIST pitivi-2022.06.tar.xz 11352412 BLAKE2B f7d14f9bff136a8b50c0ce82e66fad92ba7df429d8cf588c526ae04f673617d882a0cc024c5a21c97471d2b31cb0001cefdeb8e32c9f62e1c6600d9500d1e428 SHA512 649c8e61d9545cbf35a0a0c8f648490c14c8bfb6c6637794887c03bffd6998c63cb2cc22102cd2f7a59974f79488a13f29beceadab29ddd1c1c01abff33a85fa -EBUILD pitivi-0.999-r5.ebuild 2908 BLAKE2B d87fc4e7fbf9147bf2bf280ce9128a973ebdac9daeba82f41045641fb311f22b885fa684667d816b420021cd16edd1862b610100754da6adefb4f49fb0736c83 SHA512 4f59f61f9e039d42cd962c4917b3906ec55739dca4994ede2420b7a23cbb5a70c519edc52085f237ca22973b49f9bd2a8e0103f8bd09dc15343b513c05fb5da8 EBUILD pitivi-2021.05-r1.ebuild 2209 BLAKE2B 7696097b20863ebdfb15d33cc7f52ea73e8320ba4163e1da5c746eef684e737a26e158c3450ac372f4b27a2abb3984676d040cff479634a82bb38db5d210344c SHA512 05a8643450c5ca897c627b782bdf3d3d3de466d80ee00335a033eb79d07640b53776f8e27733d96d9a109c79b412c6b2cb1e5e59d53bc2ceffedcd24e7f2626d EBUILD pitivi-2022.06.ebuild 2016 BLAKE2B 86e55e1f8c775f47541a9a40080f0b630c5aaee0bff98f5b20d4f15713d8bb64eb232fb593e59f2d8fc6d97abcd6913d658d957f86f7e2cc8705f5e61f3482e2 SHA512 a35705c9cbe577cdb84cc719abc2cbcd48472e39e531524c5a95c83222904727bec32a87b3aa6700110cc24e23407133346309ee0dbf5df9ad6da217b4fa6599 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 deleted file mode 100644 index 13d375f3a4e5..000000000000 --- a/media-video/pitivi/files/pitivi-0.999-gst-0.18.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/files/pitivi-0.999-metainfo.patch b/media-video/pitivi/files/pitivi-0.999-metainfo.patch deleted file mode 100644 index 830a246e60dd..000000000000 --- a/media-video/pitivi/files/pitivi-0.999-metainfo.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-optional-tests.patch b/media-video/pitivi/files/pitivi-0.999-optional-tests.patch deleted file mode 100644 index 50a62188f8e3..000000000000 --- a/media-video/pitivi/files/pitivi-0.999-optional-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/meson_options.txt~ 2018-08-29 15:33:20.000000000 +0200 -+++ b/meson_options.txt 2019-03-31 13:14:19.542837289 +0200 -@@ -1,2 +1,3 @@ - option('disable-help', type : 'boolean', value : false) - option('build-gst', type : 'boolean', value : false) -+option('enable-tests', type : 'boolean', value : false) ---- a/meson.build~ 2018-08-29 15:33:20.000000000 +0200 -+++ b/meson.build 2019-03-31 13:14:56.299216758 +0200 -@@ -84,5 +84,7 @@ - if not get_option('disable-help') - subdir('help') - endif --subdir('tests') --subdir('tests/validate-tests') -+if get_option('enable-tests') -+ subdir('tests') -+ subdir('tests/validate-tests') -+endif diff --git a/media-video/pitivi/files/pitivi-0.999-python38.patch b/media-video/pitivi/files/pitivi-0.999-python38.patch deleted file mode 100644 index 3c240d949112..000000000000 --- a/media-video/pitivi/files/pitivi-0.999-python38.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3c2c03828efb986e66ba2a35e341127e8161c799 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alexandru=20B=C4=83lu=C8=9B?= -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-r5.ebuild b/media-video/pitivi/pitivi-0.999-r5.ebuild deleted file mode 100644 index 83d852fe9823..000000000000 --- a/media-video/pitivi/pitivi-0.999-r5.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# 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}" -} -- cgit v1.2.3