Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vlc ver. bump

Browse Source
This commit is contained in:
Rmys
2021-06-04 18:17:41 +03:00
committed by GitHub
parent 37d423fe15
commit 87d21c700b
4 changed files with 169 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/videoplayer/vlc/actions.py
+1
View File
@@ -126,6 +126,7 @@ def setup():
--enable-x264 \
--enable-x265 \
--enable-aribsub \
--enable-freerdp \
--enable-xvideo \
")
#enable-skins2 \ --disable-qt4 \
multimedia/videoplayer/vlc/files/vlc-2.2.8-freerdp-2.patch
+131
View File
@@ -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 <freerdp/version.h>
#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 <errno.h>
#ifdef HAVE_POLL
# include <poll.h>
@@ -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 );
multimedia/videoplayer/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch
+25
View File
@@ -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')
multimedia/videoplayer/vlc/pspec.xml
+12 -2
View File
@@ -13,8 +13,9 @@
<IsA>app:gui</IsA>
<Summary>VLC media player</Summary>
<Description>VLC is a famous video player and streamer.</Description>
<Archive sha1sum="39ef414a07202ec6569acda4c5d91e8576d453bf" type="tarxz">http://mirrors.netix.net/vlc/vlc/3.0.12/vlc-3.0.12.tar.xz</Archive>
<Archive sha1sum="8a8613f16a9053668d7a7dcfa1e6d8be93af3e89" type="tarxz">http://mirrors.netix.net/vlc/vlc/3.0.14/vlc-3.0.14.tar.xz</Archive>
<BuildDependencies>
<Dependency>srt-devel</Dependency>
<Dependency>qt5-svg-devel</Dependency>
<Dependency>wayland-client</Dependency>
<Dependency>libcdio-devel</Dependency>
@@ -126,7 +127,9 @@
<Dependency>wayland-protocols-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">lua53_compat.patch</Patch>
<Patch level="1">vlc-3.0.11.1-srt-1.4.2.patch</Patch>
<Patch level="1">vlc-2.2.8-freerdp-2.patch</Patch>
<!-- <Patch level="1">lua53_compat.patch</Patch> -->
<!--Patch level="1">qt_5_15.patch</Patch-->
<!-- <Patch level="1">build_fix.patch</Patch> -->
</Patches>
@@ -301,6 +304,13 @@
</Package>
<History>
<Update release="23">
<Date>2021-06-04</Date>
<Version>3.0.14</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="22">
<Date>2021-02-13</Date>
<Version>3.0.12</Version>