colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #306866 from seanybaggins/fix-mingw-support-qtmultimedia

This commit is contained in:
Sandro 2024-04-26 14:08:44 +02:00 committed by GitHub
parent 5bba64751f a83bb5b50a
commit 6d5a3ac5bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
View File

@ -37,7 +37,9 @@ qtModule {
++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ];
patches = lib.optionals stdenv.hostPlatform.isMinGW [
patches = [
../patches/fix-qtgui-include-incorrect-case.patch
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
../patches/qtmultimedia-windows-no-uppercase-libs.patch
../patches/qtmultimedia-windows-resolve-function-name.patch
];

13
pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
index affa52d..b71b461 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
@@ -7,7 +7,7 @@
#include <private/qabstractvideobuffer_p.h>
#include <private/qmultimediautils_p.h>
#include <private/qwindowsmultimediautils_p.h>
-#include <qtgui/qscreen_platform.h>
+#include <QtGui/qscreen_platform.h>
#include "qvideoframe.h"
#include <qloggingcategory.h>