mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-14 09:02:26 +02:00
dd83e4cf9c
* Allow building multiple with display backends. * Allow building with openjdk-21. * Skip TestDateTime for 32-bit arches comphensively. * Explicitly list licenses for vendored dependencies. * Fix system-ffmpeg Bug: https://bugs.gentoo.org/779184 Signed-off-by: Alfred Wingate <parona@protonmail.com> Signed-off-by: Sam James <sam@gentoo.org>
14 lines
549 B
Diff
14 lines
549 B
Diff
--- a/tools/depends/target/ffmpeg/CMakeLists.txt
|
|
+++ b/tools/depends/target/ffmpeg/CMakeLists.txt
|
|
@@ -74,6 +74,11 @@ if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
|
|
else()
|
|
list(APPEND ffmpeg_conf --disable-vdpau)
|
|
endif()
|
|
+ if ("x11" IN_LIST CORE_PLATFORM_NAME_LC)
|
|
+ list(APPEND ffmpeg_conf --enable-xlib)
|
|
+ else()
|
|
+ list(APPEND ffmpeg_conf --disable-xlib)
|
|
+ endif()
|
|
elseif(CORE_SYSTEM_NAME STREQUAL android)
|
|
list(APPEND ffmpeg_conf --target-os=android
|
|
--extra-libs=-liconv
|