Merge pull request #2115 from fstd/support_netbsd_2

Support NetBSD and OpenBSD; consolidate BSD build.

Makefile

@@ -7,7 +7,7 @@ vpath %.S $(SRC_PATH)
 vpath %.rc $(SRC_PATH)
 vpath %.pc.in $(SRC_PATH)
 
-OS=$(shell uname | tr A-Z a-z | tr -d \\-[:digit:].)
+OS=$(shell uname | tr A-Z a-z | tr -d \\-[:digit:]. | sed -E 's/^(net|open|free)bsd/bsd/')
 ARCH=$(shell uname -m)
 LIBPREFIX=lib
 LIBSUFFIX=a

codec/common/src/WelsThreadLib.cpp

@@ -504,7 +504,12 @@ WELS_THREAD_ERROR_CODE    WelsQueryLogicalProcessInfo (WelsLogicalProcessInfo* p
 
   size_t len = sizeof (pInfo->ProcessorCount);
 
+#if defined(__OpenBSD__)
+  int scname[] = { CTL_HW, HW_NCPU };
+  if (sysctl (scname, 2, &pInfo->ProcessorCount, &len, NULL, 0) == -1)
+#else
   if (sysctlbyname (HW_NCPU_NAME, &pInfo->ProcessorCount, &len, NULL, 0) == -1)
+#endif
     pInfo->ProcessorCount = 1;
 
   return WELS_THREAD_ERROR_OK;