diff options
| author | Sean Link <sean.link@lightdeckdx.com> | 2024-04-25 14:11:20 -0600 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-04-26 13:23:28 +0200 |
| commit | a83bb5b50a74d2ddfd93d80e7db61cd8d717f26e (patch) | |
| tree | d5a8ebc921521153568837d60fc00f8746cb268c /pkgs | |
| parent | 3aee40c13960bf8df16c705ab59e1ecdc43ca8fb (diff) | |
qt6.qtmultimedia: fix mingw support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtmultimedia.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 4045a55f6d6e9..ba24fbe9294b3 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -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 ]; diff --git a/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch b/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch new file mode 100644 index 0000000000000..563906fb31573 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch @@ -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> |