[packages/x265] - updated to 2.1 (note: new soname)
qboosh
qboosh at pld-linux.org
Sat Oct 8 09:42:21 CEST 2016
commit dcd66c33e0b4f189921c5da5fdd42f805fb8a6e6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Oct 8 09:44:23 2016 +0200
- updated to 2.1 (note: new soname)
x265-opt.patch | 18 ++++++++++--------
x265.spec | 6 +++---
2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/x265.spec b/x265.spec
index 27b76fa..29fe02b 100644
--- a/x265.spec
+++ b/x265.spec
@@ -9,13 +9,13 @@
Summary: H.265/HEVC video encoder
Summary(pl.UTF-8): Koder obrazu H.265/HEVC
Name: x265
-Version: 1.9
+Version: 2.1
Release: 1
License: GPL v2+
Group: Libraries
# Source0Download: https://bitbucket.org/multicoreware/x265/downloads
Source0: http://ftp.videolan.org/pub/videolan/x265/%{name}_%{version}.tar.gz
-# Source0-md5: f34a1c4c660ff07511365cb0983cf164
+# Source0-md5: 2d9cb183d2675dfb325abdedd2424bfa
Patch0: %{name}-opt.patch
Patch1: %{name}-x32.patch
URL: http://x265.org/
@@ -106,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n libx265
%defattr(644,root,root,755)
%doc doc/reST/introduction.rst
-%attr(755,root,root) %{_libdir}/libx265.so.79
+%attr(755,root,root) %{_libdir}/libx265.so.95
%files -n libx265-devel
%defattr(644,root,root,755)
diff --git a/x265-opt.patch b/x265-opt.patch
index 401b735..106859f 100644
--- a/x265-opt.patch
+++ b/x265-opt.patch
@@ -1,14 +1,16 @@
---- x265/source/CMakeLists.txt~ 2015-06-10 08:25:49.866524126 +0200
-+++ x265/source/CMakeLists.txt 2015-06-10 08:29:27.775303997 +0200
-@@ -153,11 +153,7 @@ if(GCC)
+--- x265_2.1/source/CMakeLists.txt.orig 2016-10-08 09:30:47.162008549 +0200
++++ x265_2.1/source/CMakeLists.txt 2016-10-08 09:32:59.102007042 +0200
+@@ -177,13 +177,10 @@
if(NATIVE_BUILD)
if(INTEL_CXX)
add_definitions(-xhost)
- else()
- add_definitions(-march=native)
endif()
-- elseif(X86 AND NOT X64)
-- add_definitions(-march=i686)
- endif()
- if(ARM)
- add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
+ elseif(X86 AND NOT X64)
+ string(FIND "${CMAKE_CXX_FLAGS}" "-march" marchPos)
+ if(marchPos LESS "0")
+- add_definitions(-march=i686)
+ if(WIN32 AND NOT INTEL_CXX AND NOT CLANG AND
+ CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
+ add_definitions(-mpreferred-stack-boundary=2)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/x265.git/commitdiff/dcd66c33e0b4f189921c5da5fdd42f805fb8a6e6
More information about the pld-cvs-commit
mailing list