| 1 |
commit: fbb77bdce07e7e84d3d958f00065fc98093794d2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 8 01:06:18 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 8 01:06:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb77bdc |
| 7 |
|
| 8 |
media-libs/x265: fix build for arm with main10 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/816795 |
| 11 |
Thanks-to: Tee KOBAYASHI <xtkoba <AT> gmail.com> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/x265/files/arm-r1.patch | 34 ++++++++++++++++++++++++++++++---- |
| 15 |
1 file changed, 30 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/x265/files/arm-r1.patch b/media-libs/x265/files/arm-r1.patch |
| 18 |
index 8a8102dd258..69aa3036eff 100644 |
| 19 |
--- a/media-libs/x265/files/arm-r1.patch |
| 20 |
+++ b/media-libs/x265/files/arm-r1.patch |
| 21 |
@@ -1,10 +1,8 @@ |
| 22 |
More aliases for ARM. |
| 23 |
Do not force CFLAGS for ARM. |
| 24 |
|
| 25 |
-Index: source/CMakeLists.txt |
| 26 |
-=================================================================== |
| 27 |
---- source.orig/CMakeLists.txt |
| 28 |
-+++ source/CMakeLists.txt |
| 29 |
+--- a/CMakeLists.txt |
| 30 |
++++ b/CMakeLists.txt |
| 31 |
@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ |
| 32 |
# System architecture detection |
| 33 |
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) |
| 34 |
@@ -40,3 +38,31 @@ Index: source/CMakeLists.txt |
| 35 |
endif() |
| 36 |
endif() |
| 37 |
endif() |
| 38 |
+--- a/dynamicHDR10/CMakeLists.txt |
| 39 |
++++ b/dynamicHDR10/CMakeLists.txt |
| 40 |
+@@ -43,14 +43,14 @@ if(GCC) |
| 41 |
+ endif() |
| 42 |
+ endif() |
| 43 |
+ if(ARM AND CROSS_COMPILE_ARM) |
| 44 |
+- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) |
| 45 |
++ set(ARM_ARGS -fPIC) |
| 46 |
+ elseif(ARM) |
| 47 |
+ find_package(Neon) |
| 48 |
+ if(CPU_HAS_NEON) |
| 49 |
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) |
| 50 |
++ set(ARM_ARGS -fPIC) |
| 51 |
+ add_definitions(-DHAVE_NEON) |
| 52 |
+ else() |
| 53 |
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) |
| 54 |
++ set(ARM_ARGS -fPIC) |
| 55 |
+ endif() |
| 56 |
+ endif() |
| 57 |
+ add_definitions(${ARM_ARGS}) |
| 58 |
+@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") |
| 59 |
+ option(ENABLE_SHARED "Build shared library" OFF) |
| 60 |
+ |
| 61 |
+ install(FILES hdr10plus.h DESTINATION include) |
| 62 |
+-endif() |
| 63 |
+\ No newline at end of file |
| 64 |
++endif() |
| 65 |
+ |
Archives