x265: bump version

media-libs/x265/patches/x265-1.5.patchset

@@ -1,38 +1,38 @@
-From 8387d94e949e524f936c9c7ecb86b8663c603351 Mon Sep 17 00:00:00 2001
+From fdf7fe7e61b7ba2490e0c2c7cededd1b62e5854d Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Sun, 28 Dec 2014 07:11:55 +0000
 Subject: Check if threading library needs to be linked separately
 
 
 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index ba63f81..e43be21 100644
+index 4f52cf7..c3f23aa 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
 @@ -56,7 +56,8 @@ else()
  endif()
  
  if(UNIX)
--    SET(PLATFORM_LIBS pthread)
-+    find_package(Threads)
-+    SET(PLATFORM_LIBS ${CMAKE_THREAD_LIBS_INIT})
+-    list(APPEND PLATFORM_LIBS pthread)
++	find_package(Threads)
++    list(APPEND PLATFORM_LIBS ${CMAKE_THREAD_LIBS_INIT})
      find_library(LIBRT rt)
      if(LIBRT)
-         set(PLATFORM_LIBS ${PLATFORM_LIBS} rt)
+         list(APPEND PLATFORM_LIBS rt)
 -- 
-1.8.3.4
+2.2.2
 
 
-From 592de1f1cd5666ae9cc64715833dfd16130a9c0b Mon Sep 17 00:00:00 2001
+From 1a8f8c8ee3eb3634d3a850b218bdc6418f5bd7ce Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Sun, 28 Dec 2014 07:13:56 +0000
 Subject: Add an option to adjust headers installation path
 
 
 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index e43be21..b78d12b 100644
+index c3f23aa..803ed8b 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -166,6 +166,7 @@ endif()
+@@ -172,6 +172,7 @@ endif()
  # Build options
  set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries")
  set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")
@@ -40,7 +40,7 @@ index e43be21..b78d12b 100644
  
  if(X64)
      # NOTE: We only officially support 16bit-per-pixel compiles of x265
-@@ -251,7 +252,8 @@ endif()
+@@ -271,7 +272,8 @@ endif()
  install(TARGETS x265-static
      LIBRARY DESTINATION ${LIB_INSTALL_DIR}
      ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
@@ -51,20 +51,20 @@ index e43be21..b78d12b 100644
  if(CMAKE_RC_COMPILER)
      # The resource compiler does not need CFLAGS or macro defines. It
 -- 
-1.8.3.4
+2.2.2
 
 
-From ccb172d336c00fa95b1d99407da86be0b970b3bb Mon Sep 17 00:00:00 2001
+From 27b028b1612d402f082a8ce2eca2111e23d782e7 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Sun, 28 Dec 2014 07:14:34 +0000
 Subject: Add Haiku version of adjusting thread priority
 
 
 diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp
-index 8a2ab9d..70b1289 100644
+index ccb9ab6..d5847d5 100644
 --- a/source/common/threadpool.cpp
 +++ b/source/common/threadpool.cpp
-@@ -32,6 +32,8 @@
+@@ -30,6 +30,8 @@
  #if MACOS
  #include <sys/param.h>
  #include <sys/sysctl.h>
@@ -74,20 +74,20 @@ index 8a2ab9d..70b1289 100644
  
  namespace x265 {
 @@ -141,6 +143,9 @@ void PoolThread::threadMain()
- {
+ 
  #if _WIN32
      SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL);
 +#elif defined(__HAIKU__)
-+    __attribute__((unused)) status_t
-+    val = set_thread_priority(find_thread(NULL), B_LOW_PRIORITY);
++	__attribute__((unused)) status_t
++	val = set_thread_priority(find_thread(NULL), B_LOW_PRIORITY);
  #else
      __attribute__((unused)) int val = nice(10);
  #endif
 -- 
-1.8.3.4
+2.2.2
 
 
-From ae89f461c037e2981add0a1b161b81afd5104e30 Mon Sep 17 00:00:00 2001
+From 5accccc2e924d21b28483ee0a00941dc0cd1fb4b Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Mon, 29 Dec 2014 04:43:42 +0000
 Subject: checkasm-a: Explicitly use PLT relocation for libc symbols
@@ -108,5 +108,5 @@ index f7b9837..d0d622a 100644
      mov  dword [r1], 0
      mov  rax, r9
 -- 
-1.8.3.4
+2.2.2
 

media-libs/x265/x265-1.5.recipe

@@ -9,7 +9,7 @@ HOMEPAGE="http://x265.org/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2013-2014 x265 Project"
 SRC_URI="https://bitbucket.org/multicoreware/x265/get/$portVersion.tar.bz2"
-CHECKSUM_SHA256="e818cacd6a963d49813dbe6c041888311a237da95896e604b4c91b2ddfac83a5"
+CHECKSUM_SHA256="da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
@@ -20,7 +20,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 
 # BitBucket sucks
-SOURCE_DIR='multicoreware-x265-5e604833c5aa'
+SOURCE_DIR='multicoreware-x265-9f0324125f53'
 
 PROVIDES="
 	x265$secondaryArchSuffix = $portVersion