From patchwork Wed Jun 9 19:01:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1490043 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.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G0c333dzJz9sVm for ; Thu, 10 Jun 2021 05:03:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id AF89F83D18; Wed, 9 Jun 2021 19:03:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LDae5v3CDuFu; Wed, 9 Jun 2021 19:03:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id F129D83D13; Wed, 9 Jun 2021 19:03:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 6400F1BF3F2 for ; Wed, 9 Jun 2021 19:03:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 52306404BB for ; Wed, 9 Jun 2021 19:03:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4OycM5ojG0hy for ; Wed, 9 Jun 2021 19:03:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by smtp4.osuosl.org (Postfix) with ESMTPS id 212FA4029A for ; Wed, 9 Jun 2021 19:03:46 +0000 (UTC) Received: from fwd37.aul.t-online.de (fwd37.aul.t-online.de [172.20.27.137]) by mailout08.t-online.de (Postfix) with SMTP id B387B7473D; Wed, 9 Jun 2021 21:01:42 +0200 (CEST) Received: from fli4l.lan.fli4l (XZTFMQZcwhnd2v2w9OqHnhXtobi8EyFEvHhowq5RjCgDj+M8iThMjOwAxaoJzUUQkI@[91.58.8.174]) by fwd37.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1lr3SQ-3mtLBQ0; Wed, 9 Jun 2021 21:01:42 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:41636) by fli4l.lan.fli4l with esmtp (Exim 4.94.2) (envelope-from ) id 1lr3SP-00073X-Nx; Wed, 09 Jun 2021 21:01:42 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Wed, 9 Jun 2021 21:01:41 +0200 Message-Id: <20210609190141.996573-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-ID: XZTFMQZcwhnd2v2w9OqHnhXtobi8EyFEvHhowq5RjCgDj+M8iThMjOwAxaoJzUUQkI X-TOI-EXPURGATEID: 150726::1623265302-00013CA1-2F004ABB/0/0 CLEAN NORMAL X-TOI-MSGID: 9d0489ff-61b8-4ce4-b51d-0c78de9f4773 Subject: [Buildroot] [PATCH 1/1] package/ffmpeg: Fix build for mips, 2nd attempt 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: Mahyar Koshkouei Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: http://autobuild.buildroot.net/results/da0/da03909291e97c525eb1f53dfc743a1897f59d6e/ Signed-off-by: Bernd Kuhls --- package/ffmpeg/0003-libavutil-Fix-mips-build.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index 7af01463e8..8b81e66981 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -8,7 +8,7 @@ Check for sys/auxv.h because not all toolchains contain this header. Fixes https://trac.ffmpeg.org/ticket/9138 Patch sent upstream: -http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281037.html +http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html Signed-off-by: Bernd Kuhls --- @@ -17,7 +17,7 @@ Signed-off-by: Bernd Kuhls 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 82367fd30d..b0154cb8b2 100755 +index 6bfd98b384..773a7d516c 100755 --- a/configure +++ b/configure @@ -2161,6 +2161,7 @@ HEADERS_LIST=" @@ -28,7 +28,7 @@ index 82367fd30d..b0154cb8b2 100755 sys_param_h sys_resource_h sys_select_h -@@ -6210,6 +6211,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa +@@ -6218,6 +6219,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa check_headers windows.h check_headers X11/extensions/XvMClib.h check_headers asm/types.h @@ -37,7 +37,7 @@ index 82367fd30d..b0154cb8b2 100755 # it seems there are versions of clang in some distros that try to use the # gcc headers, which explodes for stdatomic diff --git a/libavutil/mips/cpu.c b/libavutil/mips/cpu.c -index 59619d54de..4738104cdd 100644 +index 59619d54de..19196de50b 100644 --- a/libavutil/mips/cpu.c +++ b/libavutil/mips/cpu.c @@ -19,7 +19,7 @@ @@ -45,7 +45,7 @@ index 59619d54de..4738104cdd 100644 #include "libavutil/cpu_internal.h" #include "config.h" -#if defined __linux__ || defined __ANDROID__ -+#if (defined __linux__ || defined __ANDROID__) && defined(HAVE_SYS_AUXV_H) ++#if (defined __linux__ || defined __ANDROID__) && HAVE_SYS_AUXV_H #include #include #include @@ -54,7 +54,7 @@ index 59619d54de..4738104cdd 100644 #endif -#if defined __linux__ || defined __ANDROID__ -+#if (defined __linux__ || defined __ANDROID__) && defined(HAVE_SYS_AUXV_H) ++#if (defined __linux__ || defined __ANDROID__) && HAVE_SYS_AUXV_H #define HWCAP_LOONGSON_CPUCFG (1 << 14) @@ -63,7 +63,7 @@ index 59619d54de..4738104cdd 100644 int ff_get_cpu_flags_mips(void) { -#if defined __linux__ || defined __ANDROID__ -+#if (defined __linux__ || defined __ANDROID__) && defined(HAVE_SYS_AUXV_H) ++#if (defined __linux__ || defined __ANDROID__) && HAVE_SYS_AUXV_H if (cpucfg_available()) return cpu_flags_cpucfg(); else