[chromium-freeworld: 6/8] fix include pathing in libavutil/timer.h
commit 321d5de0345b4863d1625507044ed08ff9f00d12
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 25 15:31:37 2017 -0400
fix include pathing in libavutil/timer.h
....3112.113-libavutil-timer-include-path-fix.patch | 21 +++++++++++++++++++++
chromium.spec | 5 +++++
2 files changed, 26 insertions(+)
---
diff --git a/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
b/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
new file mode 100644
index 0000000..7248825
--- /dev/null
+++ b/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
@@ -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)
diff --git a/chromium.spec b/chromium.spec
index 9552beb..7df942d 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -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