@@ -1,4 +1,53 @@

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

+Thu Jun 13 05:58:19 UTC 2024 - Luigi Baldoni <aloisio@gmx.com>

+

+- Update to version 3.6

+  New features:

+  * Segment based Ratecontrol (SBRC) feature

+  * Motion-Compensated Spatio-Temporal Filtering

+  * Scene-cut aware qp - BBAQ (Bidirectional Boundary Aware

+    Quantization)

+  * Histogram-Based Scene Change Detection

+  * Film-Grain characteristics as a SEI message to support Film

+    Grain Synthesis(FGS)

+  * Add temporal layer implementation(Hierarchical B-frame

+    implementation)

+  Enhancements to existing features:

+  * Added Dolby Vision 8.4 Profile Support

+  API changes:

+  * Add Segment based Ratecontrol(SBRC) feature: "--no-sbrc".

+  * Add command line parameter for mcstf feature: "--no-mctf".

+  * Add command line parameters for the scene cut aware qp

+    feature: "--scenecut-aware-qp" and "--masking-strength".

+  * Add command line parameters for Histogram-Based Scene Change

+    Detection: "--hist-scenecut".

+  * Add film grain characteristics as a SEI message to the

+    bitstream: "--film-grain <filename>"

+  * cli: add new option --cra-nal (Force nal type to CRA to all

+    frames expect for the first frame, works only with keyint 1)

+  Optimizations:

+  * ARM64 NEON optimizations:- Several time-consuming C

+    functions have been optimized for the targeted platform -

+    aarch64. The overall performance increased by around 20%.

+  * SVE/SVE2 optimizations

+  Bug fixes:

+  * Linux bug to utilize all the cores

+  * Crash with hist-scenecut build when source resolution is not

+    multiple of minCuSize

+  * 32bit and 64bit builds generation for ARM

+  * bugs in zonefile feature (Reflect Zonefile Parameters inside

+    Lookahead, extra IDR issue, Avg I Slice QP value issue etc..)

+  * Add x86 ASM implementation for subsampling luma

+  * Fix for abrladder segfault with load reuse level 1

+  * Reorder miniGOP based on temporal layer hierarchy and add

+    support for more B frame

+  * Add MacOS aarch64 build support

+  * Fix boundary condition issue for Gaussian filter

+- Drop arm.patch and replace it with 0001-Fix-arm-flags.patch

+  and 0004-Do-not-build-with-assembly-support-on-arm.patch

+  (courtesy of Debian)

+

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

 Wed May 19 13:21:09 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

 - Build libx265_main10 and libx265_main12 unconditionally and

​

@@ -1,7 +1,7 @@

 #

 # spec file for package x265

 #

-# Copyright (c) 2021 Packman Team <packman@links2linux.de>

+# Copyright (c) 2024 Packman Team <packman@links2linux.de>

 # Copyright (c) 2014 Torsten Gruner <t.gruner@katodev.de>

 #

 # All modifications and additions to the file contributed by third parties

@@ -17,21 +17,22 @@

 #

-%define sover   199

+%define sover   209

 %define libname lib%{name}

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

-%define uver    3_5

+%define uver    3_6

 Name:           x265

-Version:        3.5

+Version:        3.6

 Release:        0

 Summary:        A free h265/HEVC encoder - encoder binary

 License:        GPL-2.0-or-later

 Group:          Productivity/Multimedia/Video/Editors and Convertors

 URL:            https://bitbucket.org/multicoreware/x265_git

 Source0:        https://bitbucket.org/multicoreware/x265_git/downloads/%{name}_%{version}.tar.gz

-Patch0:         arm.patch

 Patch1:         x265.pkgconfig.patch

 Patch2:         x265-fix_enable512.patch

+Patch3:         0001-Fix-arm-flags.patch

+Patch4:         0004-Do-not-build-with-assembly-support-on-arm.patch

 BuildRequires:  cmake >= 2.8.8

 BuildRequires:  gcc-c++

 BuildRequires:  nasm >= 2.13

@@ -130,6 +131,8 @@

 %cmake_install

 find %{buildroot} -type f -name "*.a" -delete -print0

+%check

+

 %post -n %{libsoname} -p /sbin/ldconfig

 %postun -n %{libsoname} -p /sbin/ldconfig

​

@@ -0,0 +1,39 @@

+From: Sebastian Ramacher <sramacher@debian.org>

+Date: Sun, 21 Jun 2020 17:54:56 +0200

+Subject: Fix arm* flags

+

+---

+ source/CMakeLists.txt | 7 ++-----

+ 1 file changed, 2 insertions(+), 5 deletions(-)

+

+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt

+index ab5ddfe..eb9b19b 100755

+--- a/source/CMakeLists.txt

++++ b/source/CMakeLists.txt

+@@ -253,10 +253,7 @@ if(GCC)

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

+   if(ARM64 OR CROSS_COMPILE_ARM64)

+@@ -265,13 +262,13 @@ if(GCC)

+         find_package(SVE2)

+         if(CPU_HAS_SVE2 OR CROSS_COMPILE_SVE2)

+             message(STATUS "Found SVE2")

+-          set(ARM_ARGS -O3 -march=armv8-a+sve2 -fPIC -flax-vector-conversions)

++          set(ARM_ARGS -fPIC -flax-vector-conversions)

+             add_definitions(-DHAVE_SVE2)

+             add_definitions(-DHAVE_SVE)

+             add_definitions(-DHAVE_NEON) # for NEON c/c++ primitives, as currently there is no implementation that use SVE2

+         elseif(CPU_HAS_SVE OR CROSS_COMPILE_SVE)

+             message(STATUS "Found SVE")

+-          set(ARM_ARGS -O3 -march=armv8-a+sve -fPIC -flax-vector-conversions)

++          set(ARM_ARGS -fPIC -flax-vector-conversions)

+             add_definitions(-DHAVE_SVE)

+             add_definitions(-DHAVE_NEON) # for NEON c/c++ primitives, as currently there is no implementation that use SVE

+         elseif(CPU_HAS_NEON)

​

@@ -0,0 +1,28 @@

+From: Sebastian Ramacher <sramacher@debian.org>

+Date: Fri, 31 May 2024 23:38:23 +0200

+Subject: Do not build with assembly support on arm*

+

+---

+ source/CMakeLists.txt | 9 ---------

+ 1 file changed, 9 deletions(-)

+

+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt

+index 672cc2d..f112330 100755

+--- a/source/CMakeLists.txt

++++ b/source/CMakeLists.txt

+@@ -73,15 +73,6 @@ elseif(POWERMATCH GREATER "-1")

+         add_definitions(-DPPC64=1)

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

+     endif()

+-elseif(ARMMATCH 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")

+-    set(ARM 1)

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

+ elseif(ARM64MATCH GREATER "-1")

+     #if(CROSS_COMPILE_ARM64)

+         #message(STATUS "Cross compiling for ARM64 arch")

​

@@ -1,108 +0,0 @@

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

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

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

--elseif(ARMMATCH GREATER "-1")

--    if(CROSS_COMPILE_ARM)

--        message(STATUS "Cross compiling for ARM arch")

--    else()

--        set(CROSS_COMPILE_ARM 0)

--    endif()

--    set(ARM 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 -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 -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 -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 -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}")

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

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

-+        add_definitions(-fPIC)

-     endif()

--    add_definitions(${ARM_ARGS})

-     if(FPROFILE_GENERATE)

-         if(INTEL_CXX)

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

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

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

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

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

-@@ -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;

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

-     }

- 

-     canjump = 1;

--    PFX(cpu_neon_test)();

-     canjump = 0;

-     signal(SIGILL, oldsig);

- #endif // if !HAVE_NEON

-@@ -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__

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

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

- #elif X265_ARCH_ARM64

​

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

-libx265-199

+libx265-209

​