[qt5-multimedia] fix xcode 15 build (#34418)

2024-11-28 01:48:59 +08:00 · 2023-10-13 05:52:45 +02:00 · 2023-10-13 05:52:45 +02:00 · 8007fc4dff
commit 8007fc4dff
parent b90d191914
5 changed files with 20 additions and 2 deletions
--- a/ports/qt5-multimedia/portfile.cmake
+++ b/ports/qt5-multimedia/portfile.cmake
@ -1,2 +1,2 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation()
+qt_submodule_installation(PATCHES xcode15.patch)
--- a/ports/qt5-multimedia/vcpkg.json
+++ b/ports/qt5-multimedia/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "qt5-multimedia",
  "version": "5.15.11",
+  "port-version": 1,
  "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality",
  "license": null,
  "dependencies": [
--- a/ports/qt5-multimedia/xcode15.patch
+++ b/ports/qt5-multimedia/xcode15.patch
@ -0,0 +1,12 @@
+diff -ur a/src/plugins/avfoundation/camera/avfcamerautility.mm b/src/plugins/avfoundation/camera/avfcamerautility.mm
+--- a/src/plugins/avfoundation/camera/avfcamerautility.mm	2023-04-01 11:51:14.736887185 -0400
+++ b/src/plugins/avfoundation/camera/avfcamerautility.mm	2023-04-01 11:54:19.979498301 -0400
+@@ -101,7 +101,7 @@
+     }
+ };
+ 
+-struct FormatHasNoFPSRange : std::unary_function<AVCaptureDeviceFormat *, bool>
+struct FormatHasNoFPSRange
+ {
+     bool operator() (AVCaptureDeviceFormat *format)
+     {
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -6834,7 +6834,7 @@
    },
    "qt5-multimedia": {
      "baseline": "5.15.11",
-      "port-version": 0
+      "port-version": 1
    },
    "qt5-networkauth": {
      "baseline": "5.15.11",
--- a/versions/q-/qt5-multimedia.json
+++ b/versions/q-/qt5-multimedia.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "e4c6f73398cdab1711339020a1dfe0630e0f89c4",
+      "version": "5.15.11",
+      "port-version": 1
+    },
    {
      "git-tree": "3c3d01a70310ae2d017d0e08428b1902c45b872f",
      "version": "5.15.11",