* [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1-editing-services: fix static build
@ 2020-10-18 14:28 Fabrice Fontaine
2020-10-18 20:31 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2020-10-18 14:28 UTC (permalink / raw)
To: buildroot
Fix static build with gstreamer1-editing-services in version 1.17.1 and
above
Fixes:
- http://autobuild.buildroot.org/results/2a528a1185644f5b23d26eb3f2b342e99aa1e493
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.../0001-utils.c-fix-static-build.patch | 74 +++++++++++++++++++
1 file changed, 74 insertions(+)
create mode 100644 package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch
diff --git a/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch b/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch
new file mode 100644
index 0000000000..8b60299ce3
--- /dev/null
+++ b/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch
@@ -0,0 +1,74 @@
+From 248290c5c49b25b72b40017857c6118c51ef614e Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 18 Oct 2020 16:08:36 +0200
+Subject: [PATCH] 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 gst_warn
+
+Fixes:
+ - http://autobuild.buildroot.org/results/2a528a1185644f5b23d26eb3f2b342e99aa1e493
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/216]
+---
+ tools/ges-launcher.c | 2 +-
+ tools/utils.c | 2 +-
+ tools/utils.h | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/ges-launcher.c b/tools/ges-launcher.c
+index ad2921cc..9eb1f615 100644
+--- a/tools/ges-launcher.c
++++ b/tools/ges-launcher.c
+@@ -261,7 +261,7 @@ _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.");
++ gst_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 =
+diff --git a/tools/utils.c b/tools/utils.c
+index 7ad64522..fe79f0a1 100644
+--- a/tools/utils.c
++++ b/tools/utils.c
+@@ -222,7 +222,7 @@ ok (const gchar * format, ...)
+ }
+
+ void
+-warn (const gchar * format, ...)
++gst_warn (const gchar * format, ...)
+ {
+ va_list var_args;
+
+diff --git a/tools/utils.h b/tools/utils.h
+index ac18ab5a..e2f0ac67 100644
+--- a/tools/utils.h
++++ b/tools/utils.h
+@@ -29,9 +29,9 @@ 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 gst_warn (const gchar * format, ...);
+ void 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);
+--
+2.28.0
+
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1-editing-services: fix static build
2020-10-18 14:28 [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1-editing-services: fix static build Fabrice Fontaine
@ 2020-10-18 20:31 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2020-10-18 20:31 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2020-10-18 16:28 +0200, Fabrice Fontaine spake thusly:
> Fix static build with gstreamer1-editing-services in version 1.17.1 and
> above
>
> Fixes:
> - http://autobuild.buildroot.org/results/2a528a1185644f5b23d26eb3f2b342e99aa1e493
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
I had to fixup the patch, for Pathwork somehow mangled it twice:
- the extra long line of the patch comit log was wrapped; I suspect
that's because it exceeds the mail limit of 998 chars (rfc2822);
- the git version footer actually appeared below the diffstat, but
above the patch; I suspect it is a consequence of either the above
wrapping (two extra lines pushing the footer off-limit), of because
of the trailing no-newline, or a combination of both...
Anyway, not your fault, and fixed. And I got to re-read RFC2822, such a
delight! ;-]
Thanks!
Regards,
Yann E. MORIN.
> ---
> .../0001-utils.c-fix-static-build.patch | 74 +++++++++++++++++++
> 1 file changed, 74 insertions(+)
> create mode 100644 package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch
>
> diff --git a/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch b/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch
> new file mode 100644
> index 0000000000..8b60299ce3
> --- /dev/null
> +++ b/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch
> @@ -0,0 +1,74 @@
> +From 248290c5c49b25b72b40017857c6118c51ef614e Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 18 Oct 2020 16:08:36 +0200
> +Subject: [PATCH] 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-uclibcgnu
> eabi/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 gst_warn
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/2a528a1185644f5b23d26eb3f2b342e99aa1e493
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status:
> +https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/216]
> +---
> + tools/ges-launcher.c | 2 +-
> + tools/utils.c | 2 +-
> + tools/utils.h | 4 ++--
> + 3 files changed, 4 insertions(+), 4 deletions(-)
> +
> +diff --git a/tools/ges-launcher.c b/tools/ges-launcher.c
> +index ad2921cc..9eb1f615 100644
> +--- a/tools/ges-launcher.c
> ++++ b/tools/ges-launcher.c
> +@@ -261,7 +261,7 @@ _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.");
> ++ gst_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 =
> +diff --git a/tools/utils.c b/tools/utils.c
> +index 7ad64522..fe79f0a1 100644
> +--- a/tools/utils.c
> ++++ b/tools/utils.c
> +@@ -222,7 +222,7 @@ ok (const gchar * format, ...)
> + }
> +
> + void
> +-warn (const gchar * format, ...)
> ++gst_warn (const gchar * format, ...)
> + {
> + va_list var_args;
> +
> +diff --git a/tools/utils.h b/tools/utils.h
> +index ac18ab5a..e2f0ac67 100644
> +--- a/tools/utils.h
> ++++ b/tools/utils.h
> +@@ -29,9 +29,9 @@ 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 gst_warn (const gchar * format, ...);
> + void 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);
> +--
> +2.28.0
> +
> --
> 2.28.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-18 20:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-18 14:28 [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1-editing-services: fix static build Fabrice Fontaine
2020-10-18 20:31 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox