Kron4ek, помоги. Там ( https://github.com/doitsujin/dxvk/issues/2300#issuecomment-925718100 ) ты пишеш, что откат устраняет проблему.
Откатываю патч, пытаюсь пересобрать dxvk и... error: ‘cv_status’ in namespace ‘std’ does not name a type
:
$ ./package-release.sh master /tmp/111/dxvk-1.9.2-fix --no-package
The Meson build system
Version: 0.53.2
Source dir: /tmp/111/dxvk-1.9.2
Build dir: /tmp/111/dxvk-1.9.2-fix/dxvk-master/build.64
Build type: cross build
Project name: dxvk
Project version: v1.9.2
C compiler for the build machine: cc (gcc 9.3.0 "cc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0")
C linker for the build machine: cc ld.bfd 2.34
C++ compiler for the build machine: c++ (gcc 9.3.0 "c++ (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0")
C++ linker for the build machine: c++ ld.bfd 2.34
C compiler for the host machine: x86_64-w64-mingw32-gcc (gcc 9.3.0 "x86_64-w64-mingw32-gcc (GCC) 9.3-win32 20200320")
C linker for the host machine: x86_64-w64-mingw32-gcc ld.bfd 2.34
C++ compiler for the host machine: x86_64-w64-mingw32-g++ (gcc 9.3.0 "x86_64-w64-mingw32-g++ (GCC) 9.3-win32 20200320")
C++ linker for the host machine: x86_64-w64-mingw32-g++ ld.bfd 2.34
Build machine cpu family: x86_64
Build machine cpu: x86_64
Host machine cpu family: x86_64
Host machine cpu: x86_64
Target machine cpu family: x86_64
Target machine cpu: x86_64
Compiler for C++ supports link arguments -Wl,--file-alignment=4096: YES
Compiler for C++ supports arguments -msse3: YES
Library vulkan-1 found: YES
Library d3d9 found: YES
Library d3d11 found: YES
Library dxgi found: YES
Library d3dcompiler_43 found: YES
Library d3dcompiler_47 found: YES
Program glslangValidator found: YES (/usr/bin/glslangValidator)
Run-time dependency threads found: YES
Dependency threads found: YES unknown (cached)
Build targets in project: 13
Found ninja-1.10.0 at /usr/bin/ninja
[1/273] Generating version.h with a custom command.
fatal: не найден git репозиторий (или один из его каталогов вплоть до точки монтирования /)
Останавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен).
[5/273] Compiling C++ object 'src/util/ed6d25d@@util@sta/util_gdi.cpp.obj'.
FAILED: src/util/ed6d25d@@util@sta/util_gdi.cpp.obj
x86_64-w64-mingw32-g++ -Isrc/util/ed6d25d@@util@sta -Isrc/util -I../../../dxvk-1.9.2/src/util -I../../../dxvk-1.9.2/./include -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++17 -O3 -DNOMINMAX -D_WIN32_WINNT=0xa00 -msse3 -MD -MQ 'src/util/ed6d25d@@util@sta/util_gdi.cpp.obj' -MF 'src/util/ed6d25d@@util@sta/util_gdi.cpp.obj.d' -o 'src/util/ed6d25d@@util@sta/util_gdi.cpp.obj' -c ../../../dxvk-1.9.2/src/util/util_gdi.cpp
In file included from ../../../dxvk-1.9.2/src/util/log/log.h:8,
from ../../../dxvk-1.9.2/src/util/util_gdi.cpp:2:
../../../dxvk-1.9.2/src/util/log/../thread.h:279:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
279 | std::cv_status wait_until(std::unique_lock<dxvk::mutex>& lock, const std::chrono::time_point<Clock, Duration>& time) {
| ^~~~~~~~~
In file included from ../../../dxvk-1.9.2/src/util/log/log.h:8,
from ../../../dxvk-1.9.2/src/util/util_gdi.cpp:2:
../../../dxvk-1.9.2/src/util/log/../thread.h:297:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
297 | std::cv_status wait_for(std::unique_lock<dxvk::mutex>& lock, const std::chrono::duration<Rep, Period>& timeout) {
| ^~~~~~~~~
../../../dxvk-1.9.2/src/util/log/../thread.h: In member function ‘bool dxvk::condition_variable::wait_for(std::unique_lock<dxvk::mutex>&, const std::chrono::duration<_Rep1, _Period1>&, Predicate)’:
../../../dxvk-1.9.2/src/util/log/../thread.h:310:54: error: ‘std::cv_status’ has not been declared
310 | if (!result && wait_for(lock, timeout) == std::cv_status::no_timeout)
| ^~~~~~~~~
[6/273] Compiling C++ object 'src/util/ed6d25d@@util@sta/util_fps_limiter.cpp.obj'.
FAILED: src/util/ed6d25d@@util@sta/util_fps_limiter.cpp.obj
x86_64-w64-mingw32-g++ -Isrc/util/ed6d25d@@util@sta -Isrc/util -I../../../dxvk-1.9.2/src/util -I../../../dxvk-1.9.2/./include -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++17 -O3 -DNOMINMAX -D_WIN32_WINNT=0xa00 -msse3 -MD -MQ 'src/util/ed6d25d@@util@sta/util_fps_limiter.cpp.obj' -MF 'src/util/ed6d25d@@util@sta/util_fps_limiter.cpp.obj.d' -o 'src/util/ed6d25d@@util@sta/util_fps_limiter.cpp.obj' -c ../../../dxvk-1.9.2/src/util/util_fps_limiter.cpp
In file included from ../../../dxvk-1.9.2/src/util/util_fps_limiter.cpp:3:
../../../dxvk-1.9.2/src/util/thread.h:279:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
279 | std::cv_status wait_until(std::unique_lock<dxvk::mutex>& lock, const std::chrono::time_point<Clock, Duration>& time) {
| ^~~~~~~~~
In file included from ../../../dxvk-1.9.2/src/util/util_fps_limiter.cpp:3:
../../../dxvk-1.9.2/src/util/thread.h:297:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
297 | std::cv_status wait_for(std::unique_lock<dxvk::mutex>& lock, const std::chrono::duration<Rep, Period>& timeout) {
| ^~~~~~~~~
../../../dxvk-1.9.2/src/util/thread.h: In member function ‘bool dxvk::condition_variable::wait_for(std::unique_lock<dxvk::mutex>&, const std::chrono::duration<_Rep1, _Period1>&, Predicate)’:
../../../dxvk-1.9.2/src/util/thread.h:310:54: error: ‘std::cv_status’ has not been declared
310 | if (!result && wait_for(lock, timeout) == std::cv_status::no_timeout)
| ^~~~~~~~~
../../../dxvk-1.9.2/src/util/util_fps_limiter.cpp: In member function ‘dxvk::FpsLimiter::TimePoint dxvk::FpsLimiter::sleep(dxvk::FpsLimiter::TimePoint, dxvk::FpsLimiter::NtTimerDuration)’:
../../../dxvk-1.9.2/src/util/util_fps_limiter.cpp:120:14: error: ‘std::this_thread’ has not been declared
120 | std::this_thread::sleep_for(sleepDuration);
| ^~~~~~~~~~~
[7/273] Compiling C++ object 'src/util/ed6d25d@@util@sta/util_luid.cpp.obj'.
FAILED: src/util/ed6d25d@@util@sta/util_luid.cpp.obj
x86_64-w64-mingw32-g++ -Isrc/util/ed6d25d@@util@sta -Isrc/util -I../../../dxvk-1.9.2/src/util -I../../../dxvk-1.9.2/./include -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++17 -O3 -DNOMINMAX -D_WIN32_WINNT=0xa00 -msse3 -MD -MQ 'src/util/ed6d25d@@util@sta/util_luid.cpp.obj' -MF 'src/util/ed6d25d@@util@sta/util_luid.cpp.obj.d' -o 'src/util/ed6d25d@@util@sta/util_luid.cpp.obj' -c ../../../dxvk-1.9.2/src/util/util_luid.cpp
In file included from ../../../dxvk-1.9.2/src/util/./log/log.h:8,
from ../../../dxvk-1.9.2/src/util/util_luid.cpp:4:
../../../dxvk-1.9.2/src/util/./log/../thread.h:279:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
279 | std::cv_status wait_until(std::unique_lock<dxvk::mutex>& lock, const std::chrono::time_point<Clock, Duration>& time) {
| ^~~~~~~~~
In file included from ../../../dxvk-1.9.2/src/util/./log/log.h:8,
from ../../../dxvk-1.9.2/src/util/util_luid.cpp:4:
../../../dxvk-1.9.2/src/util/./log/../thread.h:297:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
297 | std::cv_status wait_for(std::unique_lock<dxvk::mutex>& lock, const std::chrono::duration<Rep, Period>& timeout) {
| ^~~~~~~~~
../../../dxvk-1.9.2/src/util/./log/../thread.h: In member function ‘bool dxvk::condition_variable::wait_for(std::unique_lock<dxvk::mutex>&, const std::chrono::duration<_Rep1, _Period1>&, Predicate)’:
../../../dxvk-1.9.2/src/util/./log/../thread.h:310:54: error: ‘std::cv_status’ has not been declared
310 | if (!result && wait_for(lock, timeout) == std::cv_status::no_timeout)
| ^~~~~~~~~
[9/273] Compiling C++ object 'src/util/ed6d25d@@util@sta/util_monitor.cpp.obj'.
FAILED: src/util/ed6d25d@@util@sta/util_monitor.cpp.obj
x86_64-w64-mingw32-g++ -Isrc/util/ed6d25d@@util@sta -Isrc/util -I../../../dxvk-1.9.2/src/util -I../../../dxvk-1.9.2/./include -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++17 -O3 -DNOMINMAX -D_WIN32_WINNT=0xa00 -msse3 -MD -MQ 'src/util/ed6d25d@@util@sta/util_monitor.cpp.obj' -MF 'src/util/ed6d25d@@util@sta/util_monitor.cpp.obj.d' -o 'src/util/ed6d25d@@util@sta/util_monitor.cpp.obj' -c ../../../dxvk-1.9.2/src/util/util_monitor.cpp
In file included from ../../../dxvk-1.9.2/src/util/./log/log.h:8,
from ../../../dxvk-1.9.2/src/util/util_monitor.cpp:4:
../../../dxvk-1.9.2/src/util/./log/../thread.h:279:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
279 | std::cv_status wait_until(std::unique_lock<dxvk::mutex>& lock, const std::chrono::time_point<Clock, Duration>& time) {
| ^~~~~~~~~
In file included from ../../../dxvk-1.9.2/src/util/./log/log.h:8,
from ../../../dxvk-1.9.2/src/util/util_monitor.cpp:4:
../../../dxvk-1.9.2/src/util/./log/../thread.h:297:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
297 | std::cv_status wait_for(std::unique_lock<dxvk::mutex>& lock, const std::chrono::duration<Rep, Period>& timeout) {
| ^~~~~~~~~
../../../dxvk-1.9.2/src/util/./log/../thread.h: In member function ‘bool dxvk::condition_variable::wait_for(std::unique_lock<dxvk::mutex>&, const std::chrono::duration<_Rep1, _Period1>&, Predicate)’:
../../../dxvk-1.9.2/src/util/./log/../thread.h:310:54: error: ‘std::cv_status’ has not been declared
310 | if (!result && wait_for(lock, timeout) == std::cv_status::no_timeout)
| ^~~~~~~~~
[10/273] Compiling C++ object 'src/util/ed6d25d@@util@sta/com_com_guid.cpp.obj'.
FAILED: src/util/ed6d25d@@util@sta/com_com_guid.cpp.obj
x86_64-w64-mingw32-g++ -Isrc/util/ed6d25d@@util@sta -Isrc/util -I../../../dxvk-1.9.2/src/util -I../../../dxvk-1.9.2/./include -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++17 -O3 -DNOMINMAX -D_WIN32_WINNT=0xa00 -msse3 -MD -MQ 'src/util/ed6d25d@@util@sta/com_com_guid.cpp.obj' -MF 'src/util/ed6d25d@@util@sta/com_com_guid.cpp.obj.d' -o 'src/util/ed6d25d@@util@sta/com_com_guid.cpp.obj' -c ../../../dxvk-1.9.2/src/util/com/com_guid.cpp
In file included from ../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/../dxvk/../util/log/log.h:8,
from ../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/../dxvk/dxvk_include.h:3,
from ../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/dxgi_interfaces.h:3,
from ../../../dxvk-1.9.2/src/util/com/../../d3d11/d3d11_interfaces.h:3,
from ../../../dxvk-1.9.2/src/util/com/com_guid.cpp:3:
../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/../dxvk/../util/log/../thread.h:279:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
279 | std::cv_status wait_until(std::unique_lock<dxvk::mutex>& lock, const std::chrono::time_point<Clock, Duration>& time) {
| ^~~~~~~~~
In file included from ../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/../dxvk/../util/log/log.h:8,
from ../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/../dxvk/dxvk_include.h:3,
from ../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/dxgi_interfaces.h:3,
from ../../../dxvk-1.9.2/src/util/com/../../d3d11/d3d11_interfaces.h:3,
from ../../../dxvk-1.9.2/src/util/com/com_guid.cpp:3:
../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/../dxvk/../util/log/../thread.h:297:10: error: ‘cv_status’ in namespace ‘std’ does not name a type
297 | std::cv_status wait_for(std::unique_lock<dxvk::mutex>& lock, const std::chrono::duration<Rep, Period>& timeout) {
| ^~~~~~~~~
../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/../dxvk/../util/log/../thread.h: In member function ‘bool dxvk::condition_variable::wait_for(std::unique_lock<dxvk::mutex>&, const std::chrono::duration<_Rep1, _Period1>&, Predicate)’:
../../../dxvk-1.9.2/src/util/com/../../d3d11/../dxgi/../dxvk/../util/log/../thread.h:310:54: error: ‘std::cv_status’ has not been declared
310 | if (!result && wait_for(lock, timeout) == std::cv_status::no_timeout)
| ^~~~~~~~~
ninja: build stopped: subcommand failed.