fa36a6375d
Quoting Changelog: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=Changelog;h=b357f428abce2110904944c4cc066b8e297bb895;hb=3153c441e1d980ff9931ed26a0e01b4e366ac521 "- ffmpeg now requires threading to be built" Propagate threads to reserve dependencies. Rebased patches. Removed patch 0005 which is included in this release. Removed support for libavresample which was removed upstream. No legacy handling necessary for opencv3/4 because libavresample was an optional dependency. Added upstream patch 0005 to fix build error with arm. Drop configure options which were removed upstream. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
73 lines
2.1 KiB
Diff
73 lines
2.1 KiB
Diff
From 6e8daf0d502a2a822f1f08f42368d7d676dc1a9e Mon Sep 17 00:00:00 2001
|
|
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
Date: Sun, 6 Jun 2021 08:54:53 +0200
|
|
Subject: [PATCH] libavutil: Fix mips build
|
|
|
|
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/281272.html
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
---
|
|
configure | 2 ++
|
|
libavutil/mips/cpu.c | 6 +++---
|
|
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 6bfd98b384..773a7d516c 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -2191,6 +2191,7 @@ HEADERS_LIST="
|
|
opencv2_core_core_c_h
|
|
OpenGL_gl3_h
|
|
poll_h
|
|
+ sys_auxv_h
|
|
sys_param_h
|
|
sys_resource_h
|
|
sys_select_h
|
|
@@ -6361,6 +6361,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa
|
|
check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox
|
|
check_headers windows.h
|
|
check_headers asm/types.h
|
|
+check_headers sys/auxv.h
|
|
|
|
# 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..19196de50b 100644
|
|
--- a/libavutil/mips/cpu.c
|
|
+++ b/libavutil/mips/cpu.c
|
|
@@ -19,7 +19,7 @@
|
|
#include "libavutil/cpu.h"
|
|
#include "libavutil/cpu_internal.h"
|
|
#include "config.h"
|
|
-#if defined __linux__ || defined __ANDROID__
|
|
+#if (defined __linux__ || defined __ANDROID__) && HAVE_SYS_AUXV_H
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
@@ -28,7 +28,7 @@
|
|
#include "libavutil/avstring.h"
|
|
#endif
|
|
|
|
-#if defined __linux__ || defined __ANDROID__
|
|
+#if (defined __linux__ || defined __ANDROID__) && HAVE_SYS_AUXV_H
|
|
|
|
#define HWCAP_LOONGSON_CPUCFG (1 << 14)
|
|
|
|
@@ -105,7 +105,7 @@ static int cpu_flags_cpuinfo(void)
|
|
|
|
int ff_get_cpu_flags_mips(void)
|
|
{
|
|
-#if defined __linux__ || defined __ANDROID__
|
|
+#if (defined __linux__ || defined __ANDROID__) && HAVE_SYS_AUXV_H
|
|
if (cpucfg_available())
|
|
return cpu_flags_cpucfg();
|
|
else
|
|
--
|
|
2.29.2
|
|
|