x265: fix detection of cpu cores (#6677)

This commit is contained in:
Elio Blanca
2022-03-01 08:43:36 +01:00
committed by GitHub
parent 5e41072e06
commit 82b7f337b3
2 changed files with 25 additions and 1 deletions

View File

@@ -91,3 +91,27 @@ index 2db7a14..0df90c8 100644
--
2.28.0
From f2377573876ff155dc7b04d7f05a92a414589b94 Mon Sep 17 00:00:00 2001
From: Elio Blanca <eblanca76@users.sourceforge.net>
Date: Mon, 28 Feb 2022 23:29:47 +0000
Subject: fix detection of cpu cores
diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp
index 0df90c8..e07fa91 100644
--- a/source/common/threadpool.cpp
+++ b/source/common/threadpool.cpp
@@ -636,7 +636,7 @@ int ThreadPool::getCpuCount()
/* Return the number of processors configured by OS. Because, most embedded linux distributions
* uses only one processor as the scheduler doesn't have enough work to utilize all processors */
return sysconf(_SC_NPROCESSORS_CONF);
-#elif __unix__
+#elif defined(__unix__) || defined(__HAIKU__)
return sysconf(_SC_NPROCESSORS_ONLN);
#elif MACOS && __MACH__
int nm[2];
--
2.30.2

View File

@@ -7,7 +7,7 @@ the bit rate. x265 is a free software project implementing that standard."
HOMEPAGE="http://x265.org/"
COPYRIGHT="2013-2020 x265 Project"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="https://bitbucket.org/multicoreware/x265_git/get/$portVersion.tar.gz"
CHECKSUM_SHA256="7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86"
# BitBucket sucks