push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,77 @@
{
qtModule,
lib,
stdenv,
qtbase,
qtdeclarative,
qtquick3d,
qtshadertools,
qtsvg,
pkg-config,
alsa-lib,
gstreamer,
gst-plugins-bad,
gst-plugins-base,
gst-plugins-good,
gst-libav,
gst-vaapi,
ffmpeg,
libva,
libpulseaudio,
pipewire,
wayland,
libXrandr,
elfutils,
libunwind,
orc,
pkgsBuildBuild,
}:
qtModule {
pname = "qtmultimedia";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
ffmpeg
]
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
libunwind
orc
]
++ lib.optionals stdenv.hostPlatform.isLinux [
libpulseaudio
pipewire
alsa-lib
wayland
libXrandr
libva
]
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ];
propagatedBuildInputs = [
qtbase
qtdeclarative
qtsvg
qtshadertools
]
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ qtquick3d ]
++ lib.optionals stdenv.hostPlatform.isLinux [
gstreamer
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-libav
gst-vaapi
];
patches = lib.optionals stdenv.hostPlatform.isMinGW [
./windows-no-uppercase-libs.patch
./windows-resolve-function-name.patch
];
cmakeFlags = [
"-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0"
"-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderToolsTools"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-include AudioToolbox/AudioToolbox.h";
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AudioToolbox";
}

View File

@@ -0,0 +1,11 @@
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
@@ -14,7 +14,7 @@
#include <qwaitcondition.h>
#include <qmutex.h>
-#include "D3d11.h"
+#include "d3d11.h"
#include "dxgi1_2.h"
#include <system_error>

View File

@@ -0,0 +1,28 @@
--- a/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp
+++ b/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp
@@ -42,11 +42,7 @@ static QString windowTitle(HWND hwnd) {
return QString::fromStdWString(buffer);
}
-QList<QCapturableWindow> QWinCapturableWindows::windows() const
-{
- QList<QCapturableWindow> result;
-
- auto windowHandler = [](HWND hwnd, LPARAM lParam) {
+static int __stdcall windowHandler(HWND hwnd, LPARAM lParam) {
if (!canCaptureWindow(hwnd))
return TRUE; // Ignore window and continue enumerating
@@ -58,7 +54,11 @@ QList<QCapturableWindow> QWinCapturableWindows::windows() const
windows.push_back(windowData.release()->create());
return TRUE;
- };
+}
+
+QList<QCapturableWindow> QWinCapturableWindows::windows() const
+{
+ QList<QCapturableWindow> result;
::EnumWindows(windowHandler, reinterpret_cast<LPARAM>(&result));