[vlc-commits] [Git][videolan/vlc][master] contrib: srt: update to 1.5.2

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
2e741d95 by Johannes Kauffmann at 2023-08-01T11:52:12+00:00
contrib: srt: update to 1.5.2

- - - - -


4 changed files:

- − contrib/src/srt/0001-build-always-use-GNUInstallDirs.patch
- − contrib/src/srt/0001-core-remove-MSG_TRUNC-logging.patch
- contrib/src/srt/SHA512SUMS
- contrib/src/srt/rules.mak


Changes:

=====================================
contrib/src/srt/0001-build-always-use-GNUInstallDirs.patch deleted
=====================================
@@ -1,41 +0,0 @@
-From e76d61dae5af710317a919f867b9b7a58adf6a39 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Fri, 2 Sep 2022 09:46:56 +0200
-Subject: [PATCH] [build] always use GNUInstallDirs
-
-It's possible to use GNUInstallDirs and allow the user to force some specific
-target folder. The values set by the user are not overriden in that case [1]:
-
-> If the includer does not define a value the above-shown default will be used
-> and the value will appear in the cache for editing by the user.
-
-With MSVC builds this doesn't change the default values used to install targets.
-
-[1] https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
----
- CMakeLists.txt | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ce3d0b8..05764e2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,14 +45,7 @@ set_if(POSIX       LINUX OR DARWIN OR BSD OR SUNOS OR ANDROID OR (CYGWIN AND CYG
- set_if(SYMLINKABLE LINUX OR DARWIN OR BSD OR SUNOS OR CYGWIN OR GNU)
- set_if(NEED_DESTINATION  ${CMAKE_VERSION} VERSION_LESS "3.14.0")
- 
--# Not sure what to do in case of compiling by MSVC.
--# This will make installdir in C:\Program Files\SRT then
--# inside "bin" and "lib64" directories. At least this maintains
--# the current status. Shall this be not desired, override values
--# of CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR.
--if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
--	include(GNUInstallDirs)
--endif()
-+include(GNUInstallDirs)
- 
- # The CMAKE_BUILD_TYPE seems not to be always set, weird.
- if (NOT DEFINED ENABLE_DEBUG)
--- 
-2.37.3.windows.1
-


=====================================
contrib/src/srt/0001-core-remove-MSG_TRUNC-logging.patch deleted
=====================================
@@ -1,27 +0,0 @@
-From 82a65778b2445d3b310c7fa870cfb6410307d31b Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Fri, 2 Sep 2022 09:12:03 +0200
-Subject: [PATCH] [core] remove MSG_TRUNC logging
-
-The code does not compile on platforms/SDKs where MSG_TRUNC doesn't exist
-(mingw-w64/windows).
----
- srtcore/channel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/srtcore/channel.cpp b/srtcore/channel.cpp
-index 6d51487..30fd987 100644
---- a/srtcore/channel.cpp
-+++ b/srtcore/channel.cpp
-@@ -878,7 +878,7 @@ srt::EReadStatus srt::CChannel::recvfrom(sockaddr_any& w_addr, CPacket& w_packet
-     {
-         HLOGC(krlog.Debug,
-               log << CONID() << "NET ERROR: packet size=" << recv_size << " msg_flags=0x" << hex << msg_flags
--                  << ", possibly MSG_TRUNC (0x" << hex << int(MSG_TRUNC) << ")");
-+                  << ", possibly MSG_TRUNC)");
-         status = RST_AGAIN;
-         goto Return_error;
-     }
--- 
-2.27.0.windows.1
-


=====================================
contrib/src/srt/SHA512SUMS
=====================================
@@ -1 +1 @@
-0d51e0ef73f4aa7eb284288cdbbd75b1c161969c2c2fed3a6d4e13a931341ca41dfcf2d6c1b9728f72b43454a9fde3764da67a27af9f0c99a6818682e4f4d4ba  srt-1.4.4.tar.gz
+1b386e7564c4843cdd8138a2953cb539a37f0990eb4526d872e7839d528551f27112c3d5bb0e6467dac1684668968e787c67600b189120aa68b90c5d5e03b85a  srt-1.5.2.tar.gz


=====================================
contrib/src/srt/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # srt
 
-SRT_VERSION := 1.4.4
+SRT_VERSION := 1.5.2
 SRT_URL := $(GITHUB)/Haivision/srt/archive/v$(SRT_VERSION).tar.gz
 
 # gnutls (nettle/gmp) can't be used with the LGPLv2 license
@@ -35,8 +35,6 @@ $(TARBALLS)/srt-$(SRT_VERSION).tar.gz:
 
 srt: srt-$(SRT_VERSION).tar.gz .sum-srt
 	$(UNPACK)
-	$(APPLY) $(SRC)/srt/0001-core-remove-MSG_TRUNC-logging.patch
-	$(APPLY) $(SRC)/srt/0001-build-always-use-GNUInstallDirs.patch
 	$(call pkg_static,"scripts/srt.pc.in")
 	mv srt-$(SRT_VERSION) $@ && touch $@
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2e741d956d39ec261c078c1379fdd51603a1a501

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2e741d956d39ec261c078c1379fdd51603a1a501
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance