From 481e4edc80d66e0259f1521eddbe1c87c6da8608 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 9 Jun 2015 13:28:50 +0000 Subject: [PATCH] x265: bump version --- .../{x265-1.5.patchset => x265-1.7.patchset} | 47 ++++++++++--------- .../x265/{x265-1.5.recipe => x265-1.7.recipe} | 4 +- 2 files changed, 27 insertions(+), 24 deletions(-) rename media-libs/x265/patches/{x265-1.5.patchset => x265-1.7.patchset} (82%) rename media-libs/x265/{x265-1.5.recipe => x265-1.7.recipe} (94%) diff --git a/media-libs/x265/patches/x265-1.5.patchset b/media-libs/x265/patches/x265-1.7.patchset similarity index 82% rename from media-libs/x265/patches/x265-1.5.patchset rename to media-libs/x265/patches/x265-1.7.patchset index 78e41f6ac..806597513 100644 --- a/media-libs/x265/patches/x265-1.5.patchset +++ b/media-libs/x265/patches/x265-1.7.patchset @@ -1,14 +1,14 @@ -From fdf7fe7e61b7ba2490e0c2c7cededd1b62e5854d Mon Sep 17 00:00:00 2001 +From d5ce784d118acd2cf0d434268ebeb75a03b04e6f Mon Sep 17 00:00:00 2001 From: Timothy Gu 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 4f52cf7..c3f23aa 100644 +index 9cc5913..eced637 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -56,7 +56,8 @@ else() +@@ -60,7 +60,8 @@ else() endif() if(UNIX) @@ -19,20 +19,20 @@ index 4f52cf7..c3f23aa 100644 if(LIBRT) list(APPEND PLATFORM_LIBS rt) -- -2.2.2 +1.8.3.4 -From 1a8f8c8ee3eb3634d3a850b218bdc6418f5bd7ce Mon Sep 17 00:00:00 2001 +From c9f6f61516949019b8d9dde31fbdc05d8e67dbb4 Mon Sep 17 00:00:00 2001 From: Timothy Gu 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 c3f23aa..803ed8b 100644 +index eced637..8ff52f9 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -172,6 +172,7 @@ endif() +@@ -271,6 +271,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 c3f23aa..803ed8b 100644 if(X64) # NOTE: We only officially support 16bit-per-pixel compiles of x265 -@@ -271,7 +272,8 @@ endif() +@@ -379,7 +380,8 @@ endif() install(TARGETS x265-static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) @@ -51,43 +51,46 @@ index c3f23aa..803ed8b 100644 if(CMAKE_RC_COMPILER) # The resource compiler does not need CFLAGS or macro defines. It -- -2.2.2 +1.8.3.4 -From 27b028b1612d402f082a8ce2eca2111e23d782e7 Mon Sep 17 00:00:00 2001 +From dd3065dea7a357f642c0bbb961ecfc9eec2ad184 Mon Sep 17 00:00:00 2001 From: Timothy Gu 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 ccb9ab6..d5847d5 100644 +index 9c28470..7663d4a 100644 --- a/source/common/threadpool.cpp +++ b/source/common/threadpool.cpp -@@ -30,6 +30,8 @@ +@@ -52,6 +52,9 @@ + + #endif + ++#if defined(__HAIKU__) ++#include ++#endif #if MACOS #include #include -+#elif defined(__HAIKU__) -+#include - #endif - - namespace x265 { -@@ -141,6 +143,9 @@ void PoolThread::threadMain() +@@ -91,7 +94,10 @@ void WorkerThread::threadMain() #if _WIN32 SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL); +-#else +#elif defined(__HAIKU__) + __attribute__((unused)) status_t + val = set_thread_priority(find_thread(NULL), B_LOW_PRIORITY); - #else ++ #else __attribute__((unused)) int val = nice(10); #endif + -- -2.2.2 +1.8.3.4 -From 5accccc2e924d21b28483ee0a00941dc0cd1fb4b Mon Sep 17 00:00:00 2001 +From 07c68c91ceaa9ef67ed1c83498e2dae54a0e8c15 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Mon, 29 Dec 2014 04:43:42 +0000 Subject: checkasm-a: Explicitly use PLT relocation for libc symbols @@ -108,5 +111,5 @@ index f7b9837..d0d622a 100644 mov dword [r1], 0 mov rax, r9 -- -2.2.2 +1.8.3.4 diff --git a/media-libs/x265/x265-1.5.recipe b/media-libs/x265/x265-1.7.recipe similarity index 94% rename from media-libs/x265/x265-1.5.recipe rename to media-libs/x265/x265-1.7.recipe index 2131d3f47..1dffb2d1b 100644 --- a/media-libs/x265/x265-1.5.recipe +++ b/media-libs/x265/x265-1.7.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="da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648" +CHECKSUM_SHA256="133dd4d7121116e75c1664e2295d61c36dee7569718a714f37caefc5a1a521db" 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-9f0324125f53' +SOURCE_DIR='multicoreware-x265-8425278def1e' PROVIDES=" x265$secondaryArchSuffix = $portVersion