From 06b7857c9e81a8b1868c251ee4a8410e37c21005 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 25 Oct 2019 21:21:17 +0200 Subject: [PATCH] x265: bump version. SONAME bump --- .../{x265-3.0.patchset => x265-3.2.patchset} | 86 +++++++++---------- .../x265/{x265-3.0.recipe => x265-3.2.recipe} | 8 +- 2 files changed, 44 insertions(+), 50 deletions(-) rename media-libs/x265/patches/{x265-3.0.patchset => x265-3.2.patchset} (65%) rename media-libs/x265/{x265-3.0.recipe => x265-3.2.recipe} (88%) diff --git a/media-libs/x265/patches/x265-3.0.patchset b/media-libs/x265/patches/x265-3.2.patchset similarity index 65% rename from media-libs/x265/patches/x265-3.0.patchset rename to media-libs/x265/patches/x265-3.2.patchset index 1ca4c4766..658b83b4f 100644 --- a/media-libs/x265/patches/x265-3.0.patchset +++ b/media-libs/x265/patches/x265-3.2.patchset @@ -1,11 +1,11 @@ -From 88e599ade80fb1265161cc641cd455b812a26e9e Mon Sep 17 00:00:00 2001 +From 88b7b60132aa62864b55f06865bb7c0b6ae09c1e 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 0168cc5..5ff33da 100644 +index c019c2e..7386c73 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -79,7 +79,8 @@ else() @@ -19,20 +19,20 @@ index 0168cc5..5ff33da 100644 if(LIBRT) list(APPEND PLATFORM_LIBS rt) -- -2.16.4 +2.23.0 -From b2dfc2079cb74721efa72f078a0b112437e3a504 Mon Sep 17 00:00:00 2001 +From 7e65fd92030b80aa75c769de100f7f0734f9ebf5 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 5ff33da..1febc33 100644 +index 7386c73..c67236d 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -352,6 +352,7 @@ endif() +@@ -355,6 +355,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") @@ -41,59 +41,53 @@ index 5ff33da..1febc33 100644 set(EXTRA_LINK_FLAGS "" CACHE STRING "Extra link flags") if(EXTRA_LINK_FLAGS) -- -2.16.4 +2.23.0 -From 2bb590b7c67f44b70b2d4d496043f37bf79d24c4 Mon Sep 17 00:00:00 2001 +From bea6a228a5542d3446962c8a3f77553cc65ee1ce 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 f359d80..55679dd 100644 ---- a/source/common/threadpool.cpp -+++ b/source/common/threadpool.cpp -@@ -57,6 +57,10 @@ - - #endif - -+#if defined(__HAIKU__) -+#include -+#endif -+ - /* TODO FIX: Macro __MACH__ ideally should be part of MacOS definition, but adding to Cmake - behaving is not as expected, need to fix this. */ - -@@ -117,7 +121,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 - __attribute__((unused)) int val = nice(10); - #endif - --- -2.16.4 - -From: Ken Mays -Date: Tue, 7 May 2019 12:37:15 +0000 -Subject: Add option to adjust headers installation patch diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index bed6ff5..656c239 100644 +index c67236d..a8a32da 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -558,7 +558,8 @@ if(ENABLE_HDR10_PLUS) - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) +@@ -579,7 +579,8 @@ if(SVTHEVC_FOUND) + install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${BIN_INSTALL_DIR}) endif() + -install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) +install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" -+ DESTINATION "${INCLUDE_INSTALL_DIR}") ++ DESTINATION "${INCLUDE_INSTALL_DIR}") if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED)) if(MSVC_IDE) install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) +-- +2.23.0 + + +From b27bd0f8bc15b7fef2a2968d2bf956b75623bfb4 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 25 Oct 2019 21:18:33 +0200 +Subject: avoid using nice. + + +diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp +index f359d80..174d004 100644 +--- a/source/common/threadpool.cpp ++++ b/source/common/threadpool.cpp +@@ -118,7 +118,9 @@ void WorkerThread::threadMain() + #if _WIN32 + SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL); + #else ++#ifndef __HAIKU__ + __attribute__((unused)) int val = nice(10); ++#endif + #endif + + m_pool.setCurrentThreadAffinity(); +-- +2.23.0 + diff --git a/media-libs/x265/x265-3.0.recipe b/media-libs/x265/x265-3.2.recipe similarity index 88% rename from media-libs/x265/x265-3.0.recipe rename to media-libs/x265/x265-3.2.recipe index 3e1204187..01b4db825 100644 --- a/media-libs/x265/x265-3.0.recipe +++ b/media-libs/x265/x265-3.2.recipe @@ -9,9 +9,9 @@ COPYRIGHT="2013-2019 x265 Project" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://bitbucket.org/multicoreware/x265/get/$portVersion.tar.bz2" -CHECKSUM_SHA256="6717f35eaec2c5480261e4b924cba198c94e1002688848ba9099dd23695e20ac" +CHECKSUM_SHA256="9e0099dea6c4e87ff74910fa231fb8f12b0fd2421be8df503d22f023e29a4409" # BitBucket sucks -SOURCE_DIR="multicoreware-x265-72188bd2f034" +SOURCE_DIR="multicoreware-x265-353572437201" PATCHES="x265-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -20,7 +20,7 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" x265$secondaryArchSuffix = $portVersion cmd:x265 = $portVersion - lib:libx265$secondaryArchSuffix = 169 + lib:libx265$secondaryArchSuffix = 179 " REQUIRES=" haiku$secondaryArchSuffix @@ -28,7 +28,7 @@ REQUIRES=" PROVIDES_devel=" x265${secondaryArchSuffix}_devel = $portVersion - devel:libx265$secondaryArchSuffix = 169 + devel:libx265$secondaryArchSuffix = 179 " REQUIRES_devel=" x265$secondaryArchSuffix == $portVersion base