mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: address python module port comments

Browse source
This commit is contained in:
Mathieu Duponchelle 2018-10-28 17:52:33 +01:00
parent af4ade3743
commit ae3ffd3ac8
2 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -35,7 +35,6 @@ EXTRA_DIST = \
meson.build \ meson.build \
meson_options.txt \ meson_options.txt \
pygst.py.in \ pygst.py.in \
scripts/pythondetector \
examples/plugins/python/sinkelement.py \ examples/plugins/python/sinkelement.py \
examples/plugins/python/identity.py \ examples/plugins/python/identity.py \
examples/helloworld.py examples/helloworld.py

27
meson.build
View file

@ -1,6 +1,6 @@
project('gst-python', 'c', 'cpp', project('gst-python', 'c', 'cpp',
version : '1.15.0.1', version : '1.15.0.1',
meson_version : '>= 0.40.0', meson_version : '>= 0.46.0',
default_options : [ 'warning_level=1', default_options : [ 'warning_level=1',
'c_std=gnu99', 'c_std=gnu99',
'buildtype=debugoptimized' ]) 'buildtype=debugoptimized' ])
@ -21,7 +21,6 @@ gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_base_dep']) fallback : ['gstreamer', 'gst_base_dep'])
gmodule_dep = dependency('gmodule-2.0') gmodule_dep = dependency('gmodule-2.0')
pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_dep'], version : '>= 3.8') pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_dep'], version : '>= 3.8')
python_dep = dependency('python3')
pymod = import('python') pymod = import('python')
python = pymod.find_installation(get_option('python')) python = pymod.find_installation(get_option('python'))
@ -36,27 +35,13 @@ message('python_abi_flags = @0@'.format(python_abi_flags))
message('pylib_loc = @0@'.format(pylib_loc)) message('pylib_loc = @0@'.format(pylib_loc))
pygi_override_dir = get_option('pygi-overrides-dir') pygi_override_dir = get_option('pygi-overrides-dir')
if pygi_override_dir == ''
cres = run_command(python, '-c','''
import os, sys, gi.overrides
paths = gi.overrides.__path__
prefix = os.path.abspath(sys.argv[1])
for path in paths:
path = os.path.abspath(path)
if os.path.commonprefix([path, prefix]) == prefix:
print(path)
exit(0)
exit(1)
''', get_option('prefix'))
if cres.returncode() != 0 if pygi_override_dir == ''
error('Could not detect PyGObject overrides location' + cres.stdout() + cres.stderr()) pygi_override_dir = python.get_install_dir(
endif subdir : join_paths('gi', 'overrides')
pygi_override_dir = cres.stdout().strip() )
if cres.stderr() != ''
message(cres.stderr())
endif
endif endif
message('pygobject overrides directory = @0@'.format(pygi_override_dir)) message('pygobject overrides directory = @0@'.format(pygi_override_dir))
pylib_suffix = 'so' pylib_suffix = 'so'