Compare commits
14 commits
0071bf54d5
...
d111dcecd0
Author | SHA1 | Date | |
---|---|---|---|
d111dcecd0 | |||
bd67d58daa | |||
10be04b484 | |||
c75d98653d | |||
02860a7a47 | |||
f4e7e759b7 | |||
15868da546 | |||
b1b338d9ae | |||
d03ce976b2 | |||
287477cd18 | |||
a7bc191afe | |||
463cb7217b | |||
52cf4564ab | |||
1c3ca17cfb |
2 changed files with 20 additions and 40 deletions
40
ffmpeg.patch
40
ffmpeg.patch
|
@ -1,40 +0,0 @@
|
||||||
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
|
|
||||||
index 54c852f831..ff35c8dc2c 100644
|
|
||||||
--- a/externals/ffmpeg/CMakeLists.txt
|
|
||||||
+++ b/externals/ffmpeg/CMakeLists.txt
|
|
||||||
@@ -63,20 +63,22 @@ if (NOT WIN32 AND NOT ANDROID)
|
|
||||||
set(FFmpeg_HWACCEL_INCLUDE_DIRS)
|
|
||||||
set(FFmpeg_HWACCEL_LDFLAGS)
|
|
||||||
|
|
||||||
- # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
|
|
||||||
- if(PLATFORM_SUN)
|
|
||||||
- list(APPEND FFmpeg_HWACCEL_LIBRARIES
|
|
||||||
- X11
|
|
||||||
- "/usr/lib/xorg/amd64/libdrm.so")
|
|
||||||
- else()
|
|
||||||
- pkg_check_modules(LIBDRM libdrm REQUIRED)
|
|
||||||
- list(APPEND FFmpeg_HWACCEL_LIBRARIES
|
|
||||||
- ${LIBDRM_LIBRARIES})
|
|
||||||
- list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
|
|
||||||
- ${LIBDRM_INCLUDE_DIRS})
|
|
||||||
+ if (NOT APPLE)
|
|
||||||
+ # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
|
|
||||||
+ if(PLATFORM_SUN)
|
|
||||||
+ list(APPEND FFmpeg_HWACCEL_LIBRARIES
|
|
||||||
+ X11
|
|
||||||
+ "/usr/lib/xorg/amd64/libdrm.so")
|
|
||||||
+ else()
|
|
||||||
+ pkg_check_modules(LIBDRM libdrm REQUIRED)
|
|
||||||
+ list(APPEND FFmpeg_HWACCEL_LIBRARIES
|
|
||||||
+ ${LIBDRM_LIBRARIES})
|
|
||||||
+ list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
|
|
||||||
+ ${LIBDRM_INCLUDE_DIRS})
|
|
||||||
+ endif()
|
|
||||||
+ list(APPEND FFmpeg_HWACCEL_FLAGS
|
|
||||||
+ --enable-libdrm)
|
|
||||||
endif()
|
|
||||||
- list(APPEND FFmpeg_HWACCEL_FLAGS
|
|
||||||
- --enable-libdrm)
|
|
||||||
|
|
||||||
if(LIBVA_FOUND)
|
|
||||||
find_package(X11 REQUIRED)
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
/* This file is part of the dynarmic project.
|
/* This file is part of the dynarmic project.
|
||||||
* Copyright (c) 2018 MerryMage
|
* Copyright (c) 2018 MerryMage
|
||||||
* SPDX-License-Identifier: 0BSD
|
* SPDX-License-Identifier: 0BSD
|
||||||
|
@ -19,6 +22,16 @@
|
||||||
|
|
||||||
namespace Dynarmic::Common {
|
namespace Dynarmic::Common {
|
||||||
|
|
||||||
|
// prevents this function from printing 56,000 character warning messages
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wno-stack-usage"
|
||||||
|
#endif
|
||||||
|
#ifdef __clang__
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wno-stack-usage"
|
||||||
|
#endif
|
||||||
|
|
||||||
template<typename Function, typename... Values>
|
template<typename Function, typename... Values>
|
||||||
inline auto GenerateLookupTableFromList(Function f, mcl::mp::list<Values...>) {
|
inline auto GenerateLookupTableFromList(Function f, mcl::mp::list<Values...>) {
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
@ -34,4 +47,11 @@ inline auto GenerateLookupTableFromList(Function f, mcl::mp::list<Values...>) {
|
||||||
return MapT(pair_array.begin(), pair_array.end());
|
return MapT(pair_array.begin(), pair_array.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
#ifdef __clang__
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
} // namespace Dynarmic::Common
|
} // namespace Dynarmic::Common
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue