Emmanuel Vadot
57ce68a0c0
Update to 20.2 Move graphics/libxatracker to graphics/mesa-gallium-xa Remove VAAPI and VDPAU options in mesa-libs in favor of two new ports : mesa-gallium-va and mesa-gallium-vdpau Bump needed llvm to llvm10 Change a lot of meson option from false to disabled as it's deprecated. Remove the drm and surfaceless platform from mesa* as it's always enabled now. Add zstd option, used for shader cache. Reviewed by: x11 (zeising@) Differential Revision: https://reviews.freebsd.org/D26682
27 lines
814 B
C
27 lines
814 B
C
--- src/util/os_misc.c.orig 2020-09-28 22:52:13 UTC
|
|
+++ src/util/os_misc.c
|
|
@@ -58,7 +58,7 @@
|
|
# include <log/log.h>
|
|
#elif DETECT_OS_LINUX || DETECT_OS_CYGWIN || DETECT_OS_SOLARIS || DETECT_OS_HURD
|
|
# include <unistd.h>
|
|
-#elif DETECT_OS_OPENBSD
|
|
+#elif DETECT_OS_OPENBSD || DETECT_OS_FREEBSD
|
|
# include <sys/resource.h>
|
|
# include <sys/sysctl.h>
|
|
#elif DETECT_OS_APPLE || DETECT_OS_BSD
|
|
@@ -213,9 +213,13 @@ os_get_available_system_memory(uint64_t *size)
|
|
|
|
free(meminfo);
|
|
return false;
|
|
-#elif DETECT_OS_OPENBSD
|
|
+#elif defined(DETECT_OS_OPENBSD) || defined(DETECT_OS_FREEBSD)
|
|
struct rlimit rl;
|
|
+#if DETECT_OS_OPENBSD
|
|
int mib[] = { CTL_HW, HW_USERMEM64 };
|
|
+#elif DETECT_OS_FREEBSD
|
|
+ int mib[] = { CTL_HW, HW_USERMEM };
|
|
+#endif
|
|
int64_t mem_available;
|
|
size_t len = sizeof(mem_available);
|
|
|