qt6Packages.qtmultimedia: drop upstreamed patch

2025-06-11 18:05:24 -07:00
parent 2cacd479ff
commit ed818ad52a
2 changed files with 4 additions and 19 deletions
@@ -62,14 +62,10 @@ qtModule {
      gst-vaapi
    ];

-  patches =
-    [
-      ./fix-qtgui-include-incorrect-case.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      ./windows-no-uppercase-libs.patch
-      ./windows-resolve-function-name.patch
-    ];
+  patches = lib.optionals stdenv.hostPlatform.isMinGW [
+    ./windows-no-uppercase-libs.patch
+    ./windows-resolve-function-name.patch
+  ];

  cmakeFlags = [
    "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0"
@@ -1,11 +0,0 @@
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
-+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
-@@ -7,7 +7,7 @@
- #include <private/qmultimediautils_p.h>
- #include <private/qwindowsmultimediautils_p.h>
- #include <private/qvideoframe_p.h>
-#include <qtgui/qscreen_platform.h>
-+#include <QtGui/qscreen_platform.h>
- #include "qvideoframe.h"
- 
- #include <qloggingcategory.h>