haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 15:08:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

x265: bump version

Browse Source 
keep lib:libx265 version 179 for compatibility.
This commit is contained in:
Jerome Duval
2020-10-20 17:18:34 +02:00
parent 726aba3555
commit 4886490716
3 changed files with 168 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
media-libs/x265/patches/x265-3.4.patchset Normal file
View File

@@ -0,0 +1,93 @@
From 8402f16821af64a25e5ef322acfd96a73b045316 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 1d1a613..847acff 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -85,7 +85,8 @@ else()
endif()
if(UNIX)
- list(APPEND PLATFORM_LIBS pthread)
+ find_package(Threads)
+ list(APPEND PLATFORM_LIBS ${CMAKE_THREAD_LIBS_INIT})
find_library(LIBRT rt)
if(LIBRT)
list(APPEND PLATFORM_LIBS rt)
--
2.28.0
From e091dc16b41c3116dbf7c68087b8f7ab6a505f17 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 847acff..6a7ff99 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -373,6 +373,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")
+set(INCLUDE_INSTALL_DIR include CACHE STRING "Install location of headers")
set(EXTRA_LIB "" CACHE STRING "Extra libraries to link against")
set(EXTRA_LINK_FLAGS "" CACHE STRING "Extra link flags")
if(EXTRA_LINK_FLAGS)
--
2.28.0
From af8cd14ec41104bc896acf26ce336ae295bf3b6d 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/CMakeLists.txt b/source/CMakeLists.txt
index 6a7ff99..2db73a3 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -600,7 +600,8 @@ if(SVTHEVC_FOUND)
install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${LIB_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}")
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.28.0
From da3bdfd81ff1b5506ada6a9a3c83ed6a882afa4a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 2db7a14..0df90c8 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.28.0