diff options
| author | Marius Bakke <marius@gnu.org> | 2020-10-11 16:46:19 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-10-13 23:48:15 +0200 |
| commit | bb7c3d5aa3fceb08b0cc6403908bf8731d163745 (patch) | |
| tree | 579ddcfd5c4034b74fb189b93515bb2013a4602a /gnu/packages/patches | |
| parent | 0caf236b3b5c9b19ee8709865ae7df9c59e7fe9b (diff) | |
| download | guix-patches-bb7c3d5aa3fceb08b0cc6403908bf8731d163745.tar guix-patches-bb7c3d5aa3fceb08b0cc6403908bf8731d163745.tar.gz | |
gnu: gstreamer: Update to 1.18.0.
* gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/gstreamer.scm (gstreamer-docs): New public variable.
(gstreamer): Update to 1.18.0.
[outputs]: Remove.
[arguments]: Remove 'move-docs' phase.
[native-inputs]: Remove GTK-DOC.
(gst-plugins-base): Update to 1.18.0.
[arguments]: Remove "-Ddoc=false" from #:configure-flags.
(gst-plugins-good, gst-plugins-ugly): Update to 1.18.0.
[arguments]: Remove 'patch-docbook-xml' phase.
[native-inputs]: Remove DOCBOOK-XML-4.1.2.
(gst-plugins-bad): Update to 1.18.0.
[arguments]: Add workarounds for known test failures.
[native-inputs]: Add GST-PLUGINS-GOOD.
(gst-libav): Update to 1.18.0.
[source](snippet): Remove.
[arguments]: Remove 'patch-docbook-xml' phase.
[native-inputs]: Remove DOCBOOK-XML-4.1.2.
(gst-editing-services): Update to 1.18.0.
[source](uri): Adjust.
(python-gst): Update to 1.18.0.
[source](patches): Remove.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch b/gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch deleted file mode 100644 index affa0e1317..0000000000 --- a/gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix build with Python 3.8 by also checking for python-3.X-embed.pc. Since -Python 3.8 the normal checks don't include the Python libraries anymore and -linking of the gst-python module would fail. - -See also https://github.com/mesonbuild/meson/issues/5629 -Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28 - -Patch based on upstream commit: - -https://gitlab.freedesktop.org/gstreamer/gst-python/-/commit/10707f437f2fc3632067c6a0efa4432f7ebaf362 - -diff --git a/meson.build b/meson.build -index 5f13b48..d7c7e66 100644 ---- a/meson.build -+++ b/meson.build -@@ -23,7 +23,17 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d - - pymod = import('python') - python = pymod.find_installation(get_option('python')) --python_dep = python.dependency(required : true) -+pythonver = python.language_version() -+if pythonver.version_compare('<3.0') -+ error('Python2 is not supported anymore, please port your code to python3 (@0@ specified)'.format(python.language_version())) -+endif -+ -+# 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', required: false) -+if not python_dep.found() -+ python_dep = python.dependency(required : true) -+endif - - python_abi_flags = python.get_variable('ABIFLAGS', '') - pylib_loc = get_option('libpython-dir') --- -2.26.2 |