Merge branch 'master' into el8

0001-Add-missing-include-limits-to-file-using-std.patch

@@ -1,76 +0,0 @@
-From 804aacea64e2b83f7434efd3c11dbca2eb7fa80b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
-Date: Mon, 14 Dec 2020 12:54:39 +0100
-Subject: [PATCH] Add missing include <limits> to file using std::
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-numeric_limits<uint64_t>::max()
-
-Compilation would fail with:
-
-> error: 'numeric_limits' is not a member of 'std'
-
-without this include because of some hardening build
-flags mandated on Fedora Linux, with GCC 11.
-
-Fix: #25325
-
-Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
----
- modules/demux/adaptive/playlist/Inheritables.cpp       | 1 +
- modules/demux/adaptive/playlist/SegmentInformation.cpp | 1 +
- modules/demux/adaptive/playlist/SegmentTimeline.cpp    | 1 +
- modules/demux/hls/playlist/Parser.cpp                  | 1 +
- modules/demux/mkv/matroska_segment.cpp                 | 1 +
- modules/demux/mkv/mkv.cpp                              | 1 +
- 6 files changed, 6 insertions(+)
-
-diff -up vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/adaptive/playlist/SegmentInformation.cpp.orig vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/adaptive/playlist/SegmentInformation.cpp
---- vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/adaptive/playlist/SegmentInformation.cpp.orig	2020-10-27 09:16:09.000000000 +0100
-+++ vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/adaptive/playlist/SegmentInformation.cpp	2020-12-14 19:34:41.600005319 +0100
-@@ -34,6 +34,7 @@
-
- #include <algorithm>
- #include <cassert>
-+#include <limits>
-
- using namespace adaptive::playlist;
-
-diff -up vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/hls/playlist/Parser.cpp.orig vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/hls/playlist/Parser.cpp
---- vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/hls/playlist/Parser.cpp.orig	2020-10-27 09:16:09.000000000 +0100
-+++ vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/hls/playlist/Parser.cpp	2020-12-14 19:34:41.600005319 +0100
-@@ -42,6 +42,7 @@
- #include <map>
- #include <cctype>
- #include <algorithm>
-+#include <limits>
-
- using namespace adaptive;
- using namespace adaptive::playlist;
-diff -up vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/mkv/matroska_segment.cpp.orig vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/mkv/matroska_segment.cpp
---- vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/mkv/matroska_segment.cpp.orig	2020-10-27 09:16:09.000000000 +0100
-+++ vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/mkv/matroska_segment.cpp	2020-12-14 19:34:41.601005298 +0100
-@@ -31,6 +31,7 @@
-
- #include <new>
- #include <iterator>
-+#include <limits>
-
- matroska_segment_c::matroska_segment_c( demux_sys_t & demuxer, EbmlStream & estream, KaxSegment *p_seg )
-     :segment(p_seg)
-diff -up vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/mkv/mkv.cpp.orig vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/mkv/mkv.cpp
---- vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/mkv/mkv.cpp.orig	2020-10-27 09:16:09.000000000 +0100
-+++ vlc-3.0-a66f141b17e792bcc298c83496749ec93265ff14/modules/demux/mkv/mkv.cpp	2020-12-14 19:34:41.601005298 +0100
-@@ -34,6 +34,7 @@
- #include "stream_io_callback.hpp"
-
- #include <new>
-+#include <limits>
-
- extern "C" {
-     #include "../av1_unpack.h"
---
-2.29.2
-

0001-Revert-configure-ignore-too-new-SRT.patch

@@ -1,26 +0,0 @@
-From 903923d4f491c4b557ad2a9a4fd28e47975d8054 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Thu, 29 Apr 2021 23:56:35 +0200
-Subject: [PATCH] Revert "configure: ignore too new SRT"
-
-This reverts commit 3aad852a05d9a3b2469328cb9ea2e20b0acbce5c.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d37af9e4179e..14028f478bd0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4016,7 +4016,7 @@ AM_CONDITIONAL([HAVE_LIRC], [test "${have_lirc}" = "yes"])
- dnl
- dnl  SRT plugin
- dnl
--PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
-+PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
- 
- EXTEND_HELP_STRING([Visualisations and Video filter plugins:])
- dnl
--- 
-2.30.2
-

recent_srt_fix.patch

@@ -1,25 +0,0 @@
---- a/modules/access/srt.c
-+++ b/modules/access/srt.c
-@@ -165,7 +165,7 @@
- 
-     /* Set latency */
-     i_latency = var_InheritInteger( p_stream, "latency" );
--    srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
-+    srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
-         &i_latency, sizeof( int ) );
- 
-     psz_passphrase = var_InheritString( p_stream, "passphrase" );
-
---- a/modules/access_output/srt.c
-+++ b/modules/access_output/srt.c
-@@ -162,7 +162,7 @@
- 
-     /* Set latency */
-     i_latency = var_InheritInteger( p_access, "latency" );
--    srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
-+    srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
-         &i_latency, sizeof( int ) );
- 
-     if ( psz_passphrase != NULL && psz_passphrase[0] != '\0')
-
-

sources

@@ -1 +1 @@
-SHA512 (vlc-758b718.tar.gz) = 02dc1f6a9516e7bbb2ed0dd04b57a0e944435847bcde32770370a24563234134f3b08755769a98437d33ebd32a517c32324fd6635173c5793442bd36f100e8c7
+SHA512 (vlc-c4ab31d.tar.gz) = 1d3f5b61c6aa7b9f3f62badc153143c0ec4b86fbe0b807edc3101d951bc4b4c615dacc734eeb3376b9ff9e7a8299e2d11ca463ddcceadaa1cf9d5ea1b015eb76

vlc.spec

@@ -1,4 +1,4 @@
-%global commit0 758b718347094af7e7e35ec18359d32f8928766e
+%global commit0 c4ab31d5f0d5d0ba298706241d5b67ae49215935
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 #global vlc_rc		-rc9
 
@@ -50,8 +50,8 @@
 Summary:	The cross-platform open-source multimedia framework, player and server
 Epoch:		1
 Name:		vlc
-Version:	3.0.17
+Version:	3.0.17.2
-Release:	7%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 URL:		https://www.videolan.org
 %if 0%{?commit0:1}
@@ -620,7 +620,10 @@ fi || :
 
 
 %changelog
-* Tue Feb 22 2022 Nicolas Chauvet <kwizart@gmail.com>
+* Thu Mar 10 2022 Leigh Scott <leigh123linux@gmail.com> - 1:3.0.17.2-1
+- Update to 3.0.17.2 (rfbz#6241)
+
+* Tue Feb 22 2022 Nicolas Chauvet <kwizart@gmail.com> - 1:3.0.17-7
 - Update to 3.0.17
 
 * Fri Feb 04 2022 Leigh Scott <leigh123linux@gmail.com> - 1:3.0.17-6