diff --git a/vlc-3.0.13.tar.xz b/vlc-3.0.13.tar.xz deleted file mode 100644 index ed7a1a2..0000000 --- a/vlc-3.0.13.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5b43aa354dbe40f28099995e037bcf78896aa9b60862b17c5b7a19419be1ce5 -size 26254428 diff --git a/vlc-3.0.13.tar.xz.asc b/vlc-3.0.13.tar.xz.asc deleted file mode 100644 index 4daa44d..0000000 --- a/vlc-3.0.13.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCYIrCrwAKCRBxgHE75Y0a -3NFFAJ459j5TJUl5JsH/sZrHdIvlly5L7wCfXXKlHk0nJJ5d6FOdS20Xp7HdQl0= -=QIhc ------END PGP SIGNATURE----- diff --git a/vlc-3.0.16.tar.xz b/vlc-3.0.16.tar.xz new file mode 100644 index 0000000..ac9a1b5 --- /dev/null +++ b/vlc-3.0.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6 +size 26439328 diff --git a/vlc-3.0.16.tar.xz.asc b/vlc-3.0.16.tar.xz.asc new file mode 100644 index 0000000..fcf2e42 --- /dev/null +++ b/vlc-3.0.16.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCYM0SpAAKCRBxgHE75Y0a +3F8vAKCKiaBme+hrF+if/4I69LuWHe0lQACeLt+qlydTg7zKHuAiIUK+qRWtuVA= +=jCyN +-----END PGP SIGNATURE----- diff --git a/vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch b/vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch new file mode 100644 index 0000000..21fff40 --- /dev/null +++ b/vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch @@ -0,0 +1,31 @@ +Index: vlc-3.0.16/modules/access/live555.cpp +=================================================================== +--- vlc-3.0.16.orig/modules/access/live555.cpp ++++ vlc-3.0.16/modules/access/live555.cpp +@@ -59,6 +59,7 @@ + #include + #include + #include ++#include + + extern "C" { + #include "../access/mms/asf.h" /* Who said ugly ? */ +@@ -730,6 +731,8 @@ static int SessionsSetup( demux_t *p_dem + 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" ); +@@ -852,7 +855,8 @@ static int SessionsSetup( demux_t *p_dem + 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 ) ); diff --git a/vlc-srto_tsbpddelay.patch b/vlc-srto_tsbpddelay.patch index b54aff5..8642e25 100644 --- a/vlc-srto_tsbpddelay.patch +++ b/vlc-srto_tsbpddelay.patch @@ -1,7 +1,7 @@ -Index: vlc-3.0.13/modules/access/srt.c +Index: vlc-3.0.16/modules/access/srt.c =================================================================== ---- vlc-3.0.13.orig/modules/access/srt.c -+++ vlc-3.0.13/modules/access/srt.c +--- vlc-3.0.16.orig/modules/access/srt.c ++++ vlc-3.0.16/modules/access/srt.c @@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(strea /* Set latency */ @@ -11,10 +11,10 @@ Index: vlc-3.0.13/modules/access/srt.c &i_latency, sizeof( int ) ); psz_passphrase = var_InheritString( p_stream, "passphrase" ); -Index: vlc-3.0.13/modules/access_output/srt.c +Index: vlc-3.0.16/modules/access_output/srt.c =================================================================== ---- vlc-3.0.13.orig/modules/access_output/srt.c -+++ vlc-3.0.13/modules/access_output/srt.c +--- vlc-3.0.16.orig/modules/access_output/srt.c ++++ vlc-3.0.16/modules/access_output/srt.c @@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_ /* Set latency */ @@ -24,10 +24,10 @@ Index: vlc-3.0.13/modules/access_output/srt.c &i_latency, sizeof( int ) ); if ( psz_passphrase != NULL && psz_passphrase[0] != '\0') -Index: vlc-3.0.13/configure.ac +Index: vlc-3.0.16/configure.ac =================================================================== ---- vlc-3.0.13.orig/configure.ac -+++ vlc-3.0.13/configure.ac +--- vlc-3.0.16.orig/configure.ac ++++ vlc-3.0.16/configure.ac @@ -4016,7 +4016,7 @@ AM_CONDITIONAL([HAVE_LIRC], [test "${hav dnl dnl SRT plugin diff --git a/vlc.changes b/vlc.changes index a6cd7c3..f0cd20e 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 19 21:49:25 UTC 2021 - Fusion Future + +- Update to version 3.0.16: + + Video Output: Fix a D3D11 crash on Windows 8/8.1. + + Access: Fix RTSP server timeout handling. + + Interfaces: macOS: Add touchbar support. + + Misc: Multiple settings improvements. +- Changes from version 3.0.15: + + Core: Add Opus & Alac wave format mappings. + + Access: Fix opening DVD folders with non-ascii characters. + + Demux: + - Fix asf regression with broadcast streams. + - MP4: Fix audio drop on seek. + + Video Output: + - Fix seek & volume sliders overlapping with subtitles. + - Fix delays when seeking with D3D11. + + Text renderer: Improve freetype fonts outlining. + + Misc: Fix GnuTLS support for Windows XP. +- Changes from version 3.0.14: + + Core: + - Fix double loading of slave input. + - Fix an issue causing the auto-updater not to launch the new + version installer. +- Add vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch: + The maintainers of live555 changed connectionEndpointAddresss to + getConnectionEndpointAddress, which now provides the address + value by reference. +- Rebase vlc-srto_tsbpddelay.patch + ------------------------------------------------------------------- Tue May 4 12:00:01 UTC 2021 - Dominique Leuenberger diff --git a/vlc.spec b/vlc.spec index d72efb6..72a2a0e 100644 --- a/vlc.spec +++ b/vlc.spec @@ -33,7 +33,7 @@ %bcond_with faad %bcond_with fdk_aac Name: vlc -Version: 3.0.13 +Version: 3.0.16 Release: 0 Summary: Graphical media player License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -57,6 +57,8 @@ Patch100: vlc-projectM-qt5.patch Patch103: 0001-Port-OpenCV-facedetect-example-to-C-API.patch # Fix building against recent srt where SRTO_TSBPDDELAY is no longer defined Patch105: vlc-srto_tsbpddelay.patch +# PATCH-FIX-UPSTREAM https://trac.videolan.org/vlc/ticket/25473 dominic.mayers@meditationstudies.org -- The maintainers of live555 changed connectionEndpointAddresss to getConnectionEndpointAddress, which now provides the address value by reference. +Patch107: vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch BuildRequires: Mesa-devel BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.24 @@ -295,6 +297,7 @@ suitable for server installations, for example, to run a streaming server. Should you decide to install the GUI modules, %{name}-noX will stay installed as a dependency. + # we can't use %%lang_package, as we need a different dependency # boo#1012556 # but the package name has to stay vlc-lang, as otherise the software centers @@ -406,6 +409,12 @@ OpenCV based video filters and a face detection example. %endif %patch103 -p1 %patch105 -p1 +### Since live555-2020.12.11, connectionEndpointAddress() member function +### use a "struct sockaddr_storage" in preparation for eventual support of IPv6: +### http://www.live555.com/liveMedia/public/changelog.txt +if pkg-config --atleast-version 2020.12.11 live555; then +%patch107 -p1 +fi ### And LUA 5.3.1 has some more API changes if pkg-config --atleast-version 5.3.1 lua; then