From 3b64d027cf6e87b8de24bdeb842b122a0118552a Mon Sep 17 00:00:00 2001
From: Jose Quaresma <quaresma.jose@gmail.com>
Date: Sun, 3 Apr 2022 19:01:02 +0100
Subject: srt: 1.4.2 -> 1.4.3

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-core-Fix-build-with-GCC-11.-1806.patch    | 26 --------------------
 meta-multimedia/recipes-support/srt/srt_1.4.2.bb   | 28 ----------------------
 meta-multimedia/recipes-support/srt/srt_1.4.3.bb   | 27 +++++++++++++++++++++
 3 files changed, 27 insertions(+), 54 deletions(-)
 delete mode 100644 meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
 delete mode 100644 meta-multimedia/recipes-support/srt/srt_1.4.2.bb
 create mode 100644 meta-multimedia/recipes-support/srt/srt_1.4.3.bb

(limited to 'meta-multimedia')

diff --git a/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch b/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
deleted file mode 100644
index 0cb6943ccb..0000000000
--- a/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-multimedia/recipes-support/srt/srt_1.4.2.bb b/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
deleted file mode 100644
index 5b5c1f24d9..0000000000
--- a/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Secure Reliable Transport (SRT) Protocol"
-DESCRIPTION = "Secure Reliable Transport (SRT) is an open source transport technology \
-that optimizes streaming performance across unpredictable networks, such as the Internet."
-SECTION = "libs"
-HOMEPAGE = "https://github.com/Haivision/srt"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
-
-SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036"
-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"
-
-inherit cmake pkgconfig
-
-EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DENABLE_UNITTESTS=OFF"
-
-PACKAGECONFIG ??= "crypt"
-PACKAGECONFIG[debug] = "-DENABLE_DEBUG=1,,"
-PACKAGECONFIG[crypt] = "-DENABLE_ENCRYPTION=ON,-DENABLE_ENCRYPTION=OFF,openssl"
-PACKAGECONFIG[utils] = "-DENABLE_APPS=ON,-DENABLE_APPS=OFF,"
-
-PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'utils', '${PN}-utils', '', d)}"
-FILES:${PN}-utils += "${bindir}"
-RDEPENDS:${PN}-utils += "${PN}"
diff --git a/meta-multimedia/recipes-support/srt/srt_1.4.3.bb b/meta-multimedia/recipes-support/srt/srt_1.4.3.bb
new file mode 100644
index 0000000000..9dc862c57b
--- /dev/null
+++ b/meta-multimedia/recipes-support/srt/srt_1.4.3.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Secure Reliable Transport (SRT) Protocol"
+DESCRIPTION = "Secure Reliable Transport (SRT) is an open source transport technology \
+that optimizes streaming performance across unpredictable networks, such as the Internet."
+SECTION = "libs"
+HOMEPAGE = "https://github.com/Haivision/srt"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
+
+SRCREV = "291e010fbf91b13b92e1cde5dcb824a9d7f4e353"
+SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master \
+           file://0001-don-t-install-srt-ffplay.patch \
+           "
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
+S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DENABLE_UNITTESTS=OFF"
+
+PACKAGECONFIG ??= "crypt"
+PACKAGECONFIG[debug] = "-DENABLE_DEBUG=1,,"
+PACKAGECONFIG[crypt] = "-DENABLE_ENCRYPTION=ON,-DENABLE_ENCRYPTION=OFF,openssl"
+PACKAGECONFIG[utils] = "-DENABLE_APPS=ON,-DENABLE_APPS=OFF,"
+
+PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'utils', '${PN}-utils', '', d)}"
+FILES:${PN}-utils += "${bindir}"
+RDEPENDS:${PN}-utils += "${PN}"
-- 
cgit v1.2.3-54-g00ecf