From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit branch/2021.05.x] package/ffmpeg: Fix build for mips, 2nd attempt
Date: Wed, 23 Jun 2021 00:07:29 +0200 [thread overview]
Message-ID: <20210622213719.C69D18122B@busybox.osuosl.org> (raw)
commit: https://git.buildroot.net/buildroot/commit/?id=717a56581fbfa9a0209abae3227cfee25030314a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.05.x
The patch introduced in commit 8e3d620251b331 (package/ffmpeg: Fix build for
mips) uses "defined(HAVE_SYS_AUXV_H)". However, ffmpeg configure is not GNU
autoconf, and it defines the symbol to 0 when not found. Use
HAVE_SYS_AUXV_H without defined() instead.
Fixes:
http://autobuild.buildroot.net/results/da0/da03909291e97c525eb1f53dfc743a1897f59d6e/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit f5c0c74ebe1ce91fa12073f7c9f5652befa31541)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
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 <bernd.kuhls@t-online.de>
---
@@ -17,7 +17,7 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
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 <stdint.h>
#include <stdio.h>
#include <string.h>
@@ -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
reply other threads:[~2021-06-22 22:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210622213719.C69D18122B@busybox.osuosl.org \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.