From: Fabrice Fontaine Date: Sun, 18 Oct 2020 14:28:34 +0000 (+0200) Subject: package/gstreamer1/gstreamer1-editing-services: fix static build X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b22d55dcc94468895f1509f958326853ef233099;p=buildroot.git package/gstreamer1/gstreamer1-editing-services: fix static build 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 Signed-off-by: Yann E. MORIN --- 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 +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 +[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 +