Changes of Revision 235
vlc-beta.spec
Changed
x
1
2
Patch1: vlc.a52dec.patch
3
Patch2: vlc.hostname.patch
4
Patch5: fix_lib_version.patch
5
-Patch6: fix_freerdp2_detection.patch
6
Patch7: fix_lua53_luaL_checkint.patch
7
8
%ifarch x86_64 aarch64
9
fix_freerdp2_detection.patch
Deleted
88
1
2
---- a/configure.ac
3
-+++ b/configure.ac
4
-@@ -2318,7 +2318,7 @@ PKG_ENABLE_MODULES_VLC(VNC, vnc, li
5
-
6
- dnl RDP/Remote Desktop access module
7
- dnl
8
--PKG_ENABLE_MODULES_VLC(FREERDP, rdp, freerdp >= 1.0.1, (RDP/Remote Desktop client support) )
9
-+PKG_ENABLE_MODULES_VLC(FREERDP, rdp, freerdp2, (RDP/Remote Desktop client support) )
10
-
11
- dnl
12
- dnl AVFoundation
13
---- a/modules/access/rdp.c
14
-+++ b/modules/access/rdp.c
15
-@@ -142,6 +142,7 @@ static void desktopResizeHandler( rdpCon
16
- vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context;
17
- demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;
18
- rdpGdi *p_gdi = p_context->gdi;
19
-+ unsigned bytesPerPixel;
20
-
21
- if ( p_sys->es )
22
- {
23
-@@ -151,6 +152,26 @@ static void desktopResizeHandler( rdpCon
24
-
25
- /* Now init and fill es format */
26
- vlc_fourcc_t i_chroma;
27
-+#if defined(FREERDP_VERSION_MAJOR) && FREERDP_VERSION_MAJOR == 2
28
-+ switch( p_gdi->dstFormat )
29
-+ {
30
-+ default:
31
-+ msg_Dbg( p_vlccontext->p_demux, "unhandled dstFormat %x bpp", p_gdi->dstFormat);
32
-+ case PIXEL_FORMAT_BGR16:
33
-+ i_chroma = VLC_CODEC_RGB16;
34
-+ bytesPerPixel = 16;
35
-+ break;
36
-+ case PIXEL_FORMAT_BGR24:
37
-+ i_chroma = VLC_CODEC_RGB24;
38
-+ bytesPerPixel = 24;
39
-+ break;
40
-+ case PIXEL_FORMAT_BGRA32:
41
-+ i_chroma = VLC_CODEC_RGB32;
42
-+ bytesPerPixel = 32;
43
-+ break;
44
-+ }
45
-+#else
46
-+ bytesPerPixel = p_gdi->bytesPerPixel;
47
- switch( p_gdi->bytesPerPixel )
48
- {
49
- default:
50
-@@ -164,6 +185,7 @@ static void desktopResizeHandler( rdpCon
51
- i_chroma = VLC_CODEC_RGB32;
52
- break;
53
- }
54
-+#endif
55
- es_format_t fmt;
56
- es_format_Init( &fmt, VIDEO_ES, i_chroma );
57
-
58
-@@ -174,7 +196,7 @@ static void desktopResizeHandler( rdpCon
59
- fmt.video.i_height = p_gdi->height;
60
- fmt.video.i_frame_rate_base = 1000;
61
- fmt.video.i_frame_rate = 1000 * p_sys->f_fps;
62
-- p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel;
63
-+ p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * bytesPerPixel;
64
-
65
- if ( p_sys->p_block )
66
- p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize );
67
-@@ -250,6 +272,12 @@ static bool postConnectHandler( freerdp
68
- p_instance->update->BeginPaint = beginPaintHandler;
69
- p_instance->update->EndPaint = endPaintHandler;
70
-
71
-+#if defined(FREERDP_VERSION_MAJOR) && FREERDP_VERSION_MAJOR == 2
72
-+ if ( p_instance->settings->ColorDepth > 16 )
73
-+ gdi_init( p_instance, PIXEL_FORMAT_XRGB32);
74
-+ else
75
-+ gdi_init( p_instance, PIXEL_FORMAT_RGB16);
76
-+#else
77
- gdi_init( p_instance,
78
- CLRBUF_16BPP |
79
- #if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
80
-@@ -257,6 +285,7 @@ static bool postConnectHandler( freerdp
81
- CLRBUF_24BPP |
82
- #endif
83
- CLRBUF_32BPP, NULL );
84
-+#endif
85
-
86
- desktopResizeHandler( p_instance->context );
87
- return true;
88
_service:obs_scm:vlc-beta-20220729.299c29cb23.obscpio
Deleted
_service:obs_scm:vlc-beta-20220731.e40112f175.obscpio
Added
_service:obs_scm:vlc-beta.obsinfo
Changed
9
1
2
name: vlc-beta
3
-version: 20220729.299c29cb23
4
-mtime: 1659101559
5
-commit: 299c29cb2381c6d14b8f5e16601d1b7e4b789f1b
6
+version: 20220731.e40112f175
7
+mtime: 1659279610
8
+commit: e40112f175356227d7baa484c80e9c679cc9f110
9