From patchwork Sun Oct 18 14:28:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1383842 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=aXErfQJ1; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CDj1W611Gz9sSs for ; Mon, 19 Oct 2020 01:28:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3F302871F6; Sun, 18 Oct 2020 14:28:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IZqQDyYmHvZj; Sun, 18 Oct 2020 14:28:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3809E871D7; Sun, 18 Oct 2020 14:28:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id CDE891BF379 for ; Sun, 18 Oct 2020 14:28:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B29F8227DB for ; Sun, 18 Oct 2020 14:28:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0QaMtO0qkpGB for ; Sun, 18 Oct 2020 14:28:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by silver.osuosl.org (Postfix) with ESMTPS id 7B255204D2 for ; Sun, 18 Oct 2020 14:28:39 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id x7so8570225wrl.3 for ; Sun, 18 Oct 2020 07:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sWh50txmtV21YqLXQyirVE3Ep6HyvB6vOx5SUFa5PPM=; b=aXErfQJ1mVxCsqT1Jx3NlxSuz2oQpIXN2eJN5jC/uaJc2RmGkrCqY3HcLWwBzA7Gkx v2+4s5TUnA+Vd9V0yqJv873uw9zIj6hRCsb+5oTQzSjrErQ2nfCabqprNH24Psqaw/CB Zwarqva+lDeOBQpHWO8MH8uumRnteFet6uAiJRnVxc8uACBIGuJ57uHEJum9UpIML4DJ rYHC0DSo4R6P7defLzNjZ7YrvCLHQ6zHcAkPee1CDhLfO7URqF6GvnViUijfyKS2bp4I PnWWjNHPwYV/ewWQVv35D5/gqZ6DNLZiUH4SzadBJXRlS4SBZpmcHEoRkhYRtBL/o22l Lnwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sWh50txmtV21YqLXQyirVE3Ep6HyvB6vOx5SUFa5PPM=; b=jXiroBNQ470AkIdh7LTJsZCiDJwS22+6OKHNCWk4zaVF0V/4rmfAcqVN/0OZtAip+9 wgq3tQ6sf/PkRdmsA34M/mZCODq2GjKwAW/IlEIjYN0PEOkIkbss/Czz5BAQaBd7JihD NL0iBkrdvF7y8y1vcqjjKt00bjziEmVNM/ZnZhMDlHtpYYKN9d3t1I2P6Wjyt+iF2Fy5 qGnyZktykwK79nBCKoqpT6QQX+uGYCOutiaG2ffzACSjDttfED21+m8xzDH0UVW4vq3P OEOmXMEul4u0bhRUqDMkvF+16EO0YjJmw50wEjWevxGysXQMNFzwyo2TM3SmlLC4oofL oiyw== X-Gm-Message-State: AOAM532B9sB+Z9lkP2nL6HIcs8Ys9qpFwxu+GrZDMO/yvBvO+yW13Nj8 J4wgTWGoMfNS+aUELJZOH39+fwdGigR9Ag== X-Google-Smtp-Source: ABdhPJyi2EgynvMIpKE6m4/Y9elzupu0xhU8XeRgT4puR0tXXgXfHxJPMBH4XEeE+e0HskplMnpdqw== X-Received: by 2002:a05:6000:10c6:: with SMTP id b6mr15539187wrx.10.1603031317469; Sun, 18 Oct 2020 07:28:37 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id u20sm12026342wmm.29.2020.10.18.07.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Oct 2020 07:28:36 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 18 Oct 2020 16:28:34 +0200 Message-Id: <20201018142834.1250421-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1-editing-services: fix static build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Seiderer , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "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 --- .../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 +2.28.0 + 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-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 +[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); +--