gentoo resync : 24.06.2021

6 files changed, 67 insertions, 13 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 3f014efa9ace..e86c28bdfc8d 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -6,18 +6,17 @@ AUX vlc-3.0.11.1-srt-1.4.2.patch 976 BLAKE2B 1d5c6a2df44e2cc26c0b835b71f028b0445
 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.13-srt-1.3.0.patch 446 BLAKE2B e02bad6bcc81508fd8d28a2b10f1760339c6a9432e951bf04596053493f2cec197468032ec29773fdf1b980cee5e2c71b556a4cdef4076fb08f0b1edc6965dba SHA512 1b4165bdb95d128ae9afdb1f650f629c219801eaf6f6e1f12659eb45026e732099ad3a714406e8ad0cdeb1f4e6988c187b7e60b69a8d00bdc759649f1d08b5e5
+AUX vlc-3.0.14-fix-live-address-api.patch 2233 BLAKE2B 50b40430978996e5302b08bcb8a68e5f106fe43f4fd66ad69dd1e6c1e8097abc32c671cdfc8dc87b7526cabadf847bf359f81927919ff3ab8ea7a80274bc7075 SHA512 d79e03677e404ef853499ac7b72977f1d6368d003720ce663581a5527b5b6327b36d5b240bec0aa2d4c3bff4c1b04ce1c4dc904fc648c98498ba2f88f1acd82a
 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
-DIST vlc-3.0-3.0.13.tar.gz 34356102 BLAKE2B 93490278f47ab389c927a44bc84727b8067a9792e5621b3a9caa90c23a25ecb11244ebd62aa2dfb6d03df692c1ce3ae2aaec20aff001bb805f3965357298b4c9 SHA512 58439ef605ddc43aaf3fbd41715d3e341565590db3d73256ea3a977544f287d8f5001eb334a70674b707ccdc584125a24a3f320b3b4d166c01450d53741a4f85
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
-DIST vlc-3.0.15.tar.xz 26436344 BLAKE2B 42e20e8bbd2af79a63d261c3b376ff974a38e8d5376a3998e4759584f4e791a1d0c2827268055ec36a792980c74cf39a749770b2d1a31e15d3cff721a855851c SHA512 4645d7e9cc894ddf4c1776fe15124b1c123c3860f6dceec7bc0087a37a6e98f62e35856cdb59f8759b8f4aeea766b25c9a7767b65f1be8bb9ee23c71376cd914
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
 EBUILD vlc-3.0.12.1-r100.ebuild 13748 BLAKE2B 107691a0a6f7a25082845706fe39be5d51c48b23bca434075f2d86b53205cc528d1bfe09374c945e80510f59739cf610dd76d6fda4735406ae10d60fb525ee5a SHA512 747e7cf72eb2e01b324ad6b8526f11b5d55400f9a86a02674e72ee1666ac4ff5c486bc5fa03319e369c84b34f5e350862c5cee5ae5cee327e5006147273bc3e7
-EBUILD vlc-3.0.13.ebuild 13746 BLAKE2B b4a84533271235cde54783bc92f6cc7bcddd4f87c05fc67ca51b0d2dc9bd5b4d02e7f5e7da4329544169781f67dbc7e38a8fcb33139318f7ce12f0a29872d483 SHA512 ccd6e2232808764ef877df955ab5921a1761a511cf04c57413cc2a5bd54552166d3ded64164c958360d89de244bccb793c1a0b2a934823af4dd4187ecbf943fb
-EBUILD vlc-3.0.14.ebuild 13717 BLAKE2B 0f49a586f792a100142e88d0d479c08357f2954c3a94a6219f6adb1a8bb19b7ba0a96d05494ef0cc9f9ec6279929392ab772e71015385eb1c2734bfd0b2b0b53 SHA512 c78b495db3029610d72112a956de8b4da2331cac9a00faeff3c828b2927f2aeb4d8ff303316c1a17b3963fac9c37b4bb55f42fbca62f152f91b9c19a3dcce68a
-EBUILD vlc-3.0.15.ebuild 13782 BLAKE2B 64a8810958c32ef5b7e0afc8f859fe787988ab0e039342a32ed048d89c43a0dc79af9af7ba100ff7eda6c8f4753d267e2e610226ff5ddf557792e893289d4c5a SHA512 cd38e83c98e8d4e8797c2e6e93d705dfa41d25a6b6a80d3ce723b93096c32905596d1652b39906a00ad74d0a4d2773dbb8120aa10a9d5678fb4df00ff57449d9
-EBUILD vlc-3.0.16.ebuild 13782 BLAKE2B 64a8810958c32ef5b7e0afc8f859fe787988ab0e039342a32ed048d89c43a0dc79af9af7ba100ff7eda6c8f4753d267e2e610226ff5ddf557792e893289d4c5a SHA512 cd38e83c98e8d4e8797c2e6e93d705dfa41d25a6b6a80d3ce723b93096c32905596d1652b39906a00ad74d0a4d2773dbb8120aa10a9d5678fb4df00ff57449d9
+EBUILD vlc-3.0.14-r1.ebuild 13729 BLAKE2B b4192f8e6a09bb46ea874ffa32f384711a035ed4d6d4f034ba9291182e29f898e2ec3c3d49ec628958ec238d8ae204c8c8144af55f2be8d7221ba3be8fdec03f SHA512 202e7c02f83e7f8f67b0258ed5e14b0e3a3023ce298edb1958c47d7fde12a706001281205d6f907c05638000916d49eb98d7f0b7a18ab1f356bc6c180bbc6500
+EBUILD vlc-3.0.14-r2.ebuild 13803 BLAKE2B aa9a4b608938df3e91bf502ef3f7be34d531052b001c02e850a986dd816f592159f381b77649b103bb2e3fed143af2ac9b9b445a29a01907d4858e6b45fda248 SHA512 cb217ec30d9e04798abf30483d0afd09c85c06ee95d77dabbc656b859f94c9f162a0ebebff8f1f1e8c78d0eaac8d38f25abefd4293c2c1edfcab851c37ca97ec
+EBUILD vlc-3.0.16-r1.ebuild 13794 BLAKE2B 9554db9294a77775f61fd16e2d37b138eef70d5ed6579bb6ae2183f5ea7b1d6fdb900e4f126291c76b5da9ca7b2c9c16c5a9efb04410d3ff6d2185e775e54504 SHA512 e1fa14df23f4aee2796fd801b30106d76a80088c5a9e8fcc77cab812c232c096f11899f1045abe445951444c599fd6a18f54fcd49784fa695af43c3c598a7cb0
+EBUILD vlc-3.0.16-r2.ebuild 13863 BLAKE2B ea7ee43901e17fefa418779f38603bad1c5e890bb5c75f5e10999559e2ac86c29495421f24ce0f012a138bc8f33c59ade12136a5b5e415f43e68f9bc1fe2a32f SHA512 a1e38b1d8fe28ce16286442fed99fcddac7f5f542f05c83b7a7f1788010042d6625add98c0c6e4a4b8bf6eda63bca957fffd8aca879f4291953a31dc9ea03445
 EBUILD vlc-3.0.9999.ebuild 13471 BLAKE2B b670f3966ef3b437efbc49c237723ee1b58eadd1072f9b019ccb42644e0699f1673acb53839c044e6dd3b5e0137e3c6562d5cc008e05793d9bdd1ac5329c74c6 SHA512 7175f7a47a3466e3e08e72064d4cf280dc528a9e98ef538a0f45d05ca63ab4a23c212393d66a5192ea892cdc62f5fed742efb0068977f76da0debd1e16e764d1
 EBUILD vlc-9999.ebuild 13492 BLAKE2B 4ce1ec116bd322cb97a258e5bc61e2ea068d19f5eea7c024df8c3e3662342b0395b01407a1dad74dc69200501e5d85d17102fb2d0adf0f5a27ff5a5ea6262b47 SHA512 aa17c24cfa15b04be911405523eaac1d5bc6003f32c21d32f9161e2d98820646344a5d7dde75ccd7784a36d18b2bf61c1d94bebd3ed2e10181fdb6153967b25a
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch b/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch
new file mode 100644
index 000000000000..2d6f86f0aba6
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch
@@ -0,0 +1,53 @@
+Needed for https://bugs.gentoo.org/795798 and
+https://code.videolan.org/videolan/vlc/-/issues/25473
+
+From 94845266b705dc9de7921408531b9d7704f4458f Mon Sep 17 00:00:00 2001
+From: Dominic Mayers <dominic.mayers@meditationstudies.org>
+Date: Sun, 28 Mar 2021 04:37:54 -0400
+Subject: [PATCH] Get addr by ref. from getConnectionEndpointAddress.
+
+Fixes issue #25473 in code.videolan.org. The maintainers of live555 changed
+connectionEndpointAddresss to getConnectionEndpointAddress, which now provides
+the address value by reference. Before, connectionEndpointAddresss returned
+the value. So, in modules/access/live555.cpp, we must first get the value and
+then pass it to IsMulticastAddress.  The code will not compile with the recent
+live555 unless we also modify modules/access/Makefile.am - a different patch.
+---
+ modules/access/live555.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
+index 01c535ca5b..95e15e35d9 100644
+--- a/modules/access/live555.cpp
++++ b/modules/access/live555.cpp
+@@ -60,6 +60,7 @@
+ #include <liveMedia.hh>
+ #include <liveMedia_version.hh>
+ #include <Base64.hh>
++#include <NetAddress.hh>
+ 
+ extern "C" {
+ #include "../access/mms/asf.h"  /* Who said ugly ? */
+@@ -727,7 +728,8 @@ static int SessionsSetup( demux_t *p_demux )
+     unsigned const thresh = 200000; /* RTP reorder threshold .2 second (default .1) */
+     const char     *p_sess_lang = NULL;
+     const char     *p_lang;
+-
++    struct sockaddr_storage addr;
++    
+     b_rtsp_tcp    = var_CreateGetBool( p_demux, "rtsp-tcp" ) ||
+                     var_GetBool( p_demux, "rtsp-http" );
+     i_client_port = var_InheritInteger( p_demux, "rtp-client-port" );
+@@ -850,7 +852,8 @@ static int SessionsSetup( demux_t *p_demux )
+             if( !p_sys->b_multicast )
+             {
+                 /* We need different rollover behaviour for multicast */
+-                p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
++                sub->getConnectionEndpointAddress(addr);
++                p_sys->b_multicast = IsMulticastAddress( addr );
+             }
+ 
+             tk = (live_track_t*)malloc( sizeof( live_track_t ) );
+-- 
+2.25.1
+
diff --git a/media-video/vlc/vlc-3.0.14.ebuild b/media-video/vlc/vlc-3.0.14-r1.ebuild
index 0a0bd7bf3e16..39df8bf51c03 100644
--- a/media-video/vlc/vlc-3.0.14.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r1.ebuild
@@ -140,7 +140,7 @@ RDEPEND="
 	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
+	live? ( <media-plugins/live-2021.05.22:= )
 	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
diff --git a/media-video/vlc/vlc-3.0.13.ebuild b/media-video/vlc/vlc-3.0.14-r2.ebuild
index a706bd9e653e..06e953113a2f 100644
--- a/media-video/vlc/vlc-3.0.13.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r2.ebuild
@@ -41,7 +41,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
 	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
 	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
 	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
 	cpu_flags_x86_sse
 "
@@ -66,6 +66,7 @@ BDEPEND="
 	x86? ( dev-lang/yasm )
 "
 RDEPEND="
+	media-libs/libvorbis
 	net-dns/libidn:=
 	sys-libs/zlib[minizip]
 	virtual/libintl
@@ -139,7 +140,7 @@ RDEPEND="
 	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
+	live? ( >=media-plugins/live-2021.05.22:= )
 	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
@@ -208,7 +209,6 @@ RDEPEND="
 	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
 	vdpau? ( x11-libs/libvdpau )
 	vnc? ( net-libs/libvncserver )
-	vorbis? ( media-libs/libvorbis )
 	vpx? ( media-libs/libvpx:= )
 	wayland? (
 		>=dev-libs/wayland-1.15
@@ -237,6 +237,7 @@ PATCHES=(
 	"${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.13-srt-1.3.0.patch
+	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
@@ -294,6 +295,7 @@ src_configure() {
 		--enable-screen
 		--enable-vcd
 		--enable-vlc
+		--enable-vorbis
 		$(use_enable a52)
 		$(use_enable alsa)
 		$(use_enable aom)
@@ -394,7 +396,6 @@ src_configure() {
 		$(use_enable vaapi libva)
 		$(use_enable vdpau)
 		$(use_enable vnc)
-		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_with X x)
diff --git a/media-video/vlc/vlc-3.0.15.ebuild b/media-video/vlc/vlc-3.0.16-r1.ebuild
index 8d7b04a4384d..dfd2ab3881e9 100644
--- a/media-video/vlc/vlc-3.0.15.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r1.ebuild
@@ -141,7 +141,7 @@ RDEPEND="
 	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
+	live? ( <media-plugins/live-2021.05.22:= )
 	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
diff --git a/media-video/vlc/vlc-3.0.16.ebuild b/media-video/vlc/vlc-3.0.16-r2.ebuild
index 8d7b04a4384d..0a410fa516ff 100644
--- a/media-video/vlc/vlc-3.0.16.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r2.ebuild
@@ -141,7 +141,7 @@ RDEPEND="
 	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
+	live? ( >=media-plugins/live-2021.05.22:= )
 	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
@@ -238,6 +238,7 @@ PATCHES=(
 	"${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.13-srt-1.3.0.patch
+	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )