update to 2.2

spell out SO version in file list
fix typo in patch
el8
Dominik 'Rathann' Mierzejewski 8 years ago
parent 69bfd3bca4
commit ecd74d5bd0

1
.gitignore vendored

@ -1,3 +1,4 @@
x265_1.6.tar.gz x265_1.6.tar.gz
/x265_1.9.tar.gz /x265_1.9.tar.gz
/x265_2.1.tar.gz /x265_2.1.tar.gz
/x265_2.2.tar.gz

@ -1 +1 @@
2d9cb183d2675dfb325abdedd2424bfa x265_2.1.tar.gz 36161843a70e4d46af1fa38cf221d0f3 x265_2.2.tar.gz

@ -1,11 +1,12 @@
--- ./source/CMakeLists.txt.orig 2016-11-08 00:30:22.407038669 +0000 diff -up x265_2.2/source/CMakeLists.txt.orig x265_2.2/source/CMakeLists.txt
+++ ./source/CMakeLists.txt 2016-11-08 00:58:10.478661484 +0000 --- 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_ @@ -41,9 +41,11 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
# System architecture detection # System architecture detection
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
set(X86_ALIASES x86 i386 i686 x86_64 amd64) set(X86_ALIASES x86 i386 i686 x86_64 amd64)
-set(ARM_ALIASES armv6l armv7l) -set(ARM_ALIASES armv6l armv7l)
+set(ARMv6_ALIASES armv6l ) +set(ARMv6_ALIASES armv6l)
+set(ARMv7_ALIASES armv7l) +set(ARMv7_ALIASES armv7l)
list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
-list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) -list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
@ -14,10 +15,10 @@
set(POWER_ALIASES ppc64 ppc64le) set(POWER_ALIASES ppc64 ppc64le)
list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH) list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1") if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
@@ -60,15 +62,24 @@ elseif(POWERMATCH GREATER "-1") @@ -65,15 +67,24 @@ elseif(POWERMATCH GREATER "-1")
message(STATUS "Detected POWER target processor") add_definitions(-DPPC64=1)
set(POWER 1) message(STATUS "Detected POWER PPC64 target processor")
add_definitions(-DX265_ARCH_POWER=1) endif()
-elseif(ARMMATCH GREATER "-1") -elseif(ARMMATCH GREATER "-1")
+elseif(ARMv6MATCH GREATER "-1") +elseif(ARMv6MATCH GREATER "-1")
if(CROSS_COMPILE_ARM) if(CROSS_COMPILE_ARM)
@ -35,7 +36,7 @@
+ else() + else()
+ set(CROSS_COMPILE_ARM 0) + set(CROSS_COMPILE_ARM 0)
+ endif() + endif()
+ message(STATUS "Detected ARv7 target processor") + message(STATUS "Detected ARMv7 target processor")
+ set(ARM 1) + set(ARM 1)
+ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1) + add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1)
else() else()

@ -1,6 +1,6 @@
Summary: H.265/HEVC encoder Summary: H.265/HEVC encoder
Name: x265 Name: x265
Version: 2.1 Version: 2.2
Release: 1%{?dist} Release: 1%{?dist}
URL: http://x265.org/ URL: http://x265.org/
Source0: https://ftp.videolan.org/pub/videolan/x265/%{name}_%{version}.tar.gz 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 %files libs
%license COPYING %license COPYING
%{_libdir}/libx265.so.* %{_libdir}/libx265.so.102
%files devel %files devel
%doc doc/* %doc doc/*
@ -85,6 +85,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} test/TestBench || :
%{_libdir}/pkgconfig/x265.pc %{_libdir}/pkgconfig/x265.pc
%changelog %changelog
* Tue Jan 03 2017 Dominik Mierzejewski <rpm@greysector.net> - 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@serjux.com> - 2.1-1 * Mon Nov 07 2016 Sérgio Basto <sergio@serjux.com> - 2.1-1
- Update to 2.1 - Update to 2.1

Loading…
Cancel
Save