fix include pathing in libavutil/timer.h

This commit is contained in:
Tom Callaway 2017-08-25 15:31:37 -04:00
parent 7d1f0eac97
commit 321d5de034
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,21 @@
diff -up chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h
--- chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix 2017-08-25 15:29:12.143242471 -0400
+++ chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h 2017-08-25 15:29:36.941835865 -0400
@@ -39,13 +39,13 @@
#include "log.h"
#if ARCH_AARCH64
-# include "aarch64/timer.h"
+# include "libavutil/aarch64/timer.h"
#elif ARCH_ARM
-# include "arm/timer.h"
+# include "libavutil/arm/timer.h"
#elif ARCH_PPC
-# include "ppc/timer.h"
+# include "libavutil/ppc/timer.h"
#elif ARCH_X86
-# include "x86/timer.h"
+# include "libavutil/x86/timer.h"
#endif
#if !defined(AV_READ_TIME)

View File

@ -204,6 +204,9 @@ Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch
Patch48: chromium-60.0.3112.101-camfix.patch
# Fix mp3 for aarch64
Patch49: chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
# Fix libavutil include pathing to find arch specific timer.h
# For some reason, this only fails on aarch64. No idea why.
Patch50: chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@ -643,6 +646,8 @@ udev.
%patch47 -p1 -b .c99
%endif
%patch48 -p1 -b .camfix
%patch50 -p1 -b .pathfix
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus