commit ecd74d5bd019804f3e1401e2ae387152bc44c89e Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Tue Jan 3 12:53:09 2017 +0100 update to 2.2 spell out SO version in file list fix typo in patch .gitignore | 1 + sources | 2 +- x265-detect_cpu_armhfp.patch | 17 +++++++++-------- x265.spec | 9 +++++++-- 4 files changed, 18 insertions(+), 11 deletions(-) --- diff --git a/.gitignore b/.gitignore index 56e5ead..47d6cf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ x265_1.6.tar.gz /x265_1.9.tar.gz /x265_2.1.tar.gz +/x265_2.2.tar.gz diff --git a/sources b/sources index 2039f69..9eae320 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d9cb183d2675dfb325abdedd2424bfa x265_2.1.tar.gz +36161843a70e4d46af1fa38cf221d0f3 x265_2.2.tar.gz diff --git a/x265-detect_cpu_armhfp.patch b/x265-detect_cpu_armhfp.patch index f8e07e4..e68b827 100644 --- a/x265-detect_cpu_armhfp.patch +++ b/x265-detect_cpu_armhfp.patch @@ -1,11 +1,12 @@ ---- ./source/CMakeLists.txt.orig 2016-11-08 00:30:22.407038669 +0000 -+++ ./source/CMakeLists.txt 2016-11-08 00:58:10.478661484 +0000 +diff -up x265_2.2/source/CMakeLists.txt.orig x265_2.2/source/CMakeLists.txt +--- x265_2.2/source/CMakeLists.txt.orig 2016-12-23 06:57:39.000000000 +0100 ++++ x265_2.2/source/CMakeLists.txt 2017-01-03 11:18:34.773738470 +0100 @@ -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(ARMv6_ALIASES armv6l) +set(ARMv7_ALIASES armv7l) list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) -list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) @@ -14,10 +15,10 @@ 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) +@@ -65,15 +67,24 @@ elseif(POWERMATCH GREATER "-1") + add_definitions(-DPPC64=1) + message(STATUS "Detected POWER PPC64 target processor") + endif() -elseif(ARMMATCH GREATER "-1") +elseif(ARMv6MATCH GREATER "-1") if(CROSS_COMPILE_ARM) @@ -35,7 +36,7 @@ + else() + set(CROSS_COMPILE_ARM 0) + endif() -+ message(STATUS "Detected ARv7 target processor") ++ message(STATUS "Detected ARMv7 target processor") + set(ARM 1) + add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1) else() diff --git a/x265.spec b/x265.spec index b896473..94570d6 100644 --- a/x265.spec +++ b/x265.spec @@ -1,6 +1,6 @@ Summary: H.265/HEVC encoder Name: x265 -Version: 2.1 +Version: 2.2 Release: 1%{?dist} URL: http://x265.org/ Source0: https://ftp.videolan.org/pub/videolan/x265/%{name}_%{version}.tar.gz @@ -75,7 +75,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} test/TestBench || : %files libs %license COPYING -%{_libdir}/libx265.so.* +%{_libdir}/libx265.so.102 %files devel %doc doc/* @@ -85,6 +85,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} test/TestBench || : %{_libdir}/pkgconfig/x265.pc %changelog +* Tue Jan 03 2017 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 2.2-1 +- update to 2.2 +- spell out SO version in file list +- fix typo in patch + * Mon Nov 07 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 2.1-1 - Update to 2.1