From 9bc62bcffb02dae1a10b0e969ee6db52390d7743 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Thu, 18 Dec 2025 16:09:23 +0100 Subject: [PATCH] srt: upgrade 1.4.4 -> 1.5.4 Release notes: 1.5.4: https://github.com/Haivision/srt/releases/tag/v1.5.4 1.5.3: https://github.com/Haivision/srt/releases/tag/v1.5.3 1.5.2: https://github.com/Haivision/srt/releases/tag/v1.5.2 1.5.1: https://github.com/Haivision/srt/releases/tag/v1.5.1 1.5.0: https://github.com/Haivision/srt/releases/tag/v1.5.0 Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- .../srt/0001-don-t-install-srt-ffplay.patch | 22 ++++++++++++++----- .../srt/0002-allow-build-with-cmake-4.patch | 2 +- .../srt/{srt_1.4.4.bb => srt_1.5.4.bb} | 4 ++-- 3 files changed, 20 insertions(+), 8 deletions(-) rename meta-multimedia/recipes-support/srt/{srt_1.4.4.bb => srt_1.5.4.bb} (93%) diff --git a/meta-multimedia/recipes-support/srt/srt/0001-don-t-install-srt-ffplay.patch b/meta-multimedia/recipes-support/srt/srt/0001-don-t-install-srt-ffplay.patch index 5b76b16328..cb211655df 100644 --- a/meta-multimedia/recipes-support/srt/srt/0001-don-t-install-srt-ffplay.patch +++ b/meta-multimedia/recipes-support/srt/srt/0001-don-t-install-srt-ffplay.patch @@ -10,6 +10,9 @@ So remove it because there are no option to disable the instalation. Upstream-Status: Pending Signed-off-by: Jose Quaresma + +Rebased on latest version. +Signed-off-by: Gyorgy Sarvari --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) @@ -18,11 +21,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index ed6e603..ef53dc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1224,7 +1224,6 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11) +@@ -1548,16 +1548,6 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11) + enable_testing() endif() - --install(PROGRAMS scripts/srt-ffplay DESTINATION ${CMAKE_INSTALL_BINDIR}) - - +- +-if(NOT NEED_DESTINATION) +- install(PROGRAMS scripts/srt-ffplay TYPE BIN) +-elseif (DEFINED CMAKE_INSTALL_BINDIR) +- install(PROGRAMS scripts/srt-ffplay DESTINATION ${CMAKE_INSTALL_BINDIR}) +-else() +- message(WARNING "No location to install scripts/srt-ffplay") +-endif() +- +- if (DEFINED SRT_EXTRA_APPS_INC) + include(${SRT_EXTRA_APPS_INC}.cmake) + # No extra variables expected. Just use the variables diff --git a/meta-multimedia/recipes-support/srt/srt/0002-allow-build-with-cmake-4.patch b/meta-multimedia/recipes-support/srt/srt/0002-allow-build-with-cmake-4.patch index ba281a3a53..8c91e3919b 100644 --- a/meta-multimedia/recipes-support/srt/srt/0002-allow-build-with-cmake-4.patch +++ b/meta-multimedia/recipes-support/srt/srt/0002-allow-build-with-cmake-4.patch @@ -35,7 +35,7 @@ index 328a433f..448d6254 100644 -cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +cmake_minimum_required (VERSION 3.5 FATAL_ERROR) - set (SRT_VERSION 1.4.4) + set (SRT_VERSION 1.5.4) set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/scripts") -- diff --git a/meta-multimedia/recipes-support/srt/srt_1.4.4.bb b/meta-multimedia/recipes-support/srt/srt_1.5.4.bb similarity index 93% rename from meta-multimedia/recipes-support/srt/srt_1.4.4.bb rename to meta-multimedia/recipes-support/srt/srt_1.5.4.bb index e72a36f657..72e9ff658d 100644 --- a/meta-multimedia/recipes-support/srt/srt_1.4.4.bb +++ b/meta-multimedia/recipes-support/srt/srt_1.5.4.bb @@ -6,8 +6,8 @@ HOMEPAGE = "https://github.com/Haivision/srt" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" -SRCREV = "8b32f3734ff6af7cc7b0fef272591cb80a2d1aae" -SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master \ +SRCREV = "a8c6b65520f814c5bd8f801be48c33ceece7c4a6" +SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master;tag=v${PV} \ file://0001-don-t-install-srt-ffplay.patch \ file://0002-allow-build-with-cmake-4.patch \ "