.gitignore

@@ -1 +1 @@
-SOURCES/x265_3.6.tar.gz
+x265*.tar.gz

.x265.metadata

@@ -1 +0,0 @@
-51fc4592a9f1e340d87a51233361cc5a3ffd739d  SOURCES/x265_3.6.tar.gz

sources

@@ -0,0 +1 @@
+SHA512 (x265_3.5.tar.gz) = 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997

x265-arm-cflags.patch

@@ -0,0 +1,63 @@
+--- x265_3.4/source/CMakeLists.txt.cflags
++++ x265_3.4/source/CMakeLists.txt
+@@ -238,28 +238,6 @@
+             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()
+-    endif()
+-    add_definitions(${ARM_ARGS})
+     if(FPROFILE_GENERATE)
+         if(INTEL_CXX)
+             add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")
+@@ -546,7 +524,7 @@
+             add_custom_command(
+                 OUTPUT ${ASM}.${SUFFIX}
+                 COMMAND ${CMAKE_CXX_COMPILER}
+-                ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
++                ARGS ${CFLAGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
+                 DEPENDS ${ASM_SRC})
+         endforeach()
+     elseif(X86)
+
+--- x265_3.4/source/dynamicHDR10/CMakeLists.txt.cflags
++++ x265_3.4/source/dynamicHDR10/CMakeLists.txt
+@@ -42,18 +42,6 @@
+             endif()
+         endif()
+     endif()
+-    if(ARM AND CROSS_COMPILE_ARM)
+-        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+-    elseif(ARM)
+-        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()
+-    add_definitions(${ARM_ARGS})
+     if(FPROFILE_GENERATE)
+         if(INTEL_CXX)
+             add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")
+

x265-detect_cpu_armhfp.patch

@@ -0,0 +1,15 @@
+--- x265_v2.6/source/test/testharness.h.orig	2017-12-30 22:27:49.827620181 +0000
++++ x265_v2.6/source/test/testharness.h	2017-12-30 22:30:53.239500941 +0000
+@@ -70,9 +70,10 @@ protected:
+ #include <intrin.h>
+ #elif (!defined(__APPLE__) && (defined (__GNUC__) && (defined(__x86_64__) || defined(__i386__))))
+ #include <x86intrin.h>
+-#elif ( !defined(__APPLE__) && defined (__GNUC__) && defined(__ARM_NEON__))
+-#include <arm_neon.h>
+ #elif defined(__GNUC__) && (!defined(__clang__) || __clang_major__ < 4)
++#if ( !defined(__APPLE__) && defined(__ARM_NEON__))
++#include <arm_neon.h>
++#endif
+ /* fallback for older GCC/MinGW */
+ static inline uint32_t __rdtsc(void)
+ {

x265.spec

@@ -1,12 +1,12 @@
 # Use old cmake macro
 %global __cmake_in_source_build 1
 
-%global     _so_version 209
+%global     _so_version 199
 
 Summary:    H.265/HEVC encoder
 Name:       x265
-Version:    3.6
-Release:    1%{?dist}
+Version:    3.5
+Release:    5%{?dist}
 URL:        http://x265.org/
 # source/Lib/TLibCommon - BSD
 # source/Lib/TLibEncoder - BSD
@@ -17,11 +17,13 @@ Source0:    https://bitbucket.org/multicoreware/%{name}_git/downloads/%{name}_%{
 # fix building as PIC
 Patch0:     x265-pic.patch
 Patch1:     x265-high-bit-depth-soname.patch
-Patch2:     x265-pkgconfig_path_fix.patch
+Patch2:     x265-detect_cpu_armhfp.patch
+Patch3:     x265-arm-cflags.patch
+Patch4:     x265-pkgconfig_path_fix.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  git
-BuildRequires:  cmake
+BuildRequires:  cmake3
 %{?el7:BuildRequires: epel-rpm-macros}
 BuildRequires:  nasm
 BuildRequires:  ninja-build
@@ -70,7 +72,7 @@ This package contains the shared library development files.
 #     10bit: libx265_main10.so
 
 build() {
-%cmake -Wno-dev -G "Ninja" \
+%cmake3 -Wno-dev -G "Ninja" \
     -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
     -DCMAKE_SKIP_RPATH:BOOL=YES \
     -DENABLE_PIC:BOOL=ON \
@@ -80,7 +82,7 @@ build() {
     -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy \
     $* \
     ../source
-%cmake_build
+%cmake3_build
 }
 
 # High depth 10/12 bit libraries are supported only on 64 bit. They require
@@ -111,7 +113,7 @@ popd
 for i in 8 10 12; do
     if [ -d ${i}bit ]; then
         pushd ${i}bit
-            %cmake_install
+            %cmake3_install
             # Remove unversioned library, should not be linked to
             rm -f %{buildroot}%{_libdir}/libx265_main${i}.so
         popd
@@ -152,18 +154,6 @@ done
 %{_libdir}/pkgconfig/x265.pc
 
 %changelog
-* Mon Dec 23 2024 Dmitriy Samoylik <samoylikdv@msvsphere-os.ru> - 3.6-1
-- Rebuilt for MSVSphere 10
-
-* Sat Apr 06 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6-1
-- Update to 3.6
-
-* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 3.5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 3.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
 * Thu Dec 29 2022 Nicolas Chauvet <kwizart@gmail.com> - 3.5-5
 - Enable ENABLE_HDR10_PLUS everywhere rfbz#6454