@@ -1,202 +0,0 @@

---- arm.patch.orig

-+++ arm.patch

-@@ -1,8 +1,8 @@

--Index: x265_2.2/source/CMakeLists.txt

-+Index: x265_3.4/source/CMakeLists.txt

- ===================================================================

----- x265_2.2.orig/source/CMakeLists.txt

--+++ x265_2.2/source/CMakeLists.txt

--@@ -65,15 +65,22 @@ elseif(POWERMATCH GREATER "-1")

-+--- x265_3.4.orig/source/CMakeLists.txt

-++++ x265_3.4/source/CMakeLists.txt

-+@@ -64,26 +64,26 @@ elseif(POWERMATCH GREATER "-1")

-          add_definitions(-DPPC64=1)

-          message(STATUS "Detected POWER PPC64 target processor")

-      endif()

-@@ -12,41 +12,62 @@ Index: x265_2.2/source/CMakeLists.txt

- -    else()

- -        set(CROSS_COMPILE_ARM 0)

- -    endif()

---    message(STATUS "Detected ARM target processor")

- -    set(ARM 1)

---    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)

-+-    if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)

-+-        message(STATUS "Detected ARM64 target processor")

-+-        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)

-+-    endif()

- +elseif(${SYSPROC} MATCHES "armv5.*")

- +    message(STATUS "Detected ARMV5 system processor")

- +    set(ARMV5 1)

--+    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=0 -DHAVE_NEON=0)

-++    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")

- +    set(ARMV6 1)

--+    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

-++    add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

- +elseif(${SYSPROC} STREQUAL "armv7l")

- +    message(STATUS "Detected ARMV7 system processor")

- +    set(ARMV7 1)

--+    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

-++    add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

- +elseif(${SYSPROC} STREQUAL "aarch64")

- +    message(STATUS "Detected AArch64 system processor")

- +    set(ARMV7 1)

--+    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

-++    add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=1 -DHAVE_ARMV6=0 -DHAVE_NEON=0)

-  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}")

--@@ -208,18 +215,9 @@ if(GCC)

-+ endif()

-+-

-+ if(UNIX)

-+     list(APPEND PLATFORM_LIBS pthread)

-+     find_library(LIBRT rt)

-+@@ -238,28 +238,9 @@ if(GCC)

-              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()

- +    if(ARMV7)

- +        add_definitions(-fPIC)

-@@ -55,11 +76,11 @@ Index: x265_2.2/source/CMakeLists.txt

-      if(FPROFILE_GENERATE)

-          if(INTEL_CXX)

-              add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")

--Index: x265_2.2/source/common/cpu.cpp

-+Index: x265_3.4/source/common/cpu.cpp

- ===================================================================

----- x265_2.2.orig/source/common/cpu.cpp

--+++ x265_2.2/source/common/cpu.cpp

--@@ -37,7 +37,7 @@

-+--- x265_3.4.orig/source/common/cpu.cpp

-++++ x265_3.4/source/common/cpu.cpp

-+@@ -39,7 +39,7 @@

-  #include <machine/cpu.h>

-  #endif

-  

-@@ -68,7 +89,7 @@ Index: x265_2.2/source/common/cpu.cpp

-  #include <signal.h>

-  #include <setjmp.h>

-  static sigjmp_buf jmpbuf;

--@@ -344,7 +344,6 @@ uint32_t cpu_detect(void)

-+@@ -350,7 +350,6 @@ uint32_t cpu_detect(bool benableavx512)

-      }

-  

-      canjump = 1;

-@@ -76,7 +97,7 @@ Index: x265_2.2/source/common/cpu.cpp

-      canjump = 0;

-      signal(SIGILL, oldsig);

-  #endif // if !HAVE_NEON

--@@ -360,7 +359,7 @@ uint32_t cpu_detect(void)

-+@@ -366,7 +365,7 @@ uint32_t cpu_detect(bool benableavx512)

-      // which may result in incorrect detection and the counters stuck enabled.

-      // right now Apple does not seem to support performance counters for this test

-  #ifndef __MACH__

-@@ -84,4 +105,4 @@ Index: x265_2.2/source/common/cpu.cpp

- +    //flags |= PFX(cpu_fast_neon_mrc_test)() ? X265_CPU_FAST_NEON_MRC : 0;

-  #endif

-      // TODO: write dual issue test? currently it's A8 (dual issue) vs. A9 (fast mrc)

-- #endif // if HAVE_ARMV6

-+ #elif X265_ARCH_ARM64

---- baselibs.conf.orig

-+++ baselibs.conf

-@@ -1 +1 @@

--libx265-179

-+libx265-192

---- x265.changes.orig

-+++ x265.changes

-@@ -1,4 +1,40 @@

- -------------------------------------------------------------------

-+Mon Jun  1 17:51:22 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

-+

-+- Update to version 3.4

-+  New features:

-+  * Edge-aware quadtree partitioning to terminate CU depth

-+    recursion based on edge information. --rskip level 2 enables

-+    the feature and --rskip-edge-threshold denotes the minimum

-+    expected edge-density percentage within the CU, below which

-+    the recursion is skipped. Experimental feature.

-+  * Application-level feature --abr-ladder for automating

-+    efficient ABR ladder generation. Shows ~65% savings in the

-+    over-all turn-around time required for the generation of a

-+    typical Apple HLS ladder in Intel(R) Xeon(R) Platinum 8280

-+    CPU @ 2.70GHz over a sequential ABR-ladder generation

-+    approach that leverages save-load architecture.

-+  Enhancements to existing features:

-+  * Improved efficiency in 2-pass rate-control algorithm. The

-+    savings in the bitrate is ~1.72% with visual improvement in

-+    quality in the initial 1-2 secs.

-+  Encoder enhancements:

-+  * Faster ARM64 encodes enabled by ASM contributions from

-+    Huawei. The speed-up over no-asm version for 1080p encodes @

-+    medium preset is ~15% in a 16 core H/W.

-+  * Strict VBV conformance in zone encoding.

-+  Bug fixes:

-+  * Multi-pass encode failures with --frame-dup.

-+  * Corrupted bitstreams with --hist-scenecut when input depth

-+    and internal bit-depth differ.

-+  * Incorrect analysis propagation in multi-level save-load

-+    architecture.

-+  * Failure in detecting NUMA packages installed in non-standard

-+    directories.

-+

-+- Refreshed arm.patch

-+

-+-------------------------------------------------------------------

- Sat Mar 28 14:28:56 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

- 

- - Update to version 3.3

---- x265.spec.orig

-+++ x265.spec

-@@ -17,11 +17,11 @@

- #

- 

- 

--%define sover  188

-+%define sover  192

- %define libname lib%{name}

- %define libsoname %{libname}-%{sover}

- Name:           x265

--Version:        3.3

-+Version:        3.4

- Release:        0

- Summary:        A free h265/HEVC encoder - encoder binary

- License:        GPL-2.0-or-later

-@@ -67,7 +67,6 @@ streams.

- %patch0 -p1

- %patch1 -p1

- %patch2 -p1

--

​

@@ -1,6 +1,1 @@

-<link project="Essentials" cicount="add" baserev="ecf93b56f7e5ab9ed6e5becd21b75723">

-  <patches>

-    <delete name="x265_3.3.tar.gz" />

-    <apply name="project.diff" />

-  </patches>

-</link>

+<link project="Essentials" cicount="add" />

​