[packages/x265] - up to 20150610

[arekm]

commit 80d4b5bbe535018c3e0302832176177e3ebf1e44
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Jun 10 08:32:22 2015 +0200

    - up to 20150610

 x265-libdir.patch | 11 -----------
 x265-opt.patch    | 20 +++++++++++---------
 x265.spec         | 10 ++++------
 3 files changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/x265.spec b/x265.spec
index b9971d9..2b2a3ab 100644
--- a/x265.spec
+++ b/x265.spec
@@ -1,5 +1,5 @@
-%define		rel	3
-%define		subver	20140825
+%define		rel	1
+%define		subver	20150610
 Summary:	H.265/HEVC video encoder
 Summary(pl.UTF-8):	Koder obrazu H.265/HEVC
 Name:		x265
@@ -10,9 +10,8 @@ Group:		Libraries
 # hg clone -r stable https://bitbucket.org/multicoreware/x265
 # cd x265 && hg archive x265-stable.tar.bz2
 Source0:	%{name}-stable.tar.bz2
-# Source0-md5:	1e23098d7aa53729babc377ee8ada3d9
+# Source0-md5:	e17a97e62927f93375f0f472bda2b092
 Patch0:		%{name}-opt.patch
-Patch1:		%{name}-libdir.patch
 URL:		http://x265.org/
 BuildRequires:	cmake >= 2.8.8
 BuildRequires:	libstdc++-devel
@@ -73,7 +72,6 @@ Statyczna biblioteka x265.
 %setup -qc
 mv %{name}-stable/* .
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d source/build
@@ -102,7 +100,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.31
+%attr(755,root,root) %{_libdir}/libx265.so.61
 
 %files -n libx265-devel
 %defattr(644,root,root,755)
diff --git a/x265-libdir.patch b/x265-libdir.patch
deleted file mode 100644
index 0cb1a56..0000000
--- a/x265-libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- x265-stable/source/CMakeLists.txt~	2014-08-25 12:15:20.000000000 +0200
-+++ x265-stable/source/CMakeLists.txt	2014-08-25 12:18:58.463909676 +0200
-@@ -312,7 +312,7 @@
-     # Produce a pkg-config file
-     configure_file("x265.pc.in" "x265.pc" @ONLY)
-     install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/x265.pc"
--            DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/pkgconfig")
-+            DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
- endif()
- 
- if(NOT WIN32)
diff --git a/x265-opt.patch b/x265-opt.patch
index a040bd1..401b735 100644
--- a/x265-opt.patch
+++ b/x265-opt.patch
@@ -1,12 +1,14 @@
---- x265-stable/source/CMakeLists.txt.orig	2014-03-25 13:56:55.000000000 +0100
-+++ x265-stable/source/CMakeLists.txt	2014-03-29 07:38:04.923859797 +0100
-@@ -118,9 +118,6 @@
-     if(X64 AND NOT WIN32)
-         add_definitions(-fPIC)
-     endif(X64 AND NOT WIN32)
--    if(X86 AND NOT X64)
+--- 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)
+     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()
+     endif()
      if(ARM)
          add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
-     endif()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/x265.git/commitdiff/80d4b5bbe535018c3e0302832176177e3ebf1e44