From ed818ad52af5c4b8b674fd4883f002cf82189d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Jun 2025 18:02:32 -0700 Subject: [PATCH] qt6Packages.qtmultimedia: drop upstreamed patch --- .../libraries/qt-6/modules/qtmultimedia/default.nix | 12 ++++-------- .../fix-qtgui-include-incorrect-case.patch | 11 ----------- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix index e9ba5ff9c570..e053ca90336c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix @@ -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" diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch b/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch deleted file mode 100644 index c67fde93498b..000000000000 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch +++ /dev/null @@ -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 - #include - #include --#include -+#include - #include "qvideoframe.h" - - #include