summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-10-08 02:06:18 +0100
committerSam James <sam@gentoo.org>2021-10-08 02:06:36 +0100
commitfbb77bdce07e7e84d3d958f00065fc98093794d2 (patch)
treefcf7719ef0df78c8da291536012a0b4c0f5b1959 /media-libs/x265
parentsci-geosciences/gpsd: Stabilize 3.23-r2 ppc64, #813168 (diff)
downloadgentoo-fbb77bdce07e7e84d3d958f00065fc98093794d2.tar.gz
gentoo-fbb77bdce07e7e84d3d958f00065fc98093794d2.tar.bz2
gentoo-fbb77bdce07e7e84d3d958f00065fc98093794d2.zip
media-libs/x265: fix build for arm with main10
Closes: https://bugs.gentoo.org/816795 Thanks-to: Tee KOBAYASHI <xtkoba@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/x265')
-rw-r--r--media-libs/x265/files/arm-r1.patch34
1 files changed, 30 insertions, 4 deletions
diff --git a/media-libs/x265/files/arm-r1.patch b/media-libs/x265/files/arm-r1.patch
index 8a8102dd2580..69aa3036eff3 100644
--- a/media-libs/x265/files/arm-r1.patch
+++ b/media-libs/x265/files/arm-r1.patch
@@ -1,10 +1,8 @@
More aliases for ARM.
Do not force CFLAGS for ARM.
-Index: source/CMakeLists.txt
-===================================================================
---- source.orig/CMakeLists.txt
-+++ source/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
# System architecture detection
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
@@ -40,3 +38,31 @@ Index: source/CMakeLists.txt
endif()
endif()
endif()
+--- a/dynamicHDR10/CMakeLists.txt
++++ b/dynamicHDR10/CMakeLists.txt
+@@ -43,14 +43,14 @@ if(GCC)
+ endif()
+ endif()
+ if(ARM AND CROSS_COMPILE_ARM)
+- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
++ set(ARM_ARGS -fPIC)
+ elseif(ARM)
+ find_package(Neon)
+ if(CPU_HAS_NEON)
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++ set(ARM_ARGS -fPIC)
+ add_definitions(-DHAVE_NEON)
+ else()
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
++ set(ARM_ARGS -fPIC)
+ endif()
+ endif()
+ add_definitions(${ARM_ARGS})
+@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")
+ option(ENABLE_SHARED "Build shared library" OFF)
+
+ install(FILES hdr10plus.h DESTINATION include)
+-endif()
+\ No newline at end of file
++endif()
+