[packages/x265] - added libdir patch (fixes build on lib64 systems) - exclude i[34]86 because of 64-bit atomic compa

[qboosh]

commit a3d10030c58659824e02867cbb988fd2a9ff03bf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 29 09:41:31 2014 +0100

    - added libdir patch (fixes build on lib64 systems)
    - exclude i[34]86 because of 64-bit atomic compare and swap instructions

 x265-libdir.patch | 33 +++++++++++++++++++++++++++++++++
 x265.spec         |  5 +++++
 2 files changed, 38 insertions(+)
---
diff --git a/x265.spec b/x265.spec
index 8e3db2f..fd5f2a3 100644
--- a/x265.spec
+++ b/x265.spec
@@ -10,15 +10,19 @@ Group:		Libraries
 Source0:	%{name}-stable.tar.bz2
 # Source0-md5:	928e5fdb3fc8171d9e329e88de4afe03
 Patch0:		%{name}-opt.patch
+Patch1:		%{name}-libdir.patch
 URL:		http://x265.org/
 BuildRequires:	cmake >= 2.8.8
 BuildRequires:	libstdc++-devel
+BuildRequires:	rpmbuild(macros) >= 1.605
 %ifarch %{ix86} %{x8664}
 BuildRequires:	yasm >= 1.2.0
 %endif
 Requires:	libx265 = %{version}-%{release}
 # see CMakeLists.txt, more is probably possible
 ExclusiveArch:	%{ix86} %{x8664} arm
+# needs 64-bit atomic compare and swap
+ExcludeArch:	i386 i486
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -66,6 +70,7 @@ Statyczna biblioteka x265.
 %prep
 %setup -q -n x265-stable
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd source
diff --git a/x265-libdir.patch b/x265-libdir.patch
new file mode 100644
index 0000000..a083911
--- /dev/null
+++ b/x265-libdir.patch
@@ -0,0 +1,33 @@
+--- x265-stable/source/CMakeLists.txt.orig	2014-03-29 09:24:16.919161449 +0100
++++ x265-stable/source/CMakeLists.txt	2014-03-29 09:32:58.249133572 +0100
+@@ -242,8 +242,8 @@
+ endif()
+ install(TARGETS x265-static
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
++        LIBRARY DESTINATION lib${LIB_SUFFIX}
++        ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
+ 
+ if(CMAKE_RC_COMPILER)
+@@ -280,8 +280,8 @@
+         set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG} SOVERSION ${X265_BUILD})
+         install(TARGETS x265-shared
+                 RUNTIME DESTINATION bin
+-                LIBRARY DESTINATION lib
+-                ARCHIVE DESTINATION lib)
++                LIBRARY DESTINATION lib${LIB_SUFFIX}
++                ARCHIVE DESTINATION lib${LIB_SUFFIX})
+     endif()
+ endif()
+ 
+@@ -301,7 +301,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/pkgconfig")
++            DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
+ endif()
+ 
+ if(NOT WIN32)
================================================================

---- gitweb:

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