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

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

​

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

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

---- baselibs.conf.orig

-+++ baselibs.conf

-@@ -1 +1 @@

--libx265-199

-+libx265-209

---- x265.changes.orig

-+++ x265.changes

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

---- x265.spec.orig

-+++ x265.spec

-@@ -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 @@ cd ../../

- %cmake_install

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

- 

-+%check

-+

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

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

- 

​

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

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

-  <patches>

-    <delete name="arm.patch"/>

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

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

-  </patches>

-</link>

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

​