mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fixed meson.build to correctly use libdir

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-python/-/merge_requests/45>
This commit is contained in:
Stirling Westrup 2021-05-11 17:14:41 -04:00
parent 7a0decbec2
commit f8165aee8d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -64,6 +64,10 @@ endif
message('pygobject overrides directory = @0@'.format(pygi_override_dir)) message('pygobject overrides directory = @0@'.format(pygi_override_dir))
# libdir has to be built from pieces.
libdir = get_option('prefix')+'/'+get_option('libdir')
pylib_suffix = 'so' pylib_suffix = 'so'
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
pylib_suffix = 'dll' pylib_suffix = 'dll'
@ -76,7 +80,7 @@ cdata.set('VERSION', '"@0@"'.format(gst_version))
cdata.set('GST_PACKAGE_NAME', '"GStreamer Python"') cdata.set('GST_PACKAGE_NAME', '"GStreamer Python"')
cdata.set('PACKAGE_NAME', '"GStreamer Python"') cdata.set('PACKAGE_NAME', '"GStreamer Python"')
cdata.set('GST_API_VERSION', '"@0@"'.format(api_version)) cdata.set('GST_API_VERSION', '"@0@"'.format(api_version))
cdata.set('PLUGINDIR', '"@0@/gstreamer-1.0"'.format(get_option('libdir'))) cdata.set('PLUGINDIR', '"@0@/gstreamer-1.0"'.format(libdir))
cdata.set('PY_LIB_LOC', '"@0@"'.format(pylib_loc)) cdata.set('PY_LIB_LOC', '"@0@"'.format(pylib_loc))
cdata.set('PY_ABI_FLAGS', '"@0@"'.format(python_abi_flags)) cdata.set('PY_ABI_FLAGS', '"@0@"'.format(python_abi_flags))
cdata.set('PY_LIB_SUFFIX', '"@0@"'.format(pylib_suffix)) cdata.set('PY_LIB_SUFFIX', '"@0@"'.format(pylib_suffix))
@ -85,7 +89,7 @@ configure_file(output : 'config.h', configuration : cdata)
configinc = include_directories('.') configinc = include_directories('.')
pkgconfig = import('pkgconfig') pkgconfig = import('pkgconfig')
plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') plugins_install_dir = join_paths(libdir, 'gstreamer-1.0')
plugins_pkgconfig_install_dir = join_paths(plugins_install_dir, 'pkgconfig') plugins_pkgconfig_install_dir = join_paths(plugins_install_dir, 'pkgconfig')
if get_option('default_library') == 'shared' if get_option('default_library') == 'shared'
# If we don't build static plugins there is no need to generate pc files # If we don't build static plugins there is no need to generate pc files
@ -95,5 +99,5 @@ endif
subdir('gi') subdir('gi')
subdir('plugin') subdir('plugin')
subdir('testsuite') subdir('testsuite')
run_command(python, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")') run_command(python, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')