From 87d21c700b8bdcb7aeb136b546481d4f76964bc8 Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 4 Jun 2021 18:17:41 +0300 Subject: [PATCH] vlc ver. bump --- multimedia/videoplayer/vlc/actions.py | 1 + .../vlc/files/vlc-2.2.8-freerdp-2.patch | 131 ++++++++++++++++++ .../vlc/files/vlc-3.0.11.1-srt-1.4.2.patch | 25 ++++ multimedia/videoplayer/vlc/pspec.xml | 14 +- 4 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 multimedia/videoplayer/vlc/files/vlc-2.2.8-freerdp-2.patch create mode 100644 multimedia/videoplayer/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch diff --git a/multimedia/videoplayer/vlc/actions.py b/multimedia/videoplayer/vlc/actions.py index 6adf6073e2..b5c7b8977c 100644 --- a/multimedia/videoplayer/vlc/actions.py +++ b/multimedia/videoplayer/vlc/actions.py @@ -126,6 +126,7 @@ def setup(): --enable-x264 \ --enable-x265 \ --enable-aribsub \ + --enable-freerdp \ --enable-xvideo \ ") #enable-skins2 \ --disable-qt4 \ diff --git a/multimedia/videoplayer/vlc/files/vlc-2.2.8-freerdp-2.patch b/multimedia/videoplayer/vlc/files/vlc-2.2.8-freerdp-2.patch new file mode 100644 index 0000000000..5cee133650 --- /dev/null +++ b/multimedia/videoplayer/vlc/files/vlc-2.2.8-freerdp-2.patch @@ -0,0 +1,131 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1957,7 +1957,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [li + + dnl RDP/Remote Desktop access module + dnl +-PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) ) ++PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) ) + + dnl + dnl Real RTSP plugin +--- a/modules/access/rdp.c 2017-12-25 17:45:32.964429170 +0100 ++++ b/modules/access/rdp.c 2017-12-25 17:53:15.114093670 +0100 +@@ -45,18 +45,6 @@ + # include + #endif + +-#if !defined(FREERDP_VERSION_MAJOR) || \ +- (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))) +-# define SoftwareGdi sw_gdi +-# define Fullscreen fullscreen +-# define ServerHostname hostname +-# define Username username +-# define Password password +-# define ServerPort port +-# define EncryptionMethods encryption +-# define ContextSize context_size +-#endif +- + #include + #ifdef HAVE_POLL + # include +@@ -140,6 +128,7 @@ + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context; + demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; + rdpGdi *p_gdi = p_context->gdi; ++ unsigned bytesPerPixel; + + if ( p_sys->es ) + { +@@ -149,19 +138,23 @@ + + /* Now init and fill es format */ + vlc_fourcc_t i_chroma; +- switch( p_gdi->bytesPerPixel ) ++ switch( p_gdi->dstFormat ) + { + default: +- case 16: ++ msg_Dbg( p_vlccontext->p_demux, "unhandled dstFormat %x bpp", p_gdi->dstFormat); ++ case PIXEL_FORMAT_BGR16: + i_chroma = VLC_CODEC_RGB16; ++ bytesPerPixel = 16; + break; +- case 24: ++ case PIXEL_FORMAT_BGR24: + i_chroma = VLC_CODEC_RGB24; ++ bytesPerPixel = 24; + break; +- case 32: ++ case PIXEL_FORMAT_BGRA32: + i_chroma = VLC_CODEC_RGB32; ++ bytesPerPixel = 32; + break; + } + es_format_t fmt; + es_format_Init( &fmt, VIDEO_ES, i_chroma ); + +@@ -172,7 +165,7 @@ + fmt.video.i_height = p_gdi->height; + fmt.video.i_frame_rate_base = 1000; + fmt.video.i_frame_rate = 1000 * p_sys->f_fps; +- p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel; ++ p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * bytesPerPixel; + + if ( p_sys->p_block ) + p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize ); +@@ -233,28 +226,19 @@ + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; + + msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", +-#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)) + p_instance->settings->DesktopWidth, + p_instance->settings->DesktopHeight, + p_instance->settings->ColorDepth +-#else +- p_instance->settings->width, +- p_instance->settings->height, +- p_instance->settings->color_depth +-#endif + ); + + p_instance->update->DesktopResize = desktopResizeHandler; + p_instance->update->BeginPaint = beginPaintHandler; + p_instance->update->EndPaint = endPaintHandler; + +- gdi_init( p_instance, +- CLRBUF_16BPP | +-#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ +- !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2)) +- CLRBUF_24BPP | +-#endif +- CLRBUF_32BPP, NULL ); ++ if ( p_instance->settings->ColorDepth > 16 ) ++ gdi_init( p_instance, PIXEL_FORMAT_XRGB32); ++ else ++ gdi_init( p_instance, PIXEL_FORMAT_RGB16); + + desktopResizeHandler( p_instance->context ); + return true; +@@ -428,10 +412,6 @@ + if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0; + p_sys->i_frame_interval = 1000000 / p_sys->f_fps; + +-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2 +- freerdp_channels_global_init(); +-#endif +- + p_sys->p_instance = freerdp_new(); + if ( !p_sys->p_instance ) + { +@@ -506,9 +486,6 @@ + + freerdp_disconnect( p_sys->p_instance ); + freerdp_free( p_sys->p_instance ); +-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2 +- freerdp_channels_global_uninit(); +-#endif + + if ( p_sys->p_block ) + block_Release( p_sys->p_block ); diff --git a/multimedia/videoplayer/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch b/multimedia/videoplayer/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch new file mode 100644 index 0000000000..d617a8357f --- /dev/null +++ b/multimedia/videoplayer/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch @@ -0,0 +1,25 @@ +net-libs/srt renamed the SRTO_TSBPDDELAY constant to SRTRO_LATENCY. +https://github.com/Haivision/srt/pull/1364 +https://bugs.gentoo.org/758062 +--- b/modules/access/srt.c ++++ a/modules/access/srt.c +@@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(strea + + /* Set latency */ + i_latency = var_InheritInteger( p_stream, "latency" ); +- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + psz_passphrase = var_InheritString( p_stream, "passphrase" ); +--- a/modules/access_output/srt.c ++++ b/modules/access_output/srt.c +@@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_ + + /* Set latency */ + i_latency = var_InheritInteger( p_access, "latency" ); +- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + if ( psz_passphrase != NULL && psz_passphrase[0] != '\0') diff --git a/multimedia/videoplayer/vlc/pspec.xml b/multimedia/videoplayer/vlc/pspec.xml index 1644c19c05..cac09704a5 100644 --- a/multimedia/videoplayer/vlc/pspec.xml +++ b/multimedia/videoplayer/vlc/pspec.xml @@ -13,8 +13,9 @@ app:gui VLC media player VLC is a famous video player and streamer. - http://mirrors.netix.net/vlc/vlc/3.0.12/vlc-3.0.12.tar.xz + http://mirrors.netix.net/vlc/vlc/3.0.14/vlc-3.0.14.tar.xz + srt-devel qt5-svg-devel wayland-client libcdio-devel @@ -126,7 +127,9 @@ wayland-protocols-devel - lua53_compat.patch + vlc-3.0.11.1-srt-1.4.2.patch + vlc-2.2.8-freerdp-2.patch + @@ -301,6 +304,13 @@ + + 2021-06-04 + 3.0.14 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-02-13 3.0.12