@@ -1,4 +1,10 @@

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

+Mon Mar  3 03:03:03 UTC 2025 - olaf@aepfle.de

+

+- Update to version 4.1

+  see included releasenotes.rst for details

+

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

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

 - Update to version 3.6

​

@@ -0,0 +1,168 @@

+#

+# spec file for package x265

+#

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

+# remain the property of their copyright owners, unless otherwise agreed

+# upon. The license for this file, and modifications and additions to the

+# file, is the same license as for the pristine package itself (unless the

+# license for the pristine package is not an Open Source License, in which

+# case the license is the MIT License). An "Open Source License" is a

+# license that conforms to the Open Source Definition (Version 1.9)

+# published by the Open Source Initiative.

+

+# Please submit bugfixes or comments via https://bugs.links2linux.org/

+#

+

+

+%define sover   215

+%define libname lib%name

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

+%define uver    4_1

+Name:           x265

+Version:        4.1

+Release:        0

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

+License:        GPL-2.0-or-later

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

+Source0:        %name-%version.tar

+Patch0:         %name.patch

+Patch1:         x265.pkgconfig.patch

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

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

+BuildRequires:  cmake

+%if 0%{?suse_version} > 1500

+BuildRequires:  gcc-c++

+%else

+BuildRequires:  gcc13

+BuildRequires:  gcc13-c++

+%endif

+BuildRequires:  nasm >= 2.13

+BuildRequires:  pkgconfig

+%ifarch x86_64

+BuildRequires:  libnuma-devel >= 2.0.9

+%endif

+

+%description

+x265 is a free library for encoding next-generation H265/HEVC video

+streams.

+

+%package -n %{libsoname}

+Summary:        A free H265/HEVC encoder - encoder binary

+

+%description -n %{libsoname}

+x265 is a free library for encoding next-generation H265/HEVC video

+streams.

+

+%package -n libhdr10plus-%{uver}

+Summary:        A free HDR10+ library

+

+%description -n libhdr10plus-%{uver}

+A free library supporting HDR10+.

+

+%package -n %{libname}-devel

+Summary:        Libraries and include file for the %{libname} encoder

+Requires:       %{libsoname} = %version-%release

+Requires:       libhdr10plus-%{uver} = %version-%release

+Provides:       %name-devel = %version

+Obsoletes:      %name-devel < %version

+

+%description -n %{libname}-devel

+x265 is a free library for encoding next-generation H265/HEVC video

+streams.

+

+%prep

+%autosetup -p1

+

+%build

+test -x "$(type -p gcc)"    && CC="$_"

+test -x "$(type -p g++)"    && CXX="$_"

+test -x "$(type -p gcc-13)" && CC="$_"

+test -x "$(type -p g++-13)" && CXX="$_"

+export CC="$(readlink -f ${CC})"

+export CXX="$(readlink -f ${CXX})"

+CFLAGS='%optflags -Wno-misleading-indentation -Wno-unused-parameter -Wno-unused-variable'

+CXXFLAGS='%optflags -Wno-misleading-indentation -Wno-unused-parameter -Wno-unused-variable'

+# set the version by hand

+sed -i~ "/^include(Version)/d" source/CMakeLists.txt

+diff -u "$_"~ "$_" && exit 1

+# force version number in the soname

+sed -i~ 's/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus-%version/' \

+       source/CMakeLists.txt

+diff -u "$_"~ "$_" && exit 1

+

+SOURCE_DIR="$PWD"/source

+COMMON_FLAGS="-DENABLE_TESTS=OFF -DENABLE_PIC=ON -Wno-dev"

+HIGH_BIT_DEPTH_FLAGS="-DENABLE_CLI=OFF -DENABLE_SHARED=OFF -DEXPORT_C_API=OFF -DHIGH_BIT_DEPTH=ON"

+

+%define __sourcedir ./source

+

+# Build 10bit depth version of the library

+%define __builddir ./source/build-10bit

+%cmake $COMMON_FLAGS $HIGH_BIT_DEPTH_FLAGS \

+%ifarch i586

+      -DENABLE_ASSEMBLY=OFF

+%endif

+

+%make_build

+cd ../..

+

+# Build 12bit depth version of the library

+%define __builddir ./source/build-12bit

+%cmake $COMMON_FLAGS $HIGH_BIT_DEPTH_FLAGS -DMAIN12=ON \

+%ifarch i586

+      -DENABLE_ASSEMBLY=OFF

+%endif

+

+%make_build

+cd ../..

+

+mv source/build-10bit/libx265.a source/build-10bit/libx265_main10.a

+mv source/build-12bit/libx265.a source/build-12bit/libx265_main12.a

+

+# Build general version of the library linking in the 10/12bit depth versions

+%define __builddir ./source/build

+%cmake $COMMON_FLAGS \

+       -DENABLE_SHARED=ON \

+       -DX265_LATEST_TAG="%{sover}.0" \

+       -DX265_VERSION="%version" \

+       -DENABLE_HDR10_PLUS=ON \

+       -DENABLE_CLI=ON \

+       -DLINKED_10BIT=ON \

+       -DLINKED_12BIT=ON \

+       -DEXTRA_LINK_FLAGS="-L$SOURCE_DIR/build-10bit -L$SOURCE_DIR/build-12bit" \

+       -DEXTRA_LIB="x265_main10.a;x265_main12.a"

+%make_build

+cd ../../

+

+%install

+%cmake_install

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

+

+%check

+

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

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

+

+%post -n libhdr10plus-%{uver} -p /sbin/ldconfig

+%postun -n libhdr10plus-%{uver} -p /sbin/ldconfig

+

+%files -n %{libsoname}

+%doc doc/reST/releasenotes.rst

+%_libdir/%{libname}.so.%{sover}*

+

+%files -n libhdr10plus-%{uver}

+%_libdir/libhdr10plus-%version.so

+

+%files

+%_bindir/*

+

+%files -n %{libname}-devel

+%license COPYING

+%_includedir/*

+%_libdir/pkgconfig/*.pc

+%_libdir/%{libname}.so

+

+%changelog

​

@@ -17,18 +17,18 @@

 #

-%define sover   209

-%define libname lib%{name}

+%define sover   215

+%define libname lib%name

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

-%define uver    3_6

+%define uver    4_1

 Name:           x265

-Version:        3.6

+Version:        4.1

 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

+Source0:        %name-%version.tar

+Patch0:         %name.patch

 Patch1:         x265.pkgconfig.patch

 Patch3:         0001-Fix-arm-flags.patch

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

@@ -36,13 +36,8 @@

 %if 0%{?suse_version} > 1500

 BuildRequires:  gcc-c++

 %else

-%if 0%{?sle_version} > 150500

 BuildRequires:  gcc13

 BuildRequires:  gcc13-c++

-%else

-BuildRequires:  gcc10

-BuildRequires:  gcc10-c++

-%endif

 %endif

 BuildRequires:  nasm >= 2.13

 BuildRequires:  pkgconfig

@@ -56,7 +51,6 @@

 %package -n %{libsoname}

 Summary:        A free H265/HEVC encoder - encoder binary

-Group:          Productivity/Multimedia/Video/Editors and Convertors

 %description -n %{libsoname}

 x265 is a free library for encoding next-generation H265/HEVC video

@@ -64,31 +58,27 @@

 %package -n libhdr10plus-%{uver}

 Summary:        A free HDR10+ library

-Group:          Productivity/Multimedia/Video/Editors and Convertors

 %description -n libhdr10plus-%{uver}

 A free library supporting HDR10+.

 %package -n %{libname}-devel

 Summary:        Libraries and include file for the %{libname} encoder

-Group:          Development/Libraries/C and C++

-Requires:       %{libsoname} = %{version}-%{release}

-Requires:       libhdr10plus-%{uver} = %{version}-%{release}

-Provides:       %{name}-devel = %{version}

-Obsoletes:      %{name}-devel < %{version}

+Requires:       %{libsoname} = %version-%release

+Requires:       libhdr10plus-%{uver} = %version-%release

+Provides:       %name-devel = %version

+Obsoletes:      %name-devel < %version

 %description -n %{libname}-devel

 x265 is a free library for encoding next-generation H265/HEVC video

 streams.

 %prep

-%autosetup -p1 -n %{name}_%{version}

+%autosetup -p1

 %build

 test -x "$(type -p gcc)"    && CC="$_"

 test -x "$(type -p g++)"    && CXX="$_"

-test -x "$(type -p gcc-10)" && CC="$_"

-test -x "$(type -p g++-10)" && CXX="$_"

 test -x "$(type -p gcc-13)" && CC="$_"

 test -x "$(type -p g++-13)" && CXX="$_"

 export CC="$(readlink -f ${CC})"

@@ -99,7 +89,7 @@

 sed -i~ "/^include(Version)/d" source/CMakeLists.txt

 diff -u "$_"~ "$_" && exit 1

 # force version number in the soname

-sed -i~ 's/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus-%{version}/' \

+sed -i~ 's/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus-%version/' \

        source/CMakeLists.txt

 diff -u "$_"~ "$_" && exit 1

@@ -116,7 +106,7 @@

       -DENABLE_ASSEMBLY=OFF

 %endif

-make %{?_smp_mflags}

+%make_build

 cd ../..

 # Build 12bit depth version of the library

@@ -126,7 +116,7 @@

       -DENABLE_ASSEMBLY=OFF

 %endif

-make %{?_smp_mflags}

+%make_build

 cd ../..

 mv source/build-10bit/libx265.a source/build-10bit/libx265_main10.a

@@ -137,19 +127,19 @@

 %cmake $COMMON_FLAGS \

        -DENABLE_SHARED=ON \

        -DX265_LATEST_TAG="%{sover}.0" \

-       -DX265_VERSION="%{version}" \

+       -DX265_VERSION="%version" \

        -DENABLE_HDR10_PLUS=ON \

        -DENABLE_CLI=ON \

        -DLINKED_10BIT=ON \

        -DLINKED_12BIT=ON \

        -DEXTRA_LINK_FLAGS="-L$SOURCE_DIR/build-10bit -L$SOURCE_DIR/build-12bit" \

        -DEXTRA_LIB="x265_main10.a;x265_main12.a"

-make %{?_smp_mflags}

+%make_build

 cd ../../

 %install

 %cmake_install

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

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

 %check

@@ -160,21 +150,19 @@

 %postun -n libhdr10plus-%{uver} -p /sbin/ldconfig

 %files -n %{libsoname}

-%{_libdir}/%{libname}.so.%{sover}*

+%doc doc/reST/releasenotes.rst

+%_libdir/%{libname}.so.%{sover}*

 %files -n libhdr10plus-%{uver}

-%{_libdir}/libhdr10plus-%{version}.so

+%_libdir/libhdr10plus-%version.so

 %files

-%{_bindir}/%{name}

+%_bindir/*

 %files -n %{libname}-devel

 %license COPYING

-%doc readme.rst

-%{_includedir}/%{name}.h

-%{_includedir}/%{name}_config.h

-%{_includedir}/hdr10plus.h

-%{_libdir}/pkgconfig/%{name}.pc

-%{_libdir}/%{libname}.so

+%_includedir/*

+%_libdir/pkgconfig/*.pc

+%_libdir/%{libname}.so

 %changelog

​

@@ -3,14 +3,16 @@

 Subject: Fix arm* flags

 ---

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

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

+ source/CMakeLists.txt               |    3 ---

+ source/cmake/FindNEON_DOTPROD.cmake |    2 +-

+ source/cmake/FindNEON_I8MM.cmake    |    2 +-

+ source/cmake/FindSVE.cmake          |    2 +-

+ source/cmake/FindSVE2.cmake         |    4 ++--

+ 5 files changed, 5 insertions(+), 8 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)

+@@ -274,10 +274,7 @@

      elseif(ARM)

          find_package(Neon)

          if(CPU_HAS_NEON)

@@ -20,20 +22,42 @@

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

+     if(ARM64)

+--- a/source/cmake/FindNEON_DOTPROD.cmake

++++ b/source/cmake/FindNEON_DOTPROD.cmake

+@@ -17,5 +17,5 @@

+ endif()

+ 

+ if(has_dot_product)

+-    set(CPU_HAS_NEON_DOTPROD 1)

++    set(CPU_HAS_NEON_DOTPROD 0)

+ endif()

+--- a/source/cmake/FindNEON_I8MM.cmake

++++ b/source/cmake/FindNEON_I8MM.cmake

+@@ -17,5 +17,5 @@

+ endif()

+ 

+ if(has_i8mm)

+-    set(CPU_HAS_NEON_I8MM 1)

++    set(CPU_HAS_NEON_I8MM 0)

+ endif()

+--- a/source/cmake/FindSVE.cmake

++++ b/source/cmake/FindSVE.cmake

+@@ -17,5 +17,5 @@

+ endif()

+ 

+ if(sve_version)

+-    set(CPU_HAS_SVE 1)

++    set(CPU_HAS_SVE 0)

+ endif()

+--- a/source/cmake/FindSVE2.cmake

++++ b/source/cmake/FindSVE2.cmake

+@@ -17,6 +17,6 @@

+ endif()

+ 

+ if(sve2_version)

+-    set(CPU_HAS_SVE 1)

+-    set(CPU_HAS_SVE2 1)

++    set(CPU_HAS_SVE 0)

++    set(CPU_HAS_SVE2 0)

+ endif()

​

@@ -3,14 +3,12 @@

 Subject: Do not build with assembly support on arm*

 ---

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

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

+@@ -72,15 +72,6 @@

          add_definitions(-DPPC64=1)

          message(STATUS "Detected POWER PPC64 target processor")

      endif()

@@ -24,5 +22,5 @@

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

+     message(STATUS "Detected ARM64 target processor")

+     set(ARM64 1)

​

@@ -0,0 +1,15 @@

+---

+ source/CMakeLists.txt |    2 +-

+ 1 file changed, 1 insertion(+), 1 deletion(-)

+

+--- a/source/CMakeLists.txt

++++ b/source/CMakeLists.txt

+@@ -13,7 +13,7 @@

+     cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH

+ endif()

+ if(POLICY CMP0054)

+-    cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted

++    cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted

+ endif()

+ 

+ project (x265)

​

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

+---

+ source/x265.pc.in |    2 +-

+ 1 file changed, 1 insertion(+), 1 deletion(-)

+

 --- a/source/x265.pc.in

 +++ b/source/x265.pc.in

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

​

@@ -0,0 +1,45 @@

+<services>

+   <service name="tar_scm">

+       <param name="exclude">.gitignore</param>

+       <param name="exclude">.hgignore</param>

+       <param name="exclude">.hgtags</param>

+       <param name="exclude">.readthedocs.yaml</param>

+       <param name="exclude">build/README.txt</param>

+       <param name="exclude">build/aarch64-darwin</param>

+       <param name="exclude">build/aarch64-linux-clang</param>

+       <param name="exclude">build/ms*</param>

+       <param name="exclude">build/vc*</param>

+       <param name="exclude">build/xcode</param>

+       <param name="exclude">build</param>

+       <param name="exclude">doc/intra</param>

+       <param name="exclude">doc/reST/Makefile</param>

+       <param name="exclude">doc/reST/api.rst</param>

+       <param name="exclude">doc/reST/cli.rst</param>

+       <param name="exclude">doc/reST/conf.py</param>

+       <param name="exclude">doc/reST/index.rst</param>

+       <param name="exclude">doc/reST/introduction.rst</param>

+       <param name="exclude">doc/reST/lossless.rst</param>

+       <param name="exclude">doc/reST/presets.rst</param>

+       <param name="exclude">doc/reST/svthevc.rst</param>

+       <param name="exclude">doc/reST/threading.rst</param>

+       <param name="exclude">doc/reST/x265.rst</param>

+       <param name="exclude">doc/requirements.txt</param>

+       <param name="exclude">doc/uncrustify</param>

+       <param name="exclude">readme.rst</param>

+       <param name="exclude">source/common/ppc</param>

+       <param name="exclude">source/compat</param>

+       <param name="exclude">source/profile</param>

+       <param name="exclude">source/test</param>

+       <param name="filename">x265</param>

+       <param name="revision">32e25ffcf810c5fe284901859b369270824c4596</param>

+       <param name="scm">git</param>

+       <param name="submodules">disable</param>

+       <param name="url">https://bitbucket.org/multicoreware/x265_git.git</param>

+       <param name="versionformat">@PARENT_TAG@</param>

+       <param name="versionrewrite-pattern">v?(^\++)(.*)</param>

+       <param name="versionrewrite-replacement">\1</param>

+   </service>

+   <service name="set_version">

+       <param name="basename">x265</param>

+   </service>

+</services>

​

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

-libx265-209

+libx265-215

​

@@ -1,10 +1,13 @@

-#!/bin/sh

+#!/bin/bash

-rm -f x265_*.tar.gz

-osc service disabledrun download_files

+rm -f x265_*.tar x265_*.tar.*z

+osc service ra

 version=$(grep ^Version x265.spec|awk '{print $2}')

 echo "The new version is:" $version

-api=$(tar xzfO x265_${version}.tar.gz x265_${version}/source/CMakeLists.txt|grep "set(X265_BUILD"|sed 's/^.* \(1-90-9*\).*$/\1/')

+api=$(tar xafO x265-${version}.tar x265-${version}/source/CMakeLists.txt|grep "set(X265_BUILD"|sed 's/^.* \(1-90-9*\).*$/\1/')

 echo "The new api version is:" $api

 echo "libx265-${api}" > baselibs.conf

-sed -i "/^%define sover/c%define sover   ${api}" x265.spec

+sed -i "

+/^%define sover:blank:/c%define sover   ${api}

+ /^%define uver:blank:/c%define uver    ${version//./_}

+" x265.spec

​