mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

win32: find plugin scanner in libexecdir subdir as configured

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=679115
This commit is contained in:
Tim-Philipp Müller 2017-07-14 16:12:25 +01:00
parent 5bd4603ed3
commit d123291183
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.ac
View file

@ -998,6 +998,23 @@ AC_DEFINE_UNQUOTED(GST_PLUGIN_SCANNER_INSTALLED,
"$GST_PLUGIN_SCANNER_INSTALLED", [location of the installed gst-plugin-scanner]) "$GST_PLUGIN_SCANNER_INSTALLED", [location of the installed gst-plugin-scanner])
AC_SUBST(GST_PLUGIN_SCANNER_INSTALLED) AC_SUBST(GST_PLUGIN_SCANNER_INSTALLED)
case "${libexecdir}" in
*libexec)
GST_PLUGIN_SCANNER_SUBDIR="libexec";;
*lib)
GST_PLUGIN_SCANNER_SUBDIR="lib";;
*)
GST_PLUGIN_SCANNER_SUBDIR=`basename ${libexecdir}`;
if test -z "$GST_PLUGIN_SCANNER_SUBDIR"; then
AC_MSG_WARN([Couldn't determined libexecdir suffix, using "lib"])
GST_PLUGIN_SCANNER_SUBDIR="lib";
fi
;;
esac
AC_DEFINE_UNQUOTED(GST_PLUGIN_SCANNER_SUBDIR,
"$GST_PLUGIN_SCANNER_SUBDIR", [libexecdir path component, used to find plugin-scanner on relocatable builds on windows])
dnl completion helper locations dnl completion helper locations
AS_AC_EXPAND(GST_COMPLETION_HELPER_INSTALLED,${libexecdir}/gstreamer-$GST_API_VERSION/gst-completion-helper) AS_AC_EXPAND(GST_COMPLETION_HELPER_INSTALLED,${libexecdir}/gstreamer-$GST_API_VERSION/gst-completion-helper)
AC_DEFINE_UNQUOTED(GST_COMPLETION_HELPER_INSTALLED, AC_DEFINE_UNQUOTED(GST_COMPLETION_HELPER_INSTALLED,

4
gst/gstpluginloader.c
View file

@ -484,8 +484,8 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
g_win32_get_package_installation_directory_of_module g_win32_get_package_installation_directory_of_module
(_priv_gst_dll_handle); (_priv_gst_dll_handle);
helper_bin = helper_bin =
g_build_filename (basedir, "lib", "gstreamer-" GST_API_VERSION, g_build_filename (basedir, GST_PLUGIN_SCANNER_SUBDIR,
"gst-plugin-scanner.exe", NULL); "gstreamer-" GST_API_VERSION, "gst-plugin-scanner.exe", NULL);
g_free (basedir); g_free (basedir);
} }
#else #else

2
meson.build
View file

@ -69,6 +69,8 @@ cdata.set_quoted('VERSION', gst_version)
cdata.set('MEMORY_ALIGNMENT_MALLOC', 1) cdata.set('MEMORY_ALIGNMENT_MALLOC', 1)
cdata.set_quoted('GST_PLUGIN_SCANNER_INSTALLED', join_paths(prefix, helpers_install_dir, 'gst-plugin-scanner')) cdata.set_quoted('GST_PLUGIN_SCANNER_INSTALLED', join_paths(prefix, helpers_install_dir, 'gst-plugin-scanner'))
cdata.set_quoted('GST_PTP_HELPER_INSTALLED', join_paths(prefix, helpers_install_dir, 'gst-ptp-helper')) cdata.set_quoted('GST_PTP_HELPER_INSTALLED', join_paths(prefix, helpers_install_dir, 'gst-ptp-helper'))
cdata.set_quoted('GST_PLUGIN_SCANNER_SUBDIR', libexecdir,
description: 'libexecdir path component, used to find plugin-scanner on relocatable builds on windows')
if gst_version_nano > 0 if gst_version_nano > 0
# Have GST_ERROR message printed when running from git # Have GST_ERROR message printed when running from git