diff --git a/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch b/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch new file mode 100644 index 0000000..a4dca5c --- /dev/null +++ b/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch @@ -0,0 +1,50 @@ +From 94845266b705dc9de7921408531b9d7704f4458f Mon Sep 17 00:00:00 2001 +From: Dominic Mayers +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 + #include + #include ++#include + + 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/Remove_legacy_caca.patch b/Remove_legacy_caca.patch new file mode 100644 index 0000000..8374e71 --- /dev/null +++ b/Remove_legacy_caca.patch @@ -0,0 +1,98 @@ +diff -uNrp a/modules/video_output/caca.c b/modules/video_output/caca.c +--- a/modules/video_output/caca.c 2022-01-14 06:09:28.000000000 +0000 ++++ b/modules/video_output/caca.c 2022-01-18 23:09:44.979137301 +0000 +@@ -74,9 +74,9 @@ static void Place(vout_display_t *, vout + + /* */ + struct vout_display_sys_t { +- cucul_canvas_t *cv; ++ caca_canvas_t *cv; + caca_display_t *dp; +- cucul_dither_t *dither; ++ caca_dither_t *dither; + + picture_pool_t *pool; + vout_display_event_thread_t *et; +@@ -153,9 +153,9 @@ static int Open(vlc_object_t *object) + if (!sys) + goto error; + +- sys->cv = cucul_create_canvas(0, 0); ++ sys->cv = caca_create_canvas(0, 0); + if (!sys->cv) { +- msg_Err(vd, "cannot initialize libcucul"); ++ msg_Err(vd, "cannot initialize libcaca"); + goto error; + } + +@@ -209,11 +209,11 @@ error: + if (sys->pool) + picture_pool_Release(sys->pool); + if (sys->dither) +- cucul_free_dither(sys->dither); ++ caca_free_dither(sys->dither); + if (sys->dp) + caca_free_display(sys->dp); + if (sys->cv) +- cucul_free_canvas(sys->cv); ++ caca_free_canvas(sys->cv); + + free(sys); + } +@@ -235,9 +235,9 @@ static void Close(vlc_object_t *object) + if (sys->pool) + picture_pool_Release(sys->pool); + if (sys->dither) +- cucul_free_dither(sys->dither); ++ caca_free_dither(sys->dither); + caca_free_display(sys->dp); +- cucul_free_canvas(sys->cv); ++ caca_free_canvas(sys->cv); + + #if defined(_WIN32) + FreeConsole(); +@@ -266,7 +266,7 @@ static void Prepare(vout_display_t *vd, + + if (!sys->dither) { + /* Create the libcaca dither object */ +- sys->dither = cucul_create_dither(32, ++ sys->dither = caca_create_dither(32, + vd->source.i_visible_width, + vd->source.i_visible_height, + picture->p[0].i_pitch, +@@ -284,12 +284,12 @@ static void Prepare(vout_display_t *vd, + vout_display_place_t place; + Place(vd, &place); + +- cucul_set_color_ansi(sys->cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_BLACK); +- cucul_clear_canvas(sys->cv); ++ caca_set_color_ansi(sys->cv, CACA_DEFAULT, CACA_BLACK); ++ caca_clear_canvas(sys->cv); + + const int crop_offset = vd->source.i_y_offset * picture->p->i_pitch + + vd->source.i_x_offset * picture->p->i_pixel_pitch; +- cucul_dither_bitmap(sys->cv, place.x, place.y, ++ caca_dither_bitmap(sys->cv, place.x, place.y, + place.width, place.height, + sys->dither, + &picture->p->p_pixels[crop_offset]); +@@ -328,7 +328,7 @@ static int Control(vout_display_t *vd, i + + case VOUT_DISPLAY_CHANGE_SOURCE_CROP: + if (sys->dither) +- cucul_free_dither(sys->dither); ++ caca_free_dither(sys->dither); + sys->dither = NULL; + return VLC_SUCCESS; + +@@ -366,8 +366,8 @@ static void Place(vout_display_t *vd, vo + + vout_display_PlacePicture(place, &vd->source, vd->cfg, false); + +- const int canvas_width = cucul_get_canvas_width(sys->cv); +- const int canvas_height = cucul_get_canvas_height(sys->cv); ++ const int canvas_width = caca_get_canvas_width(sys->cv); ++ const int canvas_height = caca_get_canvas_height(sys->cv); + const int display_width = caca_get_display_width(sys->dp); + const int display_height = caca_get_display_height(sys->dp); + diff --git a/sources b/sources index ed2ba8a..5b9a5e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-3.0.16.tar.xz) = 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298 +SHA512 (vlc-758b718.tar.gz) = 02dc1f6a9516e7bbb2ed0dd04b57a0e944435847bcde32770370a24563234134f3b08755769a98437d33ebd32a517c32324fd6635173c5793442bd36f100e8c7 diff --git a/vlc.spec b/vlc.spec index 30a63be..350e060 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,5 +1,5 @@ -#global commit0 170157402b9c9ee5651838499549328c6715b5fe -#global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global commit0 758b718347094af7e7e35ec18359d32f8928766e +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global vlc_rc -rc9 %global _with_bootstrap 1 @@ -50,13 +50,13 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc -Version: 3.0.16 -Release: 1%{?dist} +Version: 3.0.17 +Release: 7%{?dist} License: GPLv2+ URL: https://www.videolan.org %if 0%{?commit0:1} Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz -%global vlc_setup vlc-3.0-%{?commit0} +%global vlc_setup vlc-%{?commit0} %else Source0: https://download.videolan.org/pub/videolan/%{?vlc_rc:testing/}vlc/%{version}%{?vlc_rc}/vlc-%{version}%{?vlc_rc}.tar.xz %global vlc_setup vlc-%{version}%{?vlc_rc} @@ -71,11 +71,11 @@ Patch7: Switch-to-Fedora-lua-5.1.patch # Backport for 3.0 notifyd without gtk3 Patch9: notify-don-t-depend-on-any-GTK-version.patch -# Fix build issue with recent SRT library -# Based on https://git.videolan.org/?p=vlc.git;a=commit;h=6e8d77431127c482196115a6eeb769daf56347b3 -Patch10: recent_srt_fix.patch -Patch11: 0001-Revert-configure-ignore-too-new-SRT.patch Patch12: 0001-Revert-access-libdvdread-6.1.2-supports-UTF-8-paths-.patch +# https://code.videolan.org/videolan/vlc/-/issues/25473#note_256576 +Patch13: 0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch +# https://code.videolan.org/videolan/vlc/-/merge_requests/889 +Patch14: Remove_legacy_caca.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -154,7 +154,7 @@ BuildRequires: libtiff-devel BuildRequires: pkgconfig(libidn) BuildRequires: pkgconfig(libjpeg) # Not Yet in EL8 -%if 0%{?fedora} || 0%{?el7} +%if ! 0%{?el8} BuildRequires: pkgconfig(libplacebo) %endif BuildRequires: pkgconfig(libudev) @@ -174,7 +174,7 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: libsamplerate-devel BuildRequires: libshout-devel -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?el8} BuildRequires: lua5.1-devel, lua5.1 %else BuildRequires: lua-devel @@ -191,7 +191,7 @@ BuildRequires: pkgconfig(libpulse) >= 0.9.8 BuildRequires: pkgconfig(libsecret-1) >= 0.18 BuildRequires: pkgconfig(microdns) >= 0.1.2 BuildRequires: pkgconfig(protobuf-lite) >= 2.5 -%if 0%{?fedora} > 32 +%if 0%{?fedora} BuildRequires: qt5-qtbase-private-devel %endif BuildRequires: pkgconfig(Qt5Core) >= 5.5 @@ -349,11 +349,13 @@ sed -i -e 's/luac/luac-5.1/g' configure.ac %endif %patch9 -p1 -%patch10 -p1 -%patch11 -p1 %if 0%{?rhel} >= 7 %patch12 -p1 %endif +%patch13 -p1 +%if 0%{?fedora} > 35 +%patch14 -p1 +%endif %{?_with_bootstrap: rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : @@ -468,11 +470,7 @@ rm -rf %{buildroot}%{_datadir}/kde4 %if 0%{?el7} . /opt/rh/devtoolset-%{dts_ver}/enable %endif -%ifnarch %{arm} %{arm64} -make check -%else make check || : -%endif %ldconfig_scriptlets core @@ -622,6 +620,45 @@ fi || : %changelog +* Tue Feb 22 2022 Nicolas Chauvet +- Update to 3.0.17 + +* Fri Feb 04 2022 Leigh Scott - 1:3.0.17-6 +- rebuilt + +* Wed Jan 19 2022 Nicolas Chauvet - 1:3.0.17-5 +- rebuilt + +* Tue Jan 18 2022 Nicolas Chauvet - 1:3.0.17-4 +- Bump + +* Sat Jan 15 2022 Leigh Scott - 1:3.0.17-3 +- Update 3.x snapshot + +* Fri Nov 19 2021 Nicolas Chauvet - 1:3.0.17-2 +- Rebuilt + +* Thu Nov 11 2021 Nicolas Chauvet - 1:3.0.17-1 +- Update to 3.x snapshot + +* Tue Nov 09 2021 Leigh Scott - 1:3.0.16-7 +- Rebuilt for new ffmpeg snapshot + +* Sat Oct 30 2021 Leigh Scott - 1:3.0.16-6 +- rebuilt + +* Thu Aug 19 2021 Nicolas Chauvet - 1:3.0.16-5 +- Rebuilt + +* Tue Aug 03 2021 RPM Fusion Release Engineering - 1:3.0.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun Jul 11 2021 Sérgio Basto - 1:3.0.16-3 +- Mass rebuild for x264-0.163 + +* Wed Jun 30 2021 Leigh Scott - 1:3.0.16-2 +- Rebuilt + * Sat Jun 19 2021 Leigh Scott - 1:3.0.16-1 - Update to 3.0.16