Attachment #189196 for bug #224660




# $FreeBSD$

PORTNAME=	vlc
DISTVERSION=	2.2.8
PORTREVISION=	5
PORTEPOCH=	4
CATEGORIES=	multimedia audio ipv6 net www
MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \

		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libidn.so:dns/libidn
BUILD_DEPENDS=	ffmpeg>=3.4.1,1:multimedia/ffmpeg \
		yasm:devel/yasm
RUN_DEPENDS=	ffmpeg>=3.4.1,1:multimedia/ffmpeg

# VLC git (post 2.2.4) requires C++11 support and passes the appropriate flag
# to the compiler. Until the port is updated, we explicitly pass -std=c++11 to

		--enable-swscale --enable-vlc \
		--disable-alsa --disable-chromaprint --disable-crystalhd \
		--disable-dc1394 --disable-decklink --disable-directfb \
		--disable-dv1394 --disable-fdkaac \
		--disable-gles1 --disable-gles2 --disable-kai --disable-kva \
		--disable-vnc --disable-opencv --disable-projectm \
		--disable-telx \
		--disable-tiger --disable-tremor --disable-udev \
		--disable-update-check --disable-vcdx --disable-vsxu \
		--disable-wasapi --disable-x26410b \

CFLAGS_i386=	-fomit-frame-pointer
LIBS+=		-L${LOCALBASE}/lib

OPTIONS_DEFINE=	A52 AALIB ASS AVAHI CACA DBUS DCA DOCS DVDREAD \
		DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNOMEVFS2 GNUTLS \
		GOOM HTTPD JACK KATE LIBBLURAY LIBRSVG2 LIBSSH2 LIRC \
		LIVEMEDIA LUA MAD MATROSKA MODPLUG MPEG2 MTP MUSEPACK \
		NCURSES NLS NOTIFY OGG OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \
		QT4 QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY SCHROEDINGER \
		SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \
		TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS X11 X264 X265 ZVBI
		X11 X264 X265 ZVBI
OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \
		HTTPD LIVEMEDIA LUA MAD MATROSKA MPEG2 OGG OPTIMIZED_CFLAGS \
		OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME V4L \

DCA_LIB_DEPENDS=	libdca.so:multimedia/libdca
DCA_CONFIGURE_ENABLE=	dca

DIRAC_LIB_DEPENDS=	libdirac_decoder.so:multimedia/dirac
DIRAC_CONFIGURE_ENABLE=	dirac

DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
DVDREAD_CONFIGURE_ENABLE=	dvdread


FLUID_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
FLUID_CONFIGURE_ENABLE=	fluidsynth

FREERDP_LIB_DEPENDS=	libfreerdp2.so:net/freerdp
FREERDP_CONFIGURE_ENABLE=	freerdp
FREERDP_CONFIGURE_ENV=	FREERDP_CFLAGS="-I${LOCALBASE}/include/freerdp2 \
					-I${LOCALBASE}/include/winpr2" \
			FREERDP_LIBS="-L${LOCALBASE}/lib"

FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
FRIBIDI_CONFIGURE_ENABLE=	fribidi

SDL_USE=		SDL=image
SDL_CONFIGURE_ENABLE=	sdl sdl-image

SIDPLAY_LIB_DEPENDS=	libsidplay2.so:audio/libsidplay2
SIDPLAY_LDFLAGS=	-L${LOCALBASE}/lib/sidplay/builders
SIDPLAY_CONFIGURE_ENABLE=	sid
#SIDPLAY_LDFLAGS=	-L${LOCALBASE}/lib/sidplay/builders
#SIDPLAY_CONFIGURE_ENABLE=	sid
CONFIGURE_ARGS+=	--disable-sid

SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout


X11_USE=		GL=gl XORG=xcb,xproto
X11_LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
X11_CONFIGURE_ENABLE=	xcb xvideo
X11_CONFIGURE_WITH=	x

X264_LIB_DEPENDS=	libx264.so:multimedia/libx264

Lines 1-3 Link Here

(-)multimedia/vlc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1495777516	1	TIMESTAMP = 1514481430
2	SHA256 (vlc-2.2.6.tar.xz) = c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8	2	SHA256 (vlc-2.2.8.tar.xz) = 9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec
3	SIZE (vlc-2.2.6.tar.xz) = 22198720	3	SIZE (vlc-2.2.8.tar.xz) = 22137276




--- modules/access/rdp.c.orig	2017-12-28 22:01:11.278372000 +0100
+++ modules/access/rdp.c	2017-12-28 22:43:21.243208000 +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,17 +138,21 @@
 
     /* 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;
@@ -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 );

Lines 5-8 Link Here

(-)multimedia/vlc/pkg-descr (-1 / +1 lines)
5	IPv4 or IPv6 on a high-bandwidth network. VLC also has the ability	5	IPv4 or IPv6 on a high-bandwidth network. VLC also has the ability
6	to transcode media on-the-fly for streaming or saving to disk.	6	to transcode media on-the-fly for streaming or saving to disk.
7		7
8	WWW: http://www.videolan.org/	8	WWW: https://www.videolan.org

Lines 96-105 Link Here

(-)multimedia/vlc/pkg-plist (-2 / +2 lines)
96	include/vlc/vlc.h	96	include/vlc/vlc.h
97	lib/libvlc.so	97	lib/libvlc.so
98	lib/libvlc.so.5	98	lib/libvlc.so.5
99	lib/libvlc.so.5.5.0	99	lib/libvlc.so.5.5.1
100	lib/libvlccore.so	100	lib/libvlccore.so
101	lib/libvlccore.so.8	101	lib/libvlccore.so.8
102	lib/libvlccore.so.8.0.0	102	lib/libvlccore.so.8.0.1
103	libdata/pkgconfig/libvlc.pc	103	libdata/pkgconfig/libvlc.pc
104	libdata/pkgconfig/vlc-plugin.pc	104	libdata/pkgconfig/vlc-plugin.pc
105	man/man1/vlc-wrapper.1.gz	105	man/man1/vlc-wrapper.1.gz

Return to bug 224660

Lines 2-9 Link Here

(-)multimedia/vlc/Makefile (-28 / +22 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= vlc	4	PORTNAME= vlc
5	DISTVERSION= 2.2.6	5	DISTVERSION= 2.2.8
6	PORTREVISION= 5
7	PORTEPOCH= 4	6	PORTEPOCH= 4
8	CATEGORIES= multimedia audio ipv6 net www	7	CATEGORIES= multimedia audio ipv6 net www
9	MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \	8	MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
Lines 20-28 Link Here
20	libfontconfig.so:x11-fonts/fontconfig \	19	libfontconfig.so:x11-fonts/fontconfig \
21	libfreetype.so:print/freetype2 \	20	libfreetype.so:print/freetype2 \
22	libidn.so:dns/libidn	21	libidn.so:dns/libidn
23	BUILD_DEPENDS= ffmpeg>=2.0:multimedia/ffmpeg \	22	BUILD_DEPENDS= ffmpeg>=3.4.1,1:multimedia/ffmpeg \
24	yasm:devel/yasm	23	yasm:devel/yasm
25	RUN_DEPENDS= ffmpeg>=2.0:multimedia/ffmpeg	24	RUN_DEPENDS= ffmpeg>=3.4.1,1:multimedia/ffmpeg
26		25
27	# VLC git (post 2.2.4) requires C++11 support and passes the appropriate flag	26	# VLC git (post 2.2.4) requires C++11 support and passes the appropriate flag
28	# to the compiler. Until the port is updated, we explicitly pass -std=c++11 to	27	# to the compiler. Until the port is updated, we explicitly pass -std=c++11 to
Lines 45-54 Link Here
45	--enable-swscale --enable-vlc \	44	--enable-swscale --enable-vlc \
46	--disable-alsa --disable-chromaprint --disable-crystalhd \	45	--disable-alsa --disable-chromaprint --disable-crystalhd \
47	--disable-dc1394 --disable-decklink --disable-directfb \	46	--disable-dc1394 --disable-decklink --disable-directfb \
48	--disable-dv1394 --disable-egl --disable-fdkaac \	47	--disable-dv1394 --disable-fdkaac \
49	--disable-gles1 --disable-gles2 --disable-kai --disable-kva \	48	--disable-gles1 --disable-gles2 --disable-kai --disable-kva \
50	--disable-libvnc --disable-opencv --disable-projectm \	49	--disable-vnc --disable-opencv --disable-projectm \
51	--disable-quicksync --disable-telx \	50	--disable-telx \
52	--disable-tiger --disable-tremor --disable-udev \	51	--disable-tiger --disable-tremor --disable-udev \
53	--disable-update-check --disable-vcdx --disable-vsxu \	52	--disable-update-check --disable-vcdx --disable-vsxu \
54	--disable-wasapi --disable-x26410b \	53	--disable-wasapi --disable-x26410b \
Lines 61-75 Link Here
61	CFLAGS_i386= -fomit-frame-pointer	60	CFLAGS_i386= -fomit-frame-pointer
62	LIBS+= -L${LOCALBASE}/lib	61	LIBS+= -L${LOCALBASE}/lib
63		62
64	OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA DIRAC DOCS DVDREAD \	63	OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA DOCS DVDREAD \
65	DVDNAV FAAD FLAC FLUID FRIBIDI GME GNOMEVFS2 GNUTLS \	64	DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNOMEVFS2 GNUTLS \
66	GOOM HTTPD JACK KATE LIBBLURAY LIBRSVG2 LIBSSH2 LIRC \	65	GOOM HTTPD JACK KATE LIBBLURAY LIBRSVG2 LIBSSH2 LIRC \
67	LIVEMEDIA LUA MAD MATROSKA MODPLUG \	66	LIVEMEDIA LUA MAD MATROSKA MODPLUG MPEG2 MTP MUSEPACK \
68	MPEG2 MTP MUSEPACK NCURSES NLS NOTIFY OGG OPTIMIZED_CFLAGS \	67	NCURSES NLS NOTIFY OGG OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \
69	OPUS PNG PULSEAUDIO QT4 QT5 REALRTSP RUNROOT SAMPLERATE \	68	QT4 QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY SCHROEDINGER \
70	SCHROEDINGER SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX \	69	SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \
71	TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS \	70	TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS X11 X264 X265 ZVBI
72	X11 X264 X265 ZVBI
73	OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \	71	OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \
74	HTTPD LIVEMEDIA LUA MAD MATROSKA MPEG2 OGG OPTIMIZED_CFLAGS \	72	HTTPD LIVEMEDIA LUA MAD MATROSKA MPEG2 OGG OPTIMIZED_CFLAGS \
75	OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME V4L \	73	OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME V4L \
Lines 116-124 Link Here
116	DCA_LIB_DEPENDS= libdca.so:multimedia/libdca	114	DCA_LIB_DEPENDS= libdca.so:multimedia/libdca
117	DCA_CONFIGURE_ENABLE= dca	115	DCA_CONFIGURE_ENABLE= dca
118		116
119	DIRAC_LIB_DEPENDS= libdirac_decoder.so:multimedia/dirac
120	DIRAC_CONFIGURE_ENABLE= dirac
121
122	DVDREAD_LIB_DEPENDS= libdvdread.so:multimedia/libdvdread	117	DVDREAD_LIB_DEPENDS= libdvdread.so:multimedia/libdvdread
123	DVDREAD_CONFIGURE_ENABLE= dvdread	118	DVDREAD_CONFIGURE_ENABLE= dvdread
124		119
Lines 136-145 Link Here
136	FLUID_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth	131	FLUID_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
137	FLUID_CONFIGURE_ENABLE= fluidsynth	132	FLUID_CONFIGURE_ENABLE= fluidsynth
138		133
139	# XXX vlc doesn't seem to like the freerdp version in ports	134	FREERDP_LIB_DEPENDS= libfreerdp2.so:net/freerdp
140	#FREERDP_LIB_DEPENDS= libfreerdp-core.so:net/freerdp	135	FREERDP_CONFIGURE_ENABLE= freerdp
141	#FREERDP_CONFIGURE_ENABLE= libfreerdp	136	FREERDP_CONFIGURE_ENV= FREERDP_CFLAGS="-I${LOCALBASE}/include/freerdp2 \
142	CONFIGURE_ARGS+= -disable-freerdp	137	-I${LOCALBASE}/include/winpr2" \
		138	FREERDP_LIBS="-L${LOCALBASE}/lib"
143		139
144	FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi	140	FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi
145	FRIBIDI_CONFIGURE_ENABLE= fribidi	141	FRIBIDI_CONFIGURE_ENABLE= fribidi
Lines 261-271 Link Here
261	SDL_USE= SDL=image	257	SDL_USE= SDL=image
262	SDL_CONFIGURE_ENABLE= sdl sdl-image	258	SDL_CONFIGURE_ENABLE= sdl sdl-image
263		259
264	# libsidplay build broken with:	260	SIDPLAY_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2
265	# /usr/bin/ld: /usr/local/lib/sidplay/builders/libresid-builder.a(resid-builder.o): relocation R_X86_64_32S against `_ZTV12ReSIDBuilder' can not be used when making a shared object; recompile with -fPIC	261	SIDPLAY_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders
266	#SIDPLAY_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2	262	SIDPLAY_CONFIGURE_ENABLE= sid
267	#SIDPLAY_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders
268	#SIDPLAY_CONFIGURE_ENABLE= sid
269	CONFIGURE_ARGS+= --disable-sid	263	CONFIGURE_ARGS+= --disable-sid
270		264
271	SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout	265	SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout
Lines 312-318 Link Here
312		306
313	X11_USE= GL=gl XORG=xcb,xproto	307	X11_USE= GL=gl XORG=xcb,xproto
314	X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms	308	X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms
315	X11_CONFIGURE_ENABLE= glx xcb xvideo	309	X11_CONFIGURE_ENABLE= xcb xvideo
316	X11_CONFIGURE_WITH= x	310	X11_CONFIGURE_WITH= x
317		311
318	X264_LIB_DEPENDS= libx264.so:multimedia/libx264	312	X264_LIB_DEPENDS= libx264.so:multimedia/libx264

Line 0 Link Here

(-)multimedia/vlc/files/patch-modules-access-rdp.c (+118 lines)
		1	--- modules/access/rdp.c.orig 2017-12-28 22:01:11.278372000 +0100
		2	+++ modules/access/rdp.c 2017-12-28 22:43:21.243208000 +0100
		3	@@ -45,18 +45,6 @@
		4	# include <freerdp/version.h>
		5	#endif
		6
		7	-#if !defined(FREERDP_VERSION_MAJOR) \|\| \
		8	- (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 \|\| (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)))
		9	-# define SoftwareGdi sw_gdi
		10	-# define Fullscreen fullscreen
		11	-# define ServerHostname hostname
		12	-# define Username username
		13	-# define Password password
		14	-# define ServerPort port
		15	-# define EncryptionMethods encryption
		16	-# define ContextSize context_size
		17	-#endif
		18	-
		19	#include <errno.h>
		20	#ifdef HAVE_POLL
		21	# include <poll.h>
		22	@@ -140,6 +128,7 @@
		23	vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context;
		24	demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;
		25	rdpGdi *p_gdi = p_context->gdi;
		26	+ unsigned bytesPerPixel;
		27
		28	if ( p_sys->es )
		29	{
		30	@@ -149,17 +138,21 @@
		31
		32	/* Now init and fill es format */
		33	vlc_fourcc_t i_chroma;
		34	- switch( p_gdi->bytesPerPixel )
		35	+ switch( p_gdi->dstFormat )
		36	{
		37	default:
		38	- case 16:
		39	+ msg_Dbg( p_vlccontext->p_demux, "unhandled dstFormat %x bpp", p_gdi->dstFormat );
		40	+ case PIXEL_FORMAT_BGR16:
		41	i_chroma = VLC_CODEC_RGB16;
		42	+ bytesPerPixel = 16;
		43	break;
		44	- case 24:
		45	+ case PIXEL_FORMAT_BGR24:
		46	i_chroma = VLC_CODEC_RGB24;
		47	+ bytesPerPixel = 24;
		48	break;
		49	- case 32:
		50	+ case PIXEL_FORMAT_BGRA32:
		51	i_chroma = VLC_CODEC_RGB32;
		52	+ bytesPerPixel = 32;
		53	break;
		54	}
		55	es_format_t fmt;
		56	@@ -172,7 +165,7 @@
		57	fmt.video.i_height = p_gdi->height;
		58	fmt.video.i_frame_rate_base = 1000;
		59	fmt.video.i_frame_rate = 1000 * p_sys->f_fps;
		60	- p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel;
		61	+ p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * bytesPerPixel;
		62
		63	if ( p_sys->p_block )
		64	p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize );
65	@@ -233,28 +226,19 @@
66	vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
67
68	msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
69	-#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 \|\| (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))
70	p_instance->settings->DesktopWidth,
71	p_instance->settings->DesktopHeight,
72	p_instance->settings->ColorDepth
73	-#else
74	- p_instance->settings->width,
75	- p_instance->settings->height,
76	- p_instance->settings->color_depth
77	-#endif
78	);
79
80	p_instance->update->DesktopResize = desktopResizeHandler;
81	p_instance->update->BeginPaint = beginPaintHandler;
82	p_instance->update->EndPaint = endPaintHandler;
83
84	- gdi_init( p_instance,
85	- CLRBUF_16BPP \|
86	-#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
87	- !(FREERDP_VERSION_MAJOR > 1 \|\| (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
88	- CLRBUF_24BPP \|
89	-#endif
90	- CLRBUF_32BPP, NULL );
91	+ if ( p_instance->settings->ColorDepth > 16 )
92	+ gdi_init( p_instance, PIXEL_FORMAT_XRGB32);
93	+ else
94	+ gdi_init( p_instance, PIXEL_FORMAT_RGB16);
95
96	desktopResizeHandler( p_instance->context );
97	return true;
98	@@ -428,10 +412,6 @@
99	if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
100	p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
101
102	-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
103	- freerdp_channels_global_init();
104	-#endif
105	-
106	p_sys->p_instance = freerdp_new();
107	if ( !p_sys->p_instance )
108	{
109	@@ -506,9 +486,6 @@
110
111	freerdp_disconnect( p_sys->p_instance );
112	freerdp_free( p_sys->p_instance );
113	-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
114	- freerdp_channels_global_uninit();
115	-#endif
116
117	if ( p_sys->p_block )
118	block_Release( p_sys->p_block );