[gnome-subtitles/meson-port] Meson fixes
- From: Pedro Castro <pcastro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-subtitles/meson-port] Meson fixes
- Date: Sun, 5 Jun 2022 15:39:52 +0000 (UTC)
commit 1dcf6f0820280a9f9edbcfe8db0ff8a97c13a7fa
Author: Pedro Castro <pedro gnomesubtitles org>
Date: Sun Jun 5 16:39:36 2022 +0100
Meson fixes
build-aux/meson_post_install.py | 5 +++--
meson.build | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/build-aux/meson_post_install.py b/build-aux/meson_post_install.py
index b9f4edc..d7b0f37 100644
--- a/build-aux/meson_post_install.py
+++ b/build-aux/meson_post_install.py
@@ -8,9 +8,10 @@ import sys
libdir = sys.argv[1]
install_gtk_sharp = (sys.argv[2] == 'true')
install_gst_sharp = (sys.argv[3] == 'true')
+destdir = os.environ.get('DESTDIR')
#Install gsettings schemas (TODO use meson's gnome module instead for installing schemas (since 0.57))
-if not os.environ.get('DESTDIR'):
+if not destdir:
print('Compiling gsettings schemas...')
subprocess.call(['glib-compile-schemas', os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share',
'glib-2.0', 'schemas')])
@@ -44,6 +45,6 @@ if install_gst_sharp:
build_path_subprojects + 'gstreamer-sharp/sources/gstreamer-sharp.dll.config'
]
-dst = os.path.join(os.environ.get('DESTDIR') + os.environ['MESON_INSTALL_PREFIX'], libdir, 'gnome-subtitles')
+dst = os.path.join((destdir if destdir else '') + os.environ['MESON_INSTALL_PREFIX'], libdir,
'gnome-subtitles')
for lib in cs_libs:
shutil.copy2(lib, dst)
diff --git a/meson.build b/meson.build
index dcd8e63..f6b276c 100644
--- a/meson.build
+++ b/meson.build
@@ -9,10 +9,10 @@ i18n = import('i18n')
dependency('mono', version : '>= 4.0')
dependency('gtk+-3.0', version : '>= 3.12')
-dependency('gstreamer-1.0', version : '>= 1.0')
-dependency('gstreamer-video-1.0', version : '>= 1.0')
-dependency('gstreamer-plugins-base-1.0', version : '>= 1.0')
-dependency('gstreamer-pbutils-1.0', version : '>= 1.0')
+dependency('gstreamer-1.0', version : '>= 1.18')
+dependency('gstreamer-video-1.0', version : '>= 1.18')
+dependency('gstreamer-plugins-base-1.0', version : '>= 1.18')
+dependency('gstreamer-pbutils-1.0', version : '>= 1.18')
gst_sharp = subproject('gstreamer-sharp')
gst_sharp_dep = gst_sharp.get_variable('gst_sharp_dep')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]