From fd9b4d23ced757a2655f71c51d9e50f0dfbf648c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 30 Dec 2017 22:32:58 +0000 Subject: [PATCH] quick fix for arm builds rdtsc is an x86 assembly instruction to read the processors https://www.spinics.net/lists/fedora-devel/msg224266.html --- x265-detect_cpu_armhfp.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/x265-detect_cpu_armhfp.patch b/x265-detect_cpu_armhfp.patch index e68b827..3dfc10d 100644 --- a/x265-detect_cpu_armhfp.patch +++ b/x265-detect_cpu_armhfp.patch @@ -42,3 +42,18 @@ diff -up x265_2.2/source/CMakeLists.txt.orig x265_2.2/source/CMakeLists.txt else() message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown") message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}") +--- x265_v2.6/source/test/testharness.h.orig 2017-12-30 22:27:49.827620181 +0000 ++++ x265_v2.6/source/test/testharness.h 2017-12-30 22:30:53.239500941 +0000 +@@ -70,9 +70,10 @@ protected: + #include + #elif (!defined(__APPLE__) && (defined (__GNUC__) && (defined(__x86_64__) || defined(__i386__)))) + #include +-#elif ( !defined(__APPLE__) && defined (__GNUC__) && defined(__ARM_NEON__)) +-#include + #elif defined(__GNUC__) ++#if ( !defined(__APPLE__) && defined(__ARM_NEON__)) ++#include ++#endif + /* fallback for older GCC/MinGW */ + static inline uint32_t __rdtsc(void) + {