commit 2ff9ef80853e065a2272b4554713e3976aa52ca7 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Tue Feb 27 16:18:33 2018 +0000 Update to 2.7 .gitignore | 1 + sources | 2 +- x265-pic.patch | 12 ------------ x265-test-shared.patch | 11 ----------- x265.spec | 37 ++++++++++++++++++++----------------- 5 files changed, 22 insertions(+), 41 deletions(-) --- diff --git a/.gitignore b/.gitignore index 966f6ce..594d208 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ x265_1.6.tar.gz /x265_2.4.tar.gz /x265_2.5.tar.gz /x265_2.6.tar.gz +/x265_2.7.tar.gz diff --git a/sources b/sources index e9dc3a9..7181119 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d318be1f19b58985432a144bd054572 x265_2.6.tar.gz +b0d7d20da2a418fa4f53a559946ea079 x265_2.7.tar.gz diff --git a/x265-pic.patch b/x265-pic.patch index 65e89fd..e612f44 100644 --- a/x265-pic.patch +++ b/x265-pic.patch @@ -10,15 +10,3 @@ if(NATIVE_BUILD) if(INTEL_CXX) -diff -up x265_1.8/source/test/checkasm-a.asm.pic x265_1.8/source/test/checkasm-a.asm ---- x265_1.8/source/test/checkasm-a.asm.pic 2015-09-22 10:10:07.000000000 +0200 -+++ x265_1.8/source/test/checkasm-a.asm 2015-10-25 23:23:45.041877640 +0100 -@@ -154,7 +154,7 @@ cglobal checkasm_call, 2,15,16,max_args* - mov r9, rax - mov r10, rdx - lea r0, [error_message] -- call puts -+ call puts wrt ..plt - mov r1, [rsp+max_args*8] - mov dword [r1], 0 - mov rdx, r10 diff --git a/x265.spec b/x265.spec index f390ad0..4673eca 100644 --- a/x265.spec +++ b/x265.spec @@ -1,8 +1,8 @@ -%global _so_version 146 +%global _so_version 151 Summary: H.265/HEVC encoder Name: x265 -Version: 2.6 +Version: 2.7 Release: 1%{?dist} URL: http://x265.org/ # source/Lib/TLibCommon - BSD @@ -12,15 +12,14 @@ License: GPLv2+ and BSD Source0: https://bitbucket.org/multicoreware/%{name}/downloads/%{name}_%{version}.... -# link test binaries with shared library -Patch1: x265-test-shared.patch # fix building as PIC -Patch2: x265-pic.patch -Patch3: x265-high-bit-depth-soname.patch -Patch4: x265-detect_cpu_armhfp.patch +Patch0: x265-pic.patch +Patch1: x265-high-bit-depth-soname.patch +Patch2: x265-detect_cpu_armhfp.patch -BuildRequires: cmake -BuildRequires: yasm +BuildRequires: cmake3 +BuildRequires: nasm +BuildRequires: ninja-build %ifnarch armv7hl armv7hnl s390 s390x BuildRequires: numactl-devel @@ -55,7 +54,7 @@ performance on a wide variety of hardware platforms. This package contains the shared library development files. %prep -%autosetup -p1 -n %{name}_v%{version} +%autosetup -p1 -n %{name}_%{version} %build # High depth libraries (from source/h265.h): @@ -66,14 +65,14 @@ This package contains the shared library development files. # 10bit: libx265_main10.so build() { -%cmake -G "Unix Makefiles" \ +%cmake3 -G "Ninja" \ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \ -DCMAKE_SKIP_RPATH:BOOL=YES \ -DENABLE_PIC:BOOL=ON \ -DENABLE_TESTS:BOOL=ON \ $* \ ../source -%make_build +%ninja_build } # High depth 10/12 bit libraries are supported only on 64 bit. They require @@ -97,7 +96,7 @@ popd for i in 8 10 12; do if [ -d ${i}bit ]; then pushd ${i}bit - %make_install + %ninja_install # Remove unversioned library, should not be linked to rm -f %{buildroot}%{_libdir}/libx265_main${i}.so popd @@ -110,14 +109,12 @@ find %{buildroot} -name "*.a" -delete for i in 8 10 12; do if [ -d ${i}bit ]; then pushd ${i}bit - LD_LIBRARY_PATH=%{buildroot}%{_libdir} test/TestBench || : + test/TestBench || : popd fi done -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files %{_bindir}/x265 @@ -138,6 +135,12 @@ done %{_libdir}/pkgconfig/x265.pc %changelog +* Tue Feb 27 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.7-1 +- update to 2.7 +- Drop shared test patch as it causes nasm build to fail +- Fix scriptlets +- Use ninja to build + * Sat Dec 30 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 2.6-1 - Update x265 to 2.6