merge fix

.github/actions/create-universal/action.yml

@@ -65,7 +65,7 @@ runs:
         for file (**/*(.)) {
           magic=$(xxd -ps -l 4 ${file})
 
-          if [[ ${magic} == "cffaedfe" ]] fixups+=(${file})
+          if [[ ${magic} == "cffaedfe" || ${magic} == "213c6172" ]] fixups+=(${file})
         }
 
         for file (${fixups}) {

deps.ffmpeg/60-mbedtls.zsh

@@ -3,15 +3,15 @@ autoload -Uz log_debug log_error log_info log_status log_output
 ## Dependency Information
 local name='mbedtls'
 local -A versions=(
-  macos 3.3.0
-  linux 3.3.0
-  windows 3.3.0
+  macos 3.2.1
+  linux 3.2.1
+  windows 3.2.1
 )
 local url='https://github.com/Mbed-TLS/mbedtls.git'
 local -A hashes=(
-  macos 8c89224991adff88d53cd380f42a2baa36f91454
-  linux 8c89224991adff88d53cd380f42a2baa36f91454
-  windows 8c89224991adff88d53cd380f42a2baa36f91454
+  macos 869298bffeea13b205343361b7a7daf2b210e33d
+  linux 869298bffeea13b205343361b7a7daf2b210e33d
+  windows 869298bffeea13b205343361b7a7daf2b210e33d
 )
 local -a patches=(
   "macos ${0:a:h}/patches/mbedtls/0001-enable-posix-threading-support.patch \

deps.ffmpeg/99-ffmpeg.zsh

@@ -4,10 +4,12 @@ autoload -Uz log_debug log_error log_info log_status log_output
 local name='FFmpeg'
 local version='6.0'
 local url='https://github.com/FFmpeg/FFmpeg.git'
-local hash='ea3d24bbe3c58b171e55fe2151fc7ffaca3ab3d2'
+local hash='a6dc92968a325d331bb6dcf9b3b2248026cd1d6c'
 local -a patches=(
-  "* ${0:a:h}/patches/FFmpeg/0001-FFmpeg-6.0-OBS.patch \
-    7fcb67d5e68a6ca3102c3a6aaba56750b22850552ccd8704c6636c174968ef56"
+  "* ${0:a:h}/patches/FFmpeg/0001-flvdec-handle-unknown.patch \
+    5a5185f54cbcf4672763cce687d1b6ddb662549b69637da826279ce4797f57ef"
+  "* ${0:a:h}/patches/FFmpeg/0002-libaomenc-presets.patch \
+    d5f1410efb31fe31e8e905ec3f10ccb7841dd5594cb3591c3b205e77232fd183"
   "* ${0:a:h}/patches/FFmpeg/0004-FFmpeg-5.0.1-cuvid.patch \
     d44609a43f7f09819c74cdfa6fa90c9a1de61b3673aa95e87a294c259f203717"
 )

deps.ffmpeg/patches/FFmpeg/0001-flvdec-handle-unknown.patch

@@ -0,0 +1,11 @@
+--- ./libavformat/flvdec.c	2021-10-24 22:47:07.000000000 +0200
++++ ./libavformat/flvdec.c	2021-11-08 13:13:47.000000000 +0100
+@@ -1077,7 +1077,7 @@
+             int type;
+             meta_pos = avio_tell(s->pb);
+             type = flv_read_metabody(s, next);
+-            if (type == 0 && dts == 0 || type < 0) {
++            if (type == 0 && dts == 0 || type < 0 || type == TYPE_UNKNOWN) {
+                 if (type < 0 && flv->validate_count &&
+                     flv->validate_index[0].pos     > next &&
+                     flv->validate_index[0].pos - 4 < next) {

deps.ffmpeg/patches/FFmpeg/0001-FFmpeg-6.0-OBS.patch → deps.ffmpeg/patches/FFmpeg/0002-libaomenc-presets.patch

@@ -1,14 +1,3 @@
---- ./libavformat/flvdec.c	2021-10-24 22:47:07.000000000 +0200
-+++ ./libavformat/flvdec.c	2021-11-08 13:13:47.000000000 +0100
-@@ -1077,7 +1077,7 @@
-             int type;
-             meta_pos = avio_tell(s->pb);
-             type = flv_read_metabody(s, next);
--            if (type == 0 && dts == 0 || type < 0) {
-+            if (type == 0 && dts == 0 || type < 0 || type == TYPE_UNKNOWN) {
-                 if (type < 0 && flv->validate_count &&
-                     flv->validate_index[0].pos     > next &&
-                     flv->validate_index[0].pos - 4 < next) {
 --- ./libavcodec/libaomenc.c  2021-10-24 22:47:07.000000000 +0200
 +++ ./libavcodec/libaomenc.c  2021-11-08 13:15:54.000000000 +0100
 @@ -1337,7 +1337,7 @@

deps.qt/patches/Qt6/mac/0002-QTBUG-56064.patch

@@ -0,0 +1,30 @@
+From 9f44553b3d297f7a423c51451c4e18c0e5a25d19 Mon Sep 17 00:00:00 2001
+From: Sebastian Beckmann <[email protected]>
+Date: Wed, 29 Mar 2023 04:20:38 +0200
+Subject: [PATCH] QComboBox: Disable items marked as disabled in native popups
+
+Fixes: QTBUG-56064
+Pick-to: 6.5 6.2 5.15
+Change-Id: I00a17a19b4c14c874e16ec863e794218f0570346
+Reviewed-by: Volker Hilsheimer <[email protected]>
+---
+ a/qtbase/src/widgets/widgets/qcombobox.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/qtbase/src/widgets/widgets/qcombobox.cpp b/qtbase/src/widgets/widgets/qcombobox.cpp
+index 80206b24acb..7c99e8983c6 100644
+--- a/qtbase/src/widgets/widgets/qcombobox.cpp
++++ b/qtbase/src/widgets/widgets/qcombobox.cpp
+@@ -2501,10 +2501,12 @@ bool QComboBoxPrivate::showNativePopup()
+         QVariant textVariant = model->data(rowIndex, Qt::EditRole);
+         item->setText(textVariant.toString());
+         QVariant iconVariant = model->data(rowIndex, Qt::DecorationRole);
++        const Qt::ItemFlags itemFlags = model->flags(rowIndex);
+         if (iconVariant.canConvert<QIcon>())
+             item->setIcon(iconVariant.value<QIcon>());
+         item->setCheckable(true);
+         item->setChecked(i == currentIndex);
++        item->setEnabled(itemFlags & Qt::ItemIsEnabled);
+         if (!currentItem || i == currentIndex)
+             currentItem = item;
+

deps.qt/qt6.zsh

@@ -8,6 +8,8 @@ local hash="${0:a:h}/checksums"
 local -a patches=(
   "macos ${0:a:h}/patches/Qt6/mac/0001-QTBUG-106369.patch \
     f96ce8408b03e752708c606df10d6473aeed78843a6acb0a90c05f0a9fc913af"
+  "macos ${0:a:h}/patches/Qt6/mac/0002-QTBUG-56064.patch \
+    08a2e4f384d21e169d6ddb6e37084bc8b8701bb3e6a675b76843784a88250ad7"
 )
 
 local -a qt_components=(

deps.windows/30-speexdsp.ps1

@@ -6,7 +6,7 @@ param(
     [array] $Patches = @(
         @{
             PatchFile = "${PSScriptRoot}/patches/speexdsp/0001-Add-CMakeLists.patch"
-            HashSum = 'a7e625bdf83fea2c0d0a215e7e04a44c0ac0f892217895481723e33e0008ba18'
+            HashSum = 'e8814dbc5683ce6a3c70553147fbdca92b74aab45ceb06e0040127754fe991c5'
         }
     )
 )

deps.windows/patches/speexdsp/0001-Add-CMakeLists.patch

@@ -1,6 +1,6 @@
---- null       			   2022-11-22 18:00:00.000000000 -0500
-+++ ./CMakeLists.txt       2022-11-22 18:00:00.000000000 -0500
-@@ -0,0 +1,90 @@
+--- null       			   2023-03-24 18:30:00.000000000 -0400
++++ ./CMakeLists.txt       2023-03-24 18:30:00.000000000 -0400
+@@ -0,0 +1,83 @@
 +cmake_minimum_required(VERSION 3.16)
 +
 +project(speexdsp)
@@ -79,13 +79,6 @@
 +            "include"
 +    )
 +
-+    include(CheckIPOSupported)
-+    check_ipo_supported(RESULT HasIPOSupport)
-+    if(HasIPOSupport)
-+        set_target_properties(speexdsp PROPERTIES
-+            INTERPROCEDURAL_OPTIMIZATION ON)
-+    endif()
-+
 +    install(TARGETS speexdsp
 +        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 +        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/speex"