commit: 8cbc565e4786eacec418155e7a1efe1e5a89ed22 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri Apr 23 08:09:36 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Apr 23 08:09:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbc565e
media-video/vlc: tweak for gcc-11 Reported-by: Geoff Leach Closes: https://bugs.gentoo.org/767796 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch | 32 +++++++++++++++ media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch | 48 ++++++++++++++++++++++ media-video/vlc/vlc-3.0.12.1-r100.ebuild | 1 + 3 files changed, 81 insertions(+) diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch b/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch new file mode 100644 index 00000000000..aaa61a546ad --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/767796 + +From: Robert-André Mauchin <zebo...@gmail.com> +Date: Mon, 14 Dec 2020 02:23:52 +0000 (+0100) +Subject: hls: add missing <limits> include +X-Git-Url: https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=3aea33378b0b317b99fce2eeaca8b31bf7cc6aba + +hls: add missing <limits> include + +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. + +Refs #25325 + +Signed-off-by: Robert-André Mauchin <zebo...@gmail.com> +Signed-off-by: Alexandre Janniaux <aja...@videolabs.io> +--- + +--- 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; diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch b/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch new file mode 100644 index 00000000000..3832b2a1877 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch @@ -0,0 +1,48 @@ +https://bugs.gentoo.org/767796 + +From: Robert-André Mauchin <zebo...@gmail.com> +Date: Mon, 14 Dec 2020 02:23:52 +0000 (+0100) +Subject: adaptive: add missing <limits> include +X-Git-Url: https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=e3de1b709b258d2b0e316d927f5c828bdb1a738a + +adaptive: add missing <limits> include + +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. + +Refs #25325 + +Signed-off-by: Robert-André Mauchin <zebo...@gmail.com> +Signed-off-by: Alexandre Janniaux <aja...@videolabs.io> +--- + +--- a/modules/demux/adaptive/playlist/Inheritables.cpp ++++ b/modules/demux/adaptive/playlist/Inheritables.cpp +@@ -29,3 +29,4 @@ ++#include <limits> + + using namespace adaptive::playlist; + using namespace adaptive; +--- 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; + +--- a/modules/demux/adaptive/playlist/SegmentTimeline.cpp ++++ b/modules/demux/adaptive/playlist/SegmentTimeline.cpp +@@ -29,5 +29,6 @@ + + #include <algorithm> ++#include <limits> + + using namespace adaptive::playlist; + diff --git a/media-video/vlc/vlc-3.0.12.1-r100.ebuild b/media-video/vlc/vlc-3.0.12.1-r100.ebuild index 4463b83fc27..b2480e09873 100644 --- a/media-video/vlc/vlc-3.0.12.1-r100.ebuild +++ b/media-video/vlc/vlc-3.0.12.1-r100.ebuild @@ -236,6 +236,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch "${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062 + "${FILESDIR}"/${PN}-3.0.12.1-limits-p{1,2}.patch # bug 767796 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
