[packages/x265] - up to 1.3 20140825

[arekm]

commit a3a5561a92d8ed31a7fe0f734286dcdb05925b61
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Aug 25 12:21:27 2014 +0200

    - up to 1.3 20140825

 x265-libdir.patch | 32 +++++---------------------------
 x265.spec         | 13 +++++++------
 2 files changed, 12 insertions(+), 33 deletions(-)
---
diff --git a/x265.spec b/x265.spec
index 0ae71fb..2b76766 100644
--- a/x265.spec
+++ b/x265.spec
@@ -1,14 +1,14 @@
 Summary:	H.265/HEVC video encoder
 Summary(pl.UTF-8):	Koder obrazu H.265/HEVC
 Name:		x265
-Version:	0.8
-Release:	0.20140328.2
+Version:	1.3
+Release:	0.20140825.1
 License:	GPL v2+
 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:	928e5fdb3fc8171d9e329e88de4afe03
+# Source0-md5:	1e23098d7aa53729babc377ee8ada3d9
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-libdir.patch
 URL:		http://x265.org/
@@ -74,7 +74,9 @@ Statyczna biblioteka x265.
 
 %build
 cd source
-%cmake .
+%cmake \
+	-DLIB_INSTALL_DIR=%{_libdir} \
+	.
 %{__make}
 
 %install
@@ -97,8 +99,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.*.*
-%attr(755,root,root) %ghost %{_libdir}/libx265.so.7
+%attr(755,root,root) %{_libdir}/libx265.so.31
 
 %files -n libx265-devel
 %defattr(644,root,root,755)
diff --git a/x265-libdir.patch b/x265-libdir.patch
index a083911..0cb1a56 100644
--- a/x265-libdir.patch
+++ b/x265-libdir.patch
@@ -1,33 +1,11 @@
---- 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 @@
+--- 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/pkgconfig")
-+            DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
+-            DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/pkgconfig")
++            DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
  endif()
  
  if(NOT WIN32)
================================================================

---- gitweb:

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