3 files changed, 4 insertions, 31 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
index 218a51fc48..14d09e5f0b 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
@@ -4,9 +4,9 @@ SECTION = "libs/multimedia"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
 
-SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https"
-SRCREV = "6c807bdd37748411801e93c48fcd5789d5a6a278"
+SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.2.x;protocol=https"
+SRCREV = "8b00644751578ba67b709a827cbe5133d849d339"
 S = "${WORKDIR}/git"
-PV = "2.2.4"
+PV = "2.2.6"
 
 inherit cmake pkgconfig lib_package
diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch b/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
deleted file mode 100644
index 0cb6943ccb..0000000000
--- a/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <krop@users.noreply.github.com>
-Date: Wed, 10 Feb 2021 12:42:45 +0000
-Subject: [PATCH] [core] Fix build with GCC 11. (#1806)
-
-The 'limits' header must be included explicitly.
----
-Upstream-Status: Backport [https://github.com/haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c]
- srtcore/sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/srtcore/sync.h b/srtcore/sync.h
-index 59c125a7..9f01ca91 100644
---- a/srtcore/sync.h
-+++ b/srtcore/sync.h
-@@ -15,6 +15,7 @@
- //#define ENABLE_CXX17
- 
- #include <cstdlib>
-+#include <limits>
- #ifdef ENABLE_STDCXX_SYNC
- #include <chrono>
- #include <thread>
--- 
-2.30.1
-
diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.4.bb
index 5b5c1f24d9..d6cf36dfbe 100644
--- a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
+++ b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.4.bb
@@ -6,10 +6,9 @@ HOMEPAGE = "https://github.com/Haivision/srt"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
 
-SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036"
+SRCREV = "8b32f3734ff6af7cc7b0fef272591cb80a2d1aae"
 SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master \
            file://0001-don-t-install-srt-ffplay.patch \
-           file://0001-core-Fix-build-with-GCC-11.-1806.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"