diff options
author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2020-10-18 16:08:36 +0200 |
---|---|---|
committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-10-19 21:27:17 +0000 |
commit | 8f3e2e5b84f138504733fc5169968d2b91b75e9d (patch) | |
tree | 3c6879fd536f679b72aae9cd67faf0b3df418e3d | |
parent | 03a109f5fe5e88717340d0f197eb6e8de1a1dcd0 (diff) |
utils.c: fix static build
Static build fails since version 1.17.1 and
https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/commit/1e488d4311420b5ca193155ad8ab05509c9a4a37
on:
FAILED: tools/ges-launch-1.0
/srv/storage/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -o tools/ges-launch-1.0 tools/ges-launch-1.0.p/ges-validate.c.o tools/ges-launch-1.0.p/ges-launch.c.o tools/ges-launch-1.0.p/ges-launcher.c.o tools/ges-launch-1.0.p/utils.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,-Bsymbolic-functions -static -Wl,--start-group ges/libges-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstreamer-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgobject-2.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libglib-2.0.a -pthread /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libpcre.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libffi.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgmodule-2.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstbase-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstvideo-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstpbutils-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstaudio-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libz.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgsttag-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstcontroller-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgio-2.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmount.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libblkid.a -lm -Wl,--end-group
/srv/storage/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libc.a(err.os): in function `warn':
err.c:(.text+0x1d8): multiple definition of `warn'; tools/ges-launch-1.0.p/utils.c.o:utils.c:(.text+0x9bc): first defined here
So rename warn function to ges_warn
Also prefix ok, print and printerr function by ges_ for consistancy and
run gst-indent on tools/ges-launcher.c
Fixes:
- http://autobuild.buildroot.org/results/2a528a1185644f5b23d26eb3f2b342e99aa1e493
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/216>
-rw-r--r-- | tools/ges-launcher.c | 35 | ||||
-rw-r--r-- | tools/utils.c | 14 | ||||
-rw-r--r-- | tools/utils.h | 10 |
3 files changed, 31 insertions, 28 deletions
diff --git a/tools/ges-launcher.c b/tools/ges-launcher.c index ad2921cc..0e01c72a 100644 --- a/tools/ges-launcher.c +++ b/tools/ges-launcher.c @@ -230,8 +230,8 @@ _set_rendering_details (GESLauncher * self) GstEncodingProfile *prof = NULL; if (!opts->format) { GESProject *proj = - GES_PROJECT (ges_extractable_get_asset (GES_EXTRACTABLE (self-> - priv->timeline))); + GES_PROJECT (ges_extractable_get_asset (GES_EXTRACTABLE (self->priv-> + timeline))); const GList *profiles = ges_project_list_encoding_profiles (proj); if (profiles) { @@ -261,7 +261,9 @@ _set_rendering_details (GESLauncher * self) } if (!prof) { - warn ("No format specified and couldn't find one from output file extension, " "falling back to theora+vorbis in ogg."); + ges_warn + ("No format specified and couldn't find one from output file extension, " + "falling back to theora+vorbis in ogg."); g_free (opts->format); opts->format = @@ -270,7 +272,8 @@ _set_rendering_details (GESLauncher * self) } if (!prof) { - printerr ("Could not find any encoding format for %s\n", opts->format); + ges_printerr ("Could not find any encoding format for %s\n", + opts->format); return FALSE; } @@ -379,7 +382,7 @@ static void _project_loading_error_cb (GESProject * project, GESTimeline * timeline, GError * error, GESLauncher * self) { - printerr ("Error loading timeline: '%s'\n", error->message); + ges_printerr ("Error loading timeline: '%s'\n", error->message); self->priv->seenerrors = TRUE; g_application_quit (G_APPLICATION (self)); @@ -449,7 +452,7 @@ static void _error_loading_asset_cb (GESProject * project, GError * error, const gchar * failed_id, GType extractable_type, GESLauncher * self) { - printerr ("Error loading asset %s: %s\n", failed_id, error->message); + ges_printerr ("Error loading asset %s: %s\n", failed_id, error->message); self->priv->seenerrors = TRUE; g_application_quit (G_APPLICATION (self)); @@ -483,7 +486,7 @@ _create_timeline (GESLauncher * self, const gchar * serialized_timeline, gst_object_unref (project); if (error) { - printerr ("\nERROR: Could not create timeline because: %s\n\n", + ges_printerr ("\nERROR: Could not create timeline because: %s\n\n", error->message); g_error_free (error); return FALSE; @@ -543,9 +546,9 @@ bus_message_cb (GstBus * bus, GstMessage * message, GESLauncher * self) gst_message_parse_error (message, &err, &dbg_info); GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (self->priv->pipeline), GST_DEBUG_GRAPH_SHOW_ALL, "ges-launch-error"); - printerr ("ERROR from element %s: %s\n", GST_OBJECT_NAME (message->src), - err->message); - printerr ("Debugging info: %s\n", (dbg_info) ? dbg_info : "none"); + ges_printerr ("ERROR from element %s: %s\n", + GST_OBJECT_NAME (message->src), err->message); + ges_printerr ("Debugging info: %s\n", (dbg_info) ? dbg_info : "none"); g_clear_error (&err); g_free (dbg_info); self->priv->seenerrors = TRUE; @@ -554,7 +557,7 @@ bus_message_cb (GstBus * bus, GstMessage * message, GESLauncher * self) } case GST_MESSAGE_EOS: if (!self->priv->parsed_options.ignore_eos) { - ok ("\nDone\n"); + ges_ok ("\nDone\n"); g_application_quit (G_APPLICATION (self)); } break; @@ -610,8 +613,8 @@ _save_timeline (GESLauncher * self) if (opts->embed_nesteds) { GList *tmp, *assets; GESProject *proj = - GES_PROJECT (ges_extractable_get_asset (GES_EXTRACTABLE (self-> - priv->timeline))); + GES_PROJECT (ges_extractable_get_asset (GES_EXTRACTABLE (self->priv-> + timeline))); assets = ges_project_list_assets (proj, GES_TYPE_URI_CLIP); for (tmp = assets; tmp; tmp = tmp->next) { @@ -669,7 +672,7 @@ _run_pipeline (GESLauncher * self) } if (!_timeline_set_user_options (self, self->priv->timeline, NULL)) { - printerr ("Could not properly set tracks\n"); + ges_printerr ("Could not properly set tracks\n"); return FALSE; } @@ -1048,7 +1051,7 @@ _local_command_line (GApplication * application, gchar ** arguments[], gst_init (&argc, arguments); if (!ges_launcher_parse_options (self, arguments, &argc, ctx, &error)) { gst_init (NULL, NULL); - printerr ("Error initializing: %s\n", error->message); + ges_printerr ("Error initializing: %s\n", error->message); g_option_context_free (ctx); g_error_free (error); *exit_status = 1; @@ -1096,7 +1099,7 @@ _startup (GApplication * application) /* Initialize the GStreamer Editing Services */ if (!ges_init ()) { - printerr ("Error initializing GES\n"); + ges_printerr ("Error initializing GES\n"); goto done; } diff --git a/tools/utils.c b/tools/utils.c index 7ad64522..78015cdf 100644 --- a/tools/utils.c +++ b/tools/utils.c @@ -172,7 +172,7 @@ print_enum (GType enum_type) } void -print (GstDebugColorFlags c, gboolean err, gboolean nline, +ges_print (GstDebugColorFlags c, gboolean err, gboolean nline, const gchar * format, va_list var_args) { GString *str = g_string_new (NULL); @@ -212,32 +212,32 @@ print (GstDebugColorFlags c, gboolean err, gboolean nline, } void -ok (const gchar * format, ...) +ges_ok (const gchar * format, ...) { va_list var_args; va_start (var_args, format); - print (GST_DEBUG_FG_GREEN, FALSE, TRUE, format, var_args); + ges_print (GST_DEBUG_FG_GREEN, FALSE, TRUE, format, var_args); va_end (var_args); } void -warn (const gchar * format, ...) +ges_warn (const gchar * format, ...) { va_list var_args; va_start (var_args, format); - print (GST_DEBUG_FG_YELLOW, TRUE, TRUE, format, var_args); + ges_print (GST_DEBUG_FG_YELLOW, TRUE, TRUE, format, var_args); va_end (var_args); } void -printerr (const gchar * format, ...) +ges_printerr (const gchar * format, ...) { va_list var_args; va_start (var_args, format); - print (GST_DEBUG_FG_RED, TRUE, TRUE, format, var_args); + ges_print (GST_DEBUG_FG_RED, TRUE, TRUE, format, var_args); va_end (var_args); } diff --git a/tools/utils.h b/tools/utils.h index ac18ab5a..63e21011 100644 --- a/tools/utils.h +++ b/tools/utils.h @@ -27,11 +27,11 @@ gchar * ensure_uri (const gchar * location); GstEncodingProfile * parse_encoding_profile (const gchar * format); void print_enum (GType enum_type); -void print (GstDebugColorFlags c, gboolean err, gboolean nline, const gchar * format, va_list var_args); -void ok (const gchar * format, ...); -void warn (const gchar * format, ...); -void printerr (const gchar * format, ...); +void ges_print (GstDebugColorFlags c, gboolean err, gboolean nline, const gchar * format, va_list var_args); +void ges_ok (const gchar * format, ...); +void ges_warn (const gchar * format, ...); +void ges_printerr (const gchar * format, ...); gchar * get_file_extension (gchar * uri); void describe_encoding_profile (GstEncodingProfile *profile); -void print_timeline(GESTimeline *timeline);
\ No newline at end of file +void print_timeline(GESTimeline *timeline); |