mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 20:07:25 +00:00
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 <skandigraun@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -10,6 +10,9 @@ So remove it because there are no option to disable the instalation.
|
|||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
|
|
||||||
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
||||||
|
|
||||||
|
Rebased on latest version.
|
||||||
|
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
|
||||||
---
|
---
|
||||||
CMakeLists.txt | 1 -
|
CMakeLists.txt | 1 -
|
||||||
1 file changed, 1 deletion(-)
|
1 file changed, 1 deletion(-)
|
||||||
@@ -18,11 +21,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|||||||
index ed6e603..ef53dc5 100644
|
index ed6e603..ef53dc5 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/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()
|
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)
|
if (DEFINED SRT_EXTRA_APPS_INC)
|
||||||
|
include(${SRT_EXTRA_APPS_INC}.cmake)
|
||||||
|
# No extra variables expected. Just use the variables
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ index 328a433f..448d6254 100644
|
|||||||
|
|
||||||
-cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
|
-cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
|
||||||
+cmake_minimum_required (VERSION 3.5 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")
|
set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
|
||||||
--
|
--
|
||||||
|
|||||||
+2
-2
@@ -6,8 +6,8 @@ HOMEPAGE = "https://github.com/Haivision/srt"
|
|||||||
LICENSE = "MPL-2.0"
|
LICENSE = "MPL-2.0"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
|
||||||
|
|
||||||
SRCREV = "8b32f3734ff6af7cc7b0fef272591cb80a2d1aae"
|
SRCREV = "a8c6b65520f814c5bd8f801be48c33ceece7c4a6"
|
||||||
SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master \
|
SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master;tag=v${PV} \
|
||||||
file://0001-don-t-install-srt-ffplay.patch \
|
file://0001-don-t-install-srt-ffplay.patch \
|
||||||
file://0002-allow-build-with-cmake-4.patch \
|
file://0002-allow-build-with-cmake-4.patch \
|
||||||
"
|
"
|
||||||
Reference in New Issue
Block a user