Request 6266 (accepted)

x265.changes Changed

x265.spec Changed

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

0001-Fix-arm-flags.patch Changed

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

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

x265.patch Added

x265.pkgconfig.patch Changed

_service Added

@@ -0,0 +1,45 @@
+<services>
+	<service name="tar_scm" mode="manual">
+		<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" mode="manual">
+		<param name="basename">x265</param>
+	</service>
+</services>

baselibs.conf Changed

update.sh Changed

x265-4.1.tar Added

x265_3.6.tar.gz Deleted

Overview

Request 6266 (accepted)

Request History