[x265] Update to 2.1

commit 69bfd3bca45e596c2c351eb139618a8759de14b6 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Nov 8 08:37:02 2016 +0000 Update to 2.1 .gitignore | 1 + sources | 2 +- x265-detect_cpu_armhfp.patch | 40 +++++++++++++++++++++++++++++++++------- x265-test-shared.patch | 9 ++++----- x265.spec | 9 ++++++--- 5 files changed, 45 insertions(+), 16 deletions(-) --- diff --git a/.gitignore b/.gitignore index 5e4ceb5..56e5ead 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ x265_1.6.tar.gz /x265_1.9.tar.gz +/x265_2.1.tar.gz diff --git a/sources b/sources index fe0ffe3..2039f69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f34a1c4c660ff07511365cb0983cf164 x265_1.9.tar.gz +2d9cb183d2675dfb325abdedd2424bfa x265_2.1.tar.gz diff --git a/x265-detect_cpu_armhfp.patch b/x265-detect_cpu_armhfp.patch index c9a0d0d..f8e07e4 100644 --- a/x265-detect_cpu_armhfp.patch +++ b/x265-detect_cpu_armhfp.patch @@ -1,16 +1,42 @@ -diff -up x265_1.9/source/CMakeLists.txt.armhfp x265_1.9/source/CMakeLists.txt ---- x265_1.9/source/CMakeLists.txt.armhfp 2016-07-19 03:10:51.163733946 +0200 -+++ x265_1.9/source/CMakeLists.txt 2016-07-19 03:13:15.638665651 +0200 -@@ -59,9 +59,12 @@ elseif(POWERMATCH GREATER "-1") +--- ./source/CMakeLists.txt.orig 2016-11-08 00:30:22.407038669 +0000 ++++ ./source/CMakeLists.txt 2016-11-08 00:58:10.478661484 +0000 +@@ -41,9 +41,11 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ + # System architecture detection + string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) + set(X86_ALIASES x86 i386 i686 x86_64 amd64) +-set(ARM_ALIASES armv6l armv7l) ++set(ARMv6_ALIASES armv6l ) ++set(ARMv7_ALIASES armv7l) + list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) +-list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) ++list(FIND ARMv6_ALIASES "${SYSPROC}" ARMv6MATCH) ++list(FIND ARMv7_ALIASES "${SYSPROC}" ARMv7MATCH) + set(POWER_ALIASES ppc64 ppc64le) + list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH) + if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1") +@@ -60,15 +62,24 @@ elseif(POWERMATCH GREATER "-1") + message(STATUS "Detected POWER target processor") set(POWER 1) add_definitions(-DX265_ARCH_POWER=1) - elseif(${SYSPROC} STREQUAL "armv6l") +-elseif(ARMMATCH GREATER "-1") ++elseif(ARMv6MATCH 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") + message(STATUS "Detected ARMv6 target processor") set(ARM 1) add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1) -+elseif(${SYSPROC} STREQUAL "armv7l") -+ message(STATUS "Detected ARMv7 system processor") ++elseif(ARMv7MATCH GREATER "-1") ++ if(CROSS_COMPILE_ARM) ++ message(STATUS "Cross compiling for ARM arch") ++ else() ++ set(CROSS_COMPILE_ARM 0) ++ endif() ++ message(STATUS "Detected ARv7 target processor") ++ set(ARM 1) + add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1) else() message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown") diff --git a/x265-test-shared.patch b/x265-test-shared.patch index e76f6c6..eeebb88 100644 --- a/x265-test-shared.patch +++ b/x265-test-shared.patch @@ -1,10 +1,9 @@ -diff -up x265_1.8/source/test/CMakeLists.txt.shared x265_1.8/source/test/CMakeLists.txt ---- x265_1.8/source/test/CMakeLists.txt.shared 2015-09-22 10:10:07.000000000 +0200 -+++ x265_1.8/source/test/CMakeLists.txt 2015-10-24 12:15:04.846236808 +0200 -@@ -23,7 +23,7 @@ add_executable(TestBench ${YASM_SRC} - mbdstharness.cpp mbdstharness.h +--- ./source/test/CMakeLists.txt.orig 2016-11-08 00:20:30.255328576 +0000 ++++ ./source/test/CMakeLists.txt 2016-11-08 00:16:38.709703855 +0000 +@@ -44,7 +44,7 @@ add_executable(TestBench ${YASM_SRC} ipfilterharness.cpp ipfilterharness.h intrapredharness.cpp intrapredharness.h) + -target_link_libraries(TestBench x265-static ${PLATFORM_LIBS}) +target_link_libraries(TestBench x265-shared ${PLATFORM_LIBS}) if(LINKER_OPTIONS) diff --git a/x265.spec b/x265.spec index 8bb22b8..b896473 100644 --- a/x265.spec +++ b/x265.spec @@ -1,7 +1,7 @@ Summary: H.265/HEVC encoder Name: x265 -Version: 1.9 -Release: 3%{?dist} +Version: 2.1 +Release: 1%{?dist} URL: http://x265.org/ Source0: https://ftp.videolan.org/pub/videolan/x265/%{name}_%{version}.tar.gz # link test binaries with shared library @@ -75,7 +75,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} test/TestBench || : %files libs %license COPYING -%{_libdir}/libx265.so.79 +%{_libdir}/libx265.so.* %files devel %doc doc/* @@ -85,6 +85,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} test/TestBench || : %{_libdir}/pkgconfig/x265.pc %changelog +* Mon Nov 07 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 2.1-1 +- Update to 2.1 + * Thu Aug 18 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 1.9-3 - Clean spec, Vascom patches series, rfbz #4199, add license tag