Fix patch to build with GCC 11.0.0

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
el8
Robert-André Mauchin 4 years ago
parent 9fb2fdf041
commit b819f9d289
No known key found for this signature in database
GPG Key ID: F07E690B12A82D56

@ -0,0 +1,76 @@
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

@ -1,49 +0,0 @@
From 8e8afa27865e3781c0add1f26bc330d4d6cb92d6 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 modules/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
demux/adaptive/playlist/SegmentInformation.cpp
Compilation would fail with:
> error: 'numeric_limits' is not a member of 'std'
without this include with GCC 11.0.0
Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
modules/demux/adaptive/playlist/SegmentInformation.cpp | 1 +
modules/demux/hls/playlist/Parser.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp
index c4fe204783..aacc1d7bc1 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -34,6 +34,7 @@
#include <algorithm>
#include <cassert>
+#include <limits>
using namespace adaptive::playlist;
diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp
index e2e1aaefe4..5dc889d78f 100644
--- a/modules/demux/hls/playlist/Parser.cpp
+++ b/modules/demux/hls/playlist/Parser.cpp
@@ -42,6 +42,7 @@
#include <map>
#include <cctype>
#include <algorithm>
+#include <limits>
using namespace adaptive;
using namespace adaptive::playlist;
--
2.29.2

@ -77,7 +77,7 @@ Patch10: recent_srt_fix.patch
# Add a missing include that would make the build fail: # Add a missing include that would make the build fail:
# https://trac.videolan.org/vlc/ticket/25325 # https://trac.videolan.org/vlc/ticket/25325
# Drop next release # Drop next release
Patch11: 0001-Add-missing-include-limits-to-modules.patch Patch11: 0001-Add-missing-include-limits-to-file-using-std.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib BuildRequires: libappstream-glib

Loading…
Cancel
Save