From 3fe01e04c18818248bf04dd2995d9e7c85a2d151 Mon Sep 17 00:00:00 2001
From: Automatic Build System <autodist@openmamba.org>
Date: Tue, 7 May 2024 11:19:27 +0200
Subject: [PATCH] automatic version update by autodist [release 3.6-1mamba;Mon
 Apr 15 2024]

---
 x265-3.5-arm.patch | 76 ----------------------------------------------
 x265.spec          |  9 +++---
 2 files changed, 5 insertions(+), 80 deletions(-)
 delete mode 100644 x265-3.5-arm.patch

diff --git a/x265-3.5-arm.patch b/x265-3.5-arm.patch
deleted file mode 100644
index a02dc95..0000000
--- a/x265-3.5-arm.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -r 2a65b7209850 source/CMakeLists.txt
---- a/source/CMakeLists.txt	Fri May 29 23:09:35 2020 +0530
-+++ b/source/CMakeLists.txt	Tue Jun 09 12:49:19 2020 -0600
-@@ -40,7 +40,7 @@
- # System architecture detection
- string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
- set(X86_ALIASES x86 i386 i686 x86_64 amd64)
--set(ARM_ALIASES armv6l armv7l aarch64)
-+set(ARM_ALIASES armv5tel armv6l armv7l aarch64)
- list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
- list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
- set(POWER_ALIASES ppc64 ppc64le)
-@@ -76,8 +76,16 @@
-         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)
-+        if(${SYSPROC} MATCHES "armv5.*")
-+            message(STATUS "Detected ARMV5 system processor")
-+            add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=0 -DHAVE_NEON=0)
-+        elseif(${SYSPROC} STREQUAL "armv6l")
-+            message(STATUS "Detected ARMV6 system processor")
-+            add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=0 -DHAVE_NEON=0)
-+        elseif(${SYSPROC} STREQUAL "armv7l")
-+            message(STATUS "Detected ARMV7 system processor")
-+            add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=0 -DHAVE_NEON=0 -fPIC)
-+        endif()
-     endif()
- else()
-     message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
-@@ -238,28 +246,11 @@
-             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}")
-diff -r 2a65b7209850 source/common/cpu.cpp
---- a/source/common/cpu.cpp	Fri May 29 23:09:35 2020 +0530
-+++ b/source/common/cpu.cpp	Tue Jun 09 12:49:19 2020 -0600
-@@ -39,7 +39,7 @@
- #include <machine/cpu.h>
- #endif
- 
--#if X265_ARCH_ARM && !defined(HAVE_NEON)
-+#if X265_ARCH_ARM && (!defined(HAVE_NEON) || HAVE_NEON==0)
- #include <signal.h>
- #include <setjmp.h>
- static sigjmp_buf jmpbuf;
diff --git a/x265.spec b/x265.spec
index 7467016..5b1d9da 100644
--- a/x265.spec
+++ b/x265.spec
@@ -1,14 +1,13 @@
 Name:          x265
-Version:       3.5
+Version:       3.6
 Release:       1mamba
 Summary:       x265 HEVC Encoder
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           https://bitbucket.org/multicoreware/x265_git
+URL:           https://bitbucket.org/multicoreware/x265_git/wiki/Home
 Source:        https://bitbucket.org/multicoreware/x265_git/downloads/x265_%{version}.tar.gz
-Patch0:        x265-3.5-arm.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -42,7 +41,6 @@ This package contains libraries and header files for developing applications tha
 
 %prep
 %setup -q -n %{name}_%{version}
-%patch0 -p1
 
 %build
 %cmake -d build_x265 \
@@ -78,5 +76,8 @@ This package contains libraries and header files for developing applications tha
 %{_libdir}/pkgconfig/x265.pc
 
 %changelog
+* Mon Apr 15 2024 Automatic Build System <autodist@openmamba.org> 3.6-1mamba
+- automatic version update by autodist
+
 * Sun Nov 07 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 3.5-1mamba
 - package created using the webbuild interface