From 8211520426fd7a19f72ef334a2c627d82d7c5826 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 21 Jun 2024 23:39:23 +0000
Subject: [PATCH] extra/x265: fix

---
 extra/x265/0001-arm-fixes.patch | 60 ---------------------------------
 extra/x265/PKGBUILD             | 11 ++----
 2 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 extra/x265/0001-arm-fixes.patch

diff --git a/extra/x265/0001-arm-fixes.patch b/extra/x265/0001-arm-fixes.patch
deleted file mode 100644
index fefbe6b7f..000000000
--- a/extra/x265/0001-arm-fixes.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a261a1e54c548e6806bf6a21e06da835af9934bb Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Mon, 7 Feb 2022 04:13:22 +0000
-Subject: [PATCH] arm fixes
-
----
- source/CMakeLists.txt | 29 ++++++-----------------------
- 1 file changed, 6 insertions(+), 23 deletions(-)
-
-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index a407271b4..bfcd11f05 100755
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -76,8 +76,8 @@ elseif(ARMMATCH GREATER "-1")
-         set(ARM64 1)
-         add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=1 -DHAVE_ARMV6=0)
-     else()
--        message(STATUS "Detected ARM target processor")
--        add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=1)
-+        message(STATUS "Detected ARMV7 system processor")
-+        add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=0 -DHAVE_NEON=1 -fPIC)
-     endif()
- else()
-     message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
-@@ -238,28 +238,11 @@ if(GCC)
-             endif()
-         endif()
-     endif()
--    if(ARM AND CROSS_COMPILE_ARM)
--        if(ARM64)
--            set(ARM_ARGS -fPIC)
--        else()
--            set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
--        endif()
--        message(STATUS "cross compile arm")
--    elseif(ARM)
--        if(ARM64)
--            set(ARM_ARGS -fPIC)
--            add_definitions(-DHAVE_NEON)
--        else()
--            find_package(Neon)
--            if(CPU_HAS_NEON)
--                set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
--                add_definitions(-DHAVE_NEON)
--            else()
--                set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
--            endif()
--        endif()
-+    if(ARM64)
-+        set(ARM_ARGS -fPIC)
-+        add_definitions(-DHAVE_NEON)
-+        add_definitions(${ARM_ARGS})
-     endif()
--    add_definitions(${ARM_ARGS})
-     if(FPROFILE_GENERATE)
-         if(INTEL_CXX)
-             add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")
--- 
-2.33.0
-
diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD
index d376bec23..7e4a5380c 100644
--- a/extra/x265/PKGBUILD
+++ b/extra/x265/PKGBUILD
@@ -22,10 +22,8 @@ makedepends=(
 )
 provides=(libx265.so)
 _tag=aa7f602f7592eddb9d87749be7466da005b556ee
-source=(git+https://bitbucket.org/multicoreware/x265_git#tag=${_tag}
-        0001-arm-fixes.patch)
-sha256sums=('31887d9871b7916dabe8bc4c71a5daf23ae109cdc677efaa258d2d19086cb67b'
-            '9a527deb44ed5be459519d1e6721020bcbcbe74e73896b59e6df3a62888f152c')
+source=(git+https://bitbucket.org/multicoreware/x265_git#tag=${_tag})
+sha256sums=('31887d9871b7916dabe8bc4c71a5daf23ae109cdc677efaa258d2d19086cb67b')
 
 pkgver() {
   cd x265_git
@@ -33,11 +31,6 @@ pkgver() {
   git describe --tags
 }
 
-prepare() {
-  cd x265_git
-  git apply ../0001-arm-fixes.patch
-}
-
 build() {
   cmake -S x265_git/source -B build -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \