mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 01:32:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

omx: Also search for gstomx.conf in the autoconf --sysconfdir

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=770743
This commit is contained in:
Sebastian Dröge 2016-09-12 14:09:46 +02:00
parent 540f926706
commit cb9078627c
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -371,6 +371,9 @@ dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_.*' $GST_ALL_LDFLAGS" GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_.*' $GST_ALL_LDFLAGS"
AC_SUBST(GST_PLUGIN_LDFLAGS) AC_SUBST(GST_PLUGIN_LDFLAGS)
AS_AC_EXPAND(GST_OMX_CONFIG_DIR, ${sysconfdir}/xdg)
AC_DEFINE_UNQUOTED(GST_OMX_CONFIG_DIR, "$GST_OMX_CONFIG_DIR", [gst-omx configuration directory])
dnl *** output files *** dnl *** output files ***
AC_CONFIG_FILES( AC_CONFIG_FILES(

4
omx/gstomx.c
View file

@ -2643,6 +2643,7 @@ plugin_init (GstPlugin * plugin)
gsize n_elements; gsize n_elements;
static const gchar *config_name[] = { "gstomx.conf", NULL }; static const gchar *config_name[] = { "gstomx.conf", NULL };
static const gchar *env_config_name[] = { "GST_OMX_CONFIG_DIR", NULL }; static const gchar *env_config_name[] = { "GST_OMX_CONFIG_DIR", NULL };
static const gchar *gst_omx_config_dir = GST_OMX_CONFIG_DIR;
GST_DEBUG_CATEGORY_INIT (gstomx_debug, "omx", 0, "gst-omx"); GST_DEBUG_CATEGORY_INIT (gstomx_debug, "omx", 0, "gst-omx");
GST_DEBUG_CATEGORY_INIT (gst_omx_video_debug_category, "omxvideo", 0, GST_DEBUG_CATEGORY_INIT (gst_omx_video_debug_category, "omxvideo", 0,
@ -2654,7 +2655,7 @@ plugin_init (GstPlugin * plugin)
user_config_dir = g_get_user_config_dir (); user_config_dir = g_get_user_config_dir ();
system_config_dirs = g_get_system_config_dirs (); system_config_dirs = g_get_system_config_dirs ();
config_dirs = config_dirs =
g_new (gchar *, g_strv_length ((gchar **) system_config_dirs) + 3); g_new (gchar *, g_strv_length ((gchar **) system_config_dirs) + 4);
i = 0; i = 0;
j = 0; j = 0;
@ -2663,6 +2664,7 @@ plugin_init (GstPlugin * plugin)
config_dirs[i++] = (gchar *) user_config_dir; config_dirs[i++] = (gchar *) user_config_dir;
while (system_config_dirs[j]) while (system_config_dirs[j])
config_dirs[i++] = (gchar *) system_config_dirs[j++]; config_dirs[i++] = (gchar *) system_config_dirs[j++];
config_dirs[i++] = (gchar *) gst_omx_config_dir;
config_dirs[i++] = NULL; config_dirs[i++] = NULL;
gst_plugin_add_dependency (plugin, env_config_name, gst_plugin_add_dependency (plugin, env_config_name,