[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/

["Sam James" <sam@gentoo.org>]

commit:     fbb77bdce07e7e84d3d958f00065fc98093794d2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 01:06:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 01:06:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb77bdc

media-libs/x265: fix build for arm with main10

Closes: https://bugs.gentoo.org/816795
Thanks-to: Tee KOBAYASHI <xtkoba <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/x265/files/arm-r1.patch | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/media-libs/x265/files/arm-r1.patch b/media-libs/x265/files/arm-r1.patch
index 8a8102dd258..69aa3036eff 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()
+