Browse Source

package/ffmpeg: update the patches to be applied with fuzz 0

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 06b5ce9f04123a985e7543d5aadae60e14399401)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Dario Binacchi 1 year ago
parent
commit
6384a77dfb
1 changed files with 9 additions and 7 deletions
  1. 9 7
      package/ffmpeg/0003-libavutil-Fix-mips-build.patch

+ 9 - 7
package/ffmpeg/0003-libavutil-Fix-mips-build.patch

@@ -1,4 +1,4 @@
-From 6e8daf0d502a2a822f1f08f42368d7d676dc1a9e Mon Sep 17 00:00:00 2001
+From e9d97f9d29ce57d7a5a62607c2a08e091a06de6e 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
@@ -11,16 +11,18 @@ Patch sent upstream:
 http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html
 
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  configure            | 2 ++
  libavutil/mips/cpu.c | 6 +++---
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/configure b/configure
-index 6bfd98b384..773a7d516c 100755
+index a89cfa6d959d..6ec00df75312 100755
 --- a/configure
 +++ b/configure
-@@ -2191,6 +2191,7 @@ HEADERS_LIST="
+@@ -2227,6 +2227,7 @@ HEADERS_LIST="
      opencv2_core_core_c_h
      OpenGL_gl3_h
      poll_h
@@ -28,8 +30,8 @@ index 6bfd98b384..773a7d516c 100755
      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
+@@ -6472,6 +6473,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa
+ check_func_headers VideoToolbox/VideoToolbox.h VTPixelRotationSessionCreate -framework VideoToolbox
  check_headers windows.h
  check_headers asm/types.h
 +check_headers sys/auxv.h
@@ -37,7 +39,7 @@ index 6bfd98b384..773a7d516c 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..19196de50b 100644
+index 59619d54dee3..19196de50b59 100644
 --- a/libavutil/mips/cpu.c
 +++ b/libavutil/mips/cpu.c
 @@ -19,7 +19,7 @@
@@ -68,5 +70,5 @@ index 59619d54de..19196de50b 100644
          return cpu_flags_cpucfg();
      else
 -- 
-2.29.2
+2.34.1