diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-21 08:43:51 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-21 08:43:51 +0100 |
commit | 3c54b2473c5fb6fe0fc543b15fc4678471922cb1 (patch) | |
tree | 85dd52aab1ba67c22a7a6645e2d7586b27acb611 /media-video/pitivi/files | |
parent | 34753f0703b775be89190c2d6a519e542387f3e8 (diff) |
gentoo auto-resync : 21:07:2022 - 08:43:51
Diffstat (limited to 'media-video/pitivi/files')
4 files changed, 0 insertions, 118 deletions
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?= <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 - |