commit 91a70d1572d34ab0fb22b9082fd24b49499e3dcc Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sun May 31 08:25:37 2020 +0100 Update to 3.4 ...-detect512-is-needed-on-all-architectures.patch | 35 --- sources | 2 +- x265-2.8-asm-primitives.patch | 347 --------------------- x265-arm-cflags.patch | 45 +-- x265-detect_cpu_armhfp.patch | 44 --- x265.spec | 10 +- 6 files changed, 31 insertions(+), 452 deletions(-) --- diff --git a/sources b/sources index a1063e5..e336356 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x265_3.3.tar.gz) = 3d56900ecd58e83d2ecc93d956524e3b0e622dbe3c74a137c7b21f98599245547403401e9ec7f679996fd09fca788aa10272bf17e58a68fce449c8cb555ad7c0 +SHA512 (x265_3.4.tar.gz) = 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e diff --git a/x265-arm-cflags.patch b/x265-arm-cflags.patch index 30d213a..8cd5c86 100644 --- a/x265-arm-cflags.patch +++ b/x265-arm-cflags.patch @@ -1,26 +1,35 @@ -diff -up x265_2.7/source/CMakeLists.txt.cflags x265_2.7/source/CMakeLists.txt ---- x265_2.7/source/CMakeLists.txt.cflags 2018-02-27 20:19:33.328932385 +0100 -+++ x265_2.7/source/CMakeLists.txt 2018-02-27 20:29:14.808956583 +0100 -@@ -233,18 +233,6 @@ if(GCC) +--- 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) -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) +- 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) -- find_package(Neon) -- if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) +- if(ARM64) +- set(ARM_ARGS -fPIC) - add_definitions(-DHAVE_NEON) - else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) +- 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}") -@@ -517,7 +505,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE +@@ -546,7 +524,7 @@ add_custom_command( OUTPUT ${ASM}.${SUFFIX} COMMAND ${CMAKE_CXX_COMPILER} @@ -29,10 +38,10 @@ diff -up x265_2.7/source/CMakeLists.txt.cflags x265_2.7/source/CMakeLists.txt DEPENDS ${ASM_SRC}) endforeach() elseif(X86) -diff -up x265_2.7/source/dynamicHDR10/CMakeLists.txt.cflags x265_2.7/source/dynamicHDR10/CMakeLists.txt ---- x265_2.7/source/dynamicHDR10/CMakeLists.txt.cflags 2018-02-21 09:55:56.000000000 +0100 -+++ x265_2.7/source/dynamicHDR10/CMakeLists.txt 2018-02-27 20:29:45.377062994 +0100 -@@ -42,18 +42,6 @@ if(GCC) + +--- x265_3.4/source/dynamicHDR10/CMakeLists.txt.cflags ++++ x265_3.4/source/dynamicHDR10/CMakeLists.txt +@@ -42,18 +42,6 @@ endif() endif() endif() @@ -51,10 +60,4 @@ diff -up x265_2.7/source/dynamicHDR10/CMakeLists.txt.cflags x265_2.7/source/dyna if(FPROFILE_GENERATE) if(INTEL_CXX) add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}") -@@ -150,4 +138,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "In - option(ENABLE_SHARED "Build shared library" OFF) - - install(FILES hdr10plus.h DESTINATION include) --endif() -\ Pas de fin de ligne à la fin du fichier -+endif() + diff --git a/x265-detect_cpu_armhfp.patch b/x265-detect_cpu_armhfp.patch index c9a92b8..797ad04 100644 --- a/x265-detect_cpu_armhfp.patch +++ b/x265-detect_cpu_armhfp.patch @@ -1,47 +1,3 @@ -diff -up x265_2.2/source/CMakeLists.txt.orig x265_2.2/source/CMakeLists.txt ---- x265_2.2/source/CMakeLists.txt.orig 2016-12-23 06:57:39.000000000 +0100 -+++ x265_2.2/source/CMakeLists.txt 2017-01-03 11:18:34.773738470 +0100 -@@ -41,9 +41,11 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ - # System architecture detection - string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) - set(X86_ALIASES x86 i386 i686 x86_64 amd64) --set(ARM_ALIASES armv6l armv7l) -+set(ARMv6_ALIASES armv6l) -+set(ARMv7_ALIASES armv7l) - list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) --list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) -+list(FIND ARMv6_ALIASES "${SYSPROC}" ARMv6MATCH) -+list(FIND ARMv7_ALIASES "${SYSPROC}" ARMv7MATCH) - set(POWER_ALIASES ppc64 ppc64le) - list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH) - if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1") -@@ -65,15 +67,24 @@ elseif(POWERMATCH GREATER "-1") - add_definitions(-DPPC64=1) - message(STATUS "Detected POWER PPC64 target processor") - endif() --elseif(ARMMATCH GREATER "-1") -+elseif(ARMv6MATCH GREATER "-1") - if(CROSS_COMPILE_ARM) - message(STATUS "Cross compiling for ARM arch") - else() - set(CROSS_COMPILE_ARM 0) - endif() -- message(STATUS "Detected ARM target processor") -+ message(STATUS "Detected ARMv6 target processor") - set(ARM 1) - add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1) -+elseif(ARMv7MATCH GREATER "-1") -+ if(CROSS_COMPILE_ARM) -+ message(STATUS "Cross compiling for ARM arch") -+ else() -+ set(CROSS_COMPILE_ARM 0) -+ endif() -+ message(STATUS "Detected ARMv7 target processor") -+ set(ARM 1) -+ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1) - else() - message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown") - message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}") --- 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: diff --git a/x265.spec b/x265.spec index 76ccd41..76c2086 100644 --- a/x265.spec +++ b/x265.spec @@ -1,9 +1,9 @@ -%global _so_version 188 +%global _so_version 192 Summary: H.265/HEVC encoder Name: x265 -Version: 3.3 -Release: 2%{?dist} +Version: 3.4 +Release: 1%{?dist} URL: http://x265.org/ # source/Lib/TLibCommon - BSD # source/Lib/TLibEncoder - BSD @@ -17,7 +17,6 @@ Patch1: x265-high-bit-depth-soname.patch Patch2: x265-detect_cpu_armhfp.patch Patch3: x265-arm-cflags.patch Patch4: x265-pkgconfig_path_fix.patch -Patch5: x265-2.8-asm-primitives.patch BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -139,6 +138,9 @@ done %{_libdir}/pkgconfig/x265.pc %changelog +* Sun May 31 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3.4-1 +- Update to 3.4 + * Wed Mar 11 2020 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.3-2 - Rebuilt for i686