gentoo resync : 28.04.2021

4 files changed, 84 insertions, 1 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 80ad9cb8781c..637574d4ca9b 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,10 +3,12 @@ AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
 AUX vlc-3.0.11.1-srt-1.4.2.patch 976 BLAKE2B 1d5c6a2df44e2cc26c0b835b71f028b04457e1cfc37954d30d9f2b29d711ea80ae2ec5431ed87be626caa16effa1565a34520dd7a54e89ee470e6aace6d3c594 SHA512 333480c279ad743b30ae61ab2e4e1c7bdca8e406009075f669c84fbaffe7fd68a9e9c58615d44cdba1056b973726c486cacd8d2dbcfea6f282173a929f5f8d68
+AUX vlc-3.0.12.1-limits-p1.patch 874 BLAKE2B c46ce7c774c378601e39fac6c0013e0cf6a8b008becdaea9e35f56ed21d6efaa28ce9ae55cf3e2ba70e7d116f17dca12b348ff75c692a83ccfc79d2728ec0e86 SHA512 28dcba99106ac2e3b40bab90fceb206d98f47852d8be12b865c6cdb03febc2f6a39610854424bdd513b537ac5fe05cdfe261598497e67c5f55012f95908f5b7e
+AUX vlc-3.0.12.1-limits-p2.patch 1311 BLAKE2B bcef3a4d0fd2b7bf033132c9b30098cf4c97992da027a862e8bef197d2fc90f65986a9c4188dc72732ce50d1a2683d411cb69f75f04c814a40306a41517f1e10 SHA512 1eee525ce5f10fcc4f778cd1249e3e930b1605b68b096ff61b33a38dff513f547e3baa05ed7d448da5ff61def55f6822c4dfcce94a0c3d693c936ed33ae12d7b
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0-3.0.12.1.tar.gz 34233801 BLAKE2B 0bc571d8f3f8aa40eee93fe8ab13bd1f37e288372d46b13998986899d03bf327b300a98ec5736bb9fe7bb58aae65c1d469786a4dfdb80f4cf8b5bbbb250ee45d SHA512 05b079dcfd4a21cdae7bb19e9d71f2fad33ca846852683c5d2ca6d45f779749ead420d5211b4acce76971d7ec2265d0d07f970f35f647dd446e337dc31aa0ec1
-EBUILD vlc-3.0.12.1-r100.ebuild 13685 BLAKE2B be4307ed0dd0505ad4801fabb742ed1871c15c5a5b4b0a3290b2c13bbd67bbe2e54216dac0f4e3463ad0cdeaee879cb23263db6ae6d1bbcfc70bfed7da5881b1 SHA512 00da28f450d65e89529f2a7d2ecf699f9d671a925b0d3d229005cf774bfc916c39cb320e0d4dce031523c62994de2ccdf63bd5564ada31427ab7eec7e11ca698
+EBUILD vlc-3.0.12.1-r100.ebuild 13748 BLAKE2B 107691a0a6f7a25082845706fe39be5d51c48b23bca434075f2d86b53205cc528d1bfe09374c945e80510f59739cf610dd76d6fda4735406ae10d60fb525ee5a SHA512 747e7cf72eb2e01b324ad6b8526f11b5d55400f9a86a02674e72ee1666ac4ff5c486bc5fa03319e369c84b34f5e350862c5cee5ae5cee327e5006147273bc3e7
 EBUILD vlc-3.0.9999.ebuild 13483 BLAKE2B af6be5847112bbeb32dc8404f542a7ecb3a457d29056749bb35072abdb36980da94ae75b7786fc5e8b738fe07de2d5af1e0da8c8d9c60dc9b9e08849a4c8ec06 SHA512 ab63c99d7a7c31063a0c3af7db77b8564a13b51579b9154f561534c8a898d24f81b7e126249eda0fae78ee1f6f049a30fe6b9ae93f2fee521691d4ab28496568
 EBUILD vlc-9999.ebuild 13504 BLAKE2B 056a36925bf5f01177066bcbc443a46aef1f465e976d391c273181ed09c2d570c64bedfd66cd58237087a2639bc4a6569fd2d1b51e2d5ebd727bd3b7fa3e2c8d SHA512 60ba65cac3f024d9fa1182ee4790f3ef6afe35576c314b02d49cf3f514e23307d46a6969f6abf2490a661516924d2010caf2223e21a856c2cd04e5a66673adc1
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
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 000000000000..aaa61a546adf
--- /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 <zebob.m@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 <zebob.m@gmail.com>
+Signed-off-by: Alexandre Janniaux <ajanni@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 000000000000..3832b2a1877c
--- /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 <zebob.m@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 <zebob.m@gmail.com>
+Signed-off-by: Alexandre Janniaux <ajanni@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 4463b83fc271..b2480e098733 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 )