Index: head/multimedia/vlc/Makefile =================================================================== --- head/multimedia/vlc/Makefile (revision 457762) +++ head/multimedia/vlc/Makefile (revision 457763) @@ -1,384 +1,378 @@ # Created by: Brian Somers # $FreeBSD$ PORTNAME= vlc -DISTVERSION= 2.2.6 -PORTREVISION= 5 +DISTVERSION= 2.2.8 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ ftp://ftp.crans.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ MAINTAINER= multimedia@FreeBSD.org COMMENT?= Qt based multimedia player and streaming server LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libdvbpsi.so:multimedia/libdvbpsi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libidn.so:dns/libidn -BUILD_DEPENDS= ffmpeg>=2.0:multimedia/ffmpeg \ +BUILD_DEPENDS= ffmpeg>=3.4.1,1:multimedia/ffmpeg \ yasm:devel/yasm -RUN_DEPENDS= ffmpeg>=2.0:multimedia/ffmpeg +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 # the compiler because Qt 5.7+ requires C++11 support, and FreeBSD 10.3's clang # does not default to C++11 mode. USE_CXXSTD= c++11 USES= compiler:c++11-lib desktop-file-utils gmake iconv libtool pathfix \ pkgconfig tar:xz USE_GNOME= libxml2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFLICTS?= vlc-qt4-* GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-avcodec --enable-avformat --enable-dvbpsi \ --enable-fontconfig --enable-freetype --enable-libgcrypt \ --enable-libxml2 --enable-oss --enable-postproc \ --enable-swscale --enable-vlc \ --disable-alsa --disable-chromaprint --disable-crystalhd \ --disable-dc1394 --disable-decklink --disable-directfb \ - --disable-dv1394 --disable-egl --disable-fdkaac \ + --disable-dv1394 --disable-fdkaac \ --disable-gles1 --disable-gles2 --disable-kai --disable-kva \ - --disable-libvnc --disable-opencv --disable-projectm \ - --disable-quicksync --disable-telx \ + --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 \ --with-kde-solid=${PREFIX}/share/apps/solid/actions \ ac_cv_search_pthread_rwlock_init=-pthread .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif CPPFLAGS+= -I${LOCALBASE}/include CFLAGS_i386= -fomit-frame-pointer LIBS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA DIRAC DOCS DVDREAD \ - DVDNAV FAAD FLAC FLUID FRIBIDI GME GNOMEVFS2 GNUTLS \ +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 \ - SCHROEDINGER SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX \ - TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS \ - X11 X264 X265 ZVBI + 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 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 \ VAAPI VCD VDPAU VORBIS X11 OPTIONS_SUB= yes ASS_DESC= ASS/SSA subtitle rendering DVDREAD_DESC= DVD Playback support DVDNAV_DESC= DVD menu navigation FLUID_DESC= Fluidsynth MIDI support FREERDP_DESC= RDP support GME_DESC= Game Music Emu (libgme) support GOOM_DESC= Goom visualisation plugin KATE_DESC= Kate codec support LIBSSH2_DESC= SCP/SFTP support via libssh2 REALRTSP_DESC= Real RTSP access module RUNROOT_DESC= Enable running as root SIDPLAY_DESC= C64 sid demux support SKINS_DESC= Skins interface module STREAM_DESC= stream output TAGLIB_DESC= ID3 tag and Ogg comment support VCD_DESC= Audio/Video CD support ZVBI_DESC= VBI decoding support A52_CONFIGURE_ENABLE= a52 A52_CONFIGURE_ON= --with-a52=${LOCALBASE} A52_LIB_DEPENDS= liba52.so:audio/liba52 AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_ENABLE= aa ASS_LIB_DEPENDS= libass.so:multimedia/libass ASS_CONFIGURE_ENABLE= libass AVAHI_LIB_DEPENDS= libavahi-common.so:net/avahi-app AVAHI_CONFIGURE_ENABLE= bonjour CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_ENABLE= caca DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CONFIGURE_ENABLE= dbus 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 DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav DVDNAV_CONFIGURE_ENABLE=dvdnav FAAD_LIB_DEPENDS= libfaad.so:audio/faad FAAD_CONFIGURE_ENABLE= faad FAAD_CONFIGURE_ENV= CPPFLAGS_faad="-I${LOCALBASE}/include" \ LIBS_faad="-L${LOCALBASE}/lib" FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_ENABLE= flac FLUID_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUID_CONFIGURE_ENABLE= fluidsynth -# XXX vlc doesn't seem to like the freerdp version in ports -#FREERDP_LIB_DEPENDS= libfreerdp-core.so:net/freerdp -#FREERDP_CONFIGURE_ENABLE= libfreerdp -CONFIGURE_ARGS+= -disable-freerdp +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 GME_LIB_DEPENDS= libgme.so:audio/libgme GME_CONFIGURE_ENABLE= gme GME_CONFIGURE_ENV= LIBS_gme="-L${LOCALBASE}/lib -lgme" GNOMEVFS2_USE= GNOME=gnomevfs2 GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ENABLE=gnutls GOOM_LIB_DEPENDS= libgoom2.so:graphics/goom GOOM_CONFIGURE_ENABLE= goom HTTPD_CONFIGURE_ENABLE= httpd JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack KATE_LIB_DEPENDS= libkate.so:multimedia/libkate KATE_CONFIGURE_ENABLE= kate LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= bluray LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_CONFIGURE_ENABLE= svg LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 LIBSSH2_CONFIGURE_ENABLE= sftp LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_ENABLE= lirc LIRC_CONFIGURE_ENV= LIBS_lirc="-L${LOCALBASE}/lib -llirc_client" LIVEMEDIA_LIB_DEPENDS= libliveMedia.so:net/liveMedia LIVEMEDIA_CONFIGURE_ENABLE= live555 LIVEMEDIA_CONFIGURE_ENV= \ LIVE555_CFLAGS="-I${LOCALBASE}/include/liveMedia \ -I${LOCALBASE}/include/UsageEnvironment \ -I${LOCALBASE}/include/groupsock \ -I${LOCALBASE}/include/BasicUsageEnvironment" \ LIVE555_LIBS="-L${LOCALBASE}/lib -lliveMedia \ -lgroupsock -lBasicUsageEnvironment \ -lUsageEnvironment" LUA_USES= lua LUA_CONFIGURE_ENABLE= lua LUA_CONFIGURE_ON= LUAC=${LUAC_CMD} LUA_CFLAGS="-I${LUA_INCDIR}" \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" MAD_LIB_DEPENDS= libmad.so:audio/libmad MAD_CONFIGURE_ENABLE= mad MAD_CONFIGURE_ON= --with-mad=${LOCALBASE} MATROSKA_LIB_DEPENDS= libmatroska.so:multimedia/libmatroska MATROSKA_CONFIGURE_ENABLE= mkv MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MODPLUG_CONFIGURE_ENABLE= mod MPEG2_LIB_DEPENDS= libmpeg2.so:multimedia/libmpeg2 MPEG2_CONFIGURE_ENABLE= libmpeg2 MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp MTP_CONFIGURE_ENABLE= mtp MUSEPACK_LIB_DEPENDS= libmpcdec.so:audio/musepack MUSEPACK_CONFIGURE_ENABLE= mpc MUSEPACK_CONFIGURE_ENV= LIBS_mpc="-L${LOCALBASE}/lib -lmpcdec" NCURSES_USES= ncurses NCURSES_CONFIGURE_ENV= NCURSES_CFLAGS="-I${NCURSESINC}" \ NCURSES_LIBS="-L${NCURSESLIB} -lncursesw" NCURSES_CONFIGURE_ENABLE= ncurses NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_USE= GNOME=gtk20 NOTIFY_CONFIGURE_ENABLE=notify OGG_LIB_DEPENDS= libogg.so:audio/libogg OGG_CONFIGURE_ENABLE= ogg OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_ENABLE= opus PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_ENABLE= png PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse QT4_USE= QT4=gui,corelib,moc_build,rcc_build,uic_build # QT_CFLAGS: pkg-config --cflags "QtCore QtGui >= 4.6.0" # QT_LIBS: pkg-config --libs "QtCore QtGui >= 4.6.0" QT4_CONFIGURE_ENV= QT_CFLAGS="-I${QT_INCDIR}/QtGui -DQT_SHARED -I${QT_INCDIR} -I${QT_INCDIR}/QtCore" \ QT_LIBS="-lQtGui -L${QT_LIBDIR} -lQtCore" QT5_USE= QT5=gui,core,widgets,x11extras,buildtools_build REALRTSP_CONFIGURE_ENABLE= realrtsp RUNROOT_CONFIGURE_ENABLE= run-as-root SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= schroedinger SDL_USE= SDL=image SDL_CONFIGURE_ENABLE= sdl sdl-image -# libsidplay build broken with: -# /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 -#SIDPLAY_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2 -#SIDPLAY_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders -#SIDPLAY_CONFIGURE_ENABLE= sid +SIDPLAY_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2 +SIDPLAY_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders +SIDPLAY_CONFIGURE_ENABLE= sid CONFIGURE_ARGS+= --disable-sid SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout SHOUTCAST_CONFIGURE_ENABLE= shout SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_ENABLE= sndio SMB_USES= samba:lib SMB_CONFIGURE_ENABLE= smbclient STREAM_CONFIGURE_ENABLE=sout SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SPEEX_CONFIGURE_ENABLE= speex TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib TAGLIB_CONFIGURE_ENABLE=taglib THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CONFIGURE_ENABLE=theora TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame TWOLAME_CONFIGURE_ENABLE= twolame UPNP_LIB_DEPENDS= libupnp.so:devel/upnp UPNP_CONFIGURE_ENABLE= upnp V4L_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CONFIGURE_ENABLE= v4l2 VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CONFIGURE_ENABLE= libva VCD_LIB_DEPENDS= libcddb.so:audio/libcddb VCD_CONFIGURE_ENABLE= vcd libcddb VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE=vorbis X11_USE= GL=gl XORG=xcb,xproto X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms -X11_CONFIGURE_ENABLE= glx xcb xvideo +X11_CONFIGURE_ENABLE= xcb xvideo X11_CONFIGURE_WITH= x X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_ENABLE= x264 X265_LIB_DEPENDS= libx265.so:multimedia/x265 X265_CONFIGURE_ENABLE= x265 ZVBI_LIB_DEPENDS= libzvbi.so:devel/libzvbi ZVBI_CONFIGURE_ENABLE= zvbi PORTDATA= * PORTDOCS= * WITH_CDROM_DEVICE?=/dev/cd0 WITH_DVD_DEVICE?=/dev/cd0 .include .if ${PORT_OPTIONS:MX11} INSTALLS_ICONS= yes .endif .if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4} CONFIGURE_ARGS+= --enable-qt .else CONFIGURE_ARGS+= --disable-qt .endif .if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MQT4} IGNORE= please choose one of QT4 or QT5 .endif .if ${PORT_OPTIONS:MSKINS} .if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4} LIB_DEPENDS+= libminizip.so:archivers/minizip \ libtar.so:devel/libtar USE_XORG+= xext xinerama xpm CONFIGURE_ARGS+=--enable-skins2 --enable-libtar .else IGNORE= SKINS option requires QT4 or QT5 option .endif .else CONFIGURE_ARGS+=--disable-skins2 --disable-libtar .endif post-patch: @${REINPLACE_CMD} \ -e '\|LIBS|s|-lrt||' \ -e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \ -e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \ ${WRKSRC}/src/libvlc-module.c @${RM} -r ${WRKSRC}/modules/access/v4l2/linux # XXX FreeBSD doesn't have strerror_l() - use the android version of error.c @${CP} ${WRKSRC}/src/android/error.c ${WRKSRC}/src/posix .if ${PORT_OPTIONS:MQT4} # XXX no sane way to tell configure not to pick up Qt5X11Extras with qt4 @${REINPLACE_CMD} s/Qt5X11Extras/Qt5X11Extras-not/ \ ${WRKSRC}/configure .endif post-install: @(cd ${STAGEDIR}${PREFIX} && ${FIND} -s lib/vlc -not -name '*.la' \ -type f -o -type l >> ${TMPPLIST}) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/vlc/plugins/*/*.so .include Index: head/multimedia/vlc/distinfo =================================================================== --- head/multimedia/vlc/distinfo (revision 457762) +++ head/multimedia/vlc/distinfo (revision 457763) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495777516 -SHA256 (vlc-2.2.6.tar.xz) = c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 -SIZE (vlc-2.2.6.tar.xz) = 22198720 +TIMESTAMP = 1514481430 +SHA256 (vlc-2.2.8.tar.xz) = 9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec +SIZE (vlc-2.2.8.tar.xz) = 22137276 Index: head/multimedia/vlc/files/patch-modules_access_rdp.c =================================================================== --- head/multimedia/vlc/files/patch-modules_access_rdp.c (nonexistent) +++ head/multimedia/vlc/files/patch-modules_access_rdp.c (revision 457763) @@ -0,0 +1,118 @@ +--- modules/access/rdp.c.orig 2016-07-22 12:10:45 UTC ++++ modules/access/rdp.c +@@ -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 @@ static void desktopResizeHandler( rdpCon + 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 @@ static void desktopResizeHandler( rdpCon + + /* 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 @@ static void desktopResizeHandler( rdpCon + 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 @@ static bool postConnectHandler( freerdp + 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 @@ static int Open( vlc_object_t *p_this ) + 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 @@ static void Close( vlc_object_t *p_this + + 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 ); Property changes on: head/multimedia/vlc/files/patch-modules_access_rdp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/vlc/pkg-descr =================================================================== --- head/multimedia/vlc/pkg-descr (revision 457762) +++ head/multimedia/vlc/pkg-descr (revision 457763) @@ -1,8 +1,8 @@ VLC media player is a highly portable multimedia player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, and more) as well as DVD's, VCD's, and various streaming protocols. It can also be used as a server to stream in unicast or multicast in IPv4 or IPv6 on a high-bandwidth network. VLC also has the ability to transcode media on-the-fly for streaming or saving to disk. -WWW: http://www.videolan.org/ +WWW: https://www.videolan.org Index: head/multimedia/vlc/pkg-plist =================================================================== --- head/multimedia/vlc/pkg-plist (revision 457762) +++ head/multimedia/vlc/pkg-plist (revision 457763) @@ -1,216 +1,216 @@ bin/cvlc %%NCURSES%%bin/nvlc %%QT5%%bin/qvlc %%QT4%%bin/qvlc bin/rvlc %%SKINS%%bin/svlc bin/vlc bin/vlc-wrapper include/vlc/deprecated.h include/vlc/libvlc.h include/vlc/libvlc_events.h include/vlc/libvlc_media.h include/vlc/libvlc_media_discoverer.h include/vlc/libvlc_media_library.h include/vlc/libvlc_media_list.h include/vlc/libvlc_media_list_player.h include/vlc/libvlc_media_player.h include/vlc/libvlc_structures.h include/vlc/libvlc_version.h include/vlc/libvlc_vlm.h include/vlc/plugins/vlc_about.h include/vlc/plugins/vlc_access.h include/vlc/plugins/vlc_addons.h include/vlc/plugins/vlc_aout.h include/vlc/plugins/vlc_aout_volume.h include/vlc/plugins/vlc_arrays.h include/vlc/plugins/vlc_atomic.h include/vlc/plugins/vlc_avcodec.h include/vlc/plugins/vlc_bits.h include/vlc/plugins/vlc_block.h include/vlc/plugins/vlc_block_helper.h include/vlc/plugins/vlc_charset.h include/vlc/plugins/vlc_codec.h include/vlc/plugins/vlc_common.h include/vlc/plugins/vlc_config.h include/vlc/plugins/vlc_config_cat.h include/vlc/plugins/vlc_configuration.h include/vlc/plugins/vlc_cpu.h include/vlc/plugins/vlc_demux.h include/vlc/plugins/vlc_dialog.h include/vlc/plugins/vlc_epg.h include/vlc/plugins/vlc_es.h include/vlc/plugins/vlc_es_out.h include/vlc/plugins/vlc_events.h include/vlc/plugins/vlc_filter.h include/vlc/plugins/vlc_fingerprinter.h include/vlc/plugins/vlc_fourcc.h include/vlc/plugins/vlc_fs.h include/vlc/plugins/vlc_gcrypt.h include/vlc/plugins/vlc_http.h include/vlc/plugins/vlc_httpd.h include/vlc/plugins/vlc_image.h include/vlc/plugins/vlc_inhibit.h include/vlc/plugins/vlc_input.h include/vlc/plugins/vlc_input_item.h include/vlc/plugins/vlc_keys.h include/vlc/plugins/vlc_main.h include/vlc/plugins/vlc_md5.h include/vlc/plugins/vlc_meta_fetcher.h include/vlc/plugins/vlc_media_library.h include/vlc/plugins/vlc_messages.h include/vlc/plugins/vlc_meta.h include/vlc/plugins/vlc_mime.h include/vlc/plugins/vlc_modules.h include/vlc/plugins/vlc_mouse.h include/vlc/plugins/vlc_mtime.h include/vlc/plugins/vlc_network.h include/vlc/plugins/vlc_objects.h include/vlc/plugins/vlc_opengl.h include/vlc/plugins/vlc_picture.h include/vlc/plugins/vlc_picture_fifo.h include/vlc/plugins/vlc_picture_pool.h include/vlc/plugins/vlc_playlist.h include/vlc/plugins/vlc_plugin.h include/vlc/plugins/vlc_probe.h include/vlc/plugins/vlc_rand.h include/vlc/plugins/vlc_services_discovery.h include/vlc/plugins/vlc_sout.h include/vlc/plugins/vlc_spu.h include/vlc/plugins/vlc_stream.h include/vlc/plugins/vlc_strings.h include/vlc/plugins/vlc_subpicture.h include/vlc/plugins/vlc_text_style.h include/vlc/plugins/vlc_threads.h include/vlc/plugins/vlc_tls.h include/vlc/plugins/vlc_url.h include/vlc/plugins/vlc_variables.h include/vlc/plugins/vlc_video_splitter.h include/vlc/plugins/vlc_vlm.h include/vlc/plugins/vlc_vout.h include/vlc/plugins/vlc_vout_display.h include/vlc/plugins/vlc_vout_osd.h include/vlc/plugins/vlc_vout_window.h include/vlc/plugins/vlc_xlib.h include/vlc/plugins/vlc_xml.h include/vlc/vlc.h lib/libvlc.so lib/libvlc.so.5 -lib/libvlc.so.5.5.0 +lib/libvlc.so.5.5.1 lib/libvlccore.so lib/libvlccore.so.8 -lib/libvlccore.so.8.0.0 +lib/libvlccore.so.8.0.1 libdata/pkgconfig/libvlc.pc libdata/pkgconfig/vlc-plugin.pc man/man1/vlc-wrapper.1.gz man/man1/vlc.1.gz share/applications/vlc.desktop share/icons/hicolor/128x128/apps/vlc-xmas.png share/icons/hicolor/128x128/apps/vlc.png share/icons/hicolor/16x16/apps/vlc.png share/icons/hicolor/16x16/apps/vlc.xpm share/icons/hicolor/256x256/apps/vlc.png share/icons/hicolor/32x32/apps/vlc-xmas.xpm share/icons/hicolor/32x32/apps/vlc.png share/icons/hicolor/32x32/apps/vlc.xpm share/icons/hicolor/48x48/apps/vlc-xmas.png share/icons/hicolor/48x48/apps/vlc.png share/apps/solid/actions/vlc-openbd.desktop share/apps/solid/actions/vlc-opencda.desktop share/apps/solid/actions/vlc-opendvd.desktop share/apps/solid/actions/vlc-openvcd.desktop %%NLS%%share/locale/ach/LC_MESSAGES/vlc.mo %%NLS%%share/locale/af/LC_MESSAGES/vlc.mo %%NLS%%share/locale/am/LC_MESSAGES/vlc.mo %%NLS%%share/locale/an/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ar/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ast/LC_MESSAGES/vlc.mo %%NLS%%share/locale/az/LC_MESSAGES/vlc.mo %%NLS%%share/locale/be/LC_MESSAGES/vlc.mo %%NLS%%share/locale/bg/LC_MESSAGES/vlc.mo %%NLS%%share/locale/bn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/bn_IN/LC_MESSAGES/vlc.mo %%NLS%%share/locale/br/LC_MESSAGES/vlc.mo %%NLS%%share/locale/bs/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ca/LC_MESSAGES/vlc.mo %%NLS%%share/locale/cgg/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ckb/LC_MESSAGES/vlc.mo %%NLS%%share/locale/co/LC_MESSAGES/vlc.mo %%NLS%%share/locale/cs/LC_MESSAGES/vlc.mo %%NLS%%share/locale/cy/LC_MESSAGES/vlc.mo %%NLS%%share/locale/da/LC_MESSAGES/vlc.mo %%NLS%%share/locale/de/LC_MESSAGES/vlc.mo %%NLS%%share/locale/el/LC_MESSAGES/vlc.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/vlc.mo %%NLS%%share/locale/es/LC_MESSAGES/vlc.mo %%NLS%%share/locale/es_MX/LC_MESSAGES/vlc.mo %%NLS%%share/locale/et/LC_MESSAGES/vlc.mo %%NLS%%share/locale/eu/LC_MESSAGES/vlc.mo %%NLS%%share/locale/fa/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ff/LC_MESSAGES/vlc.mo %%NLS%%share/locale/fi/LC_MESSAGES/vlc.mo %%NLS%%share/locale/fr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/fur/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ga/LC_MESSAGES/vlc.mo %%NLS%%share/locale/gd/LC_MESSAGES/vlc.mo %%NLS%%share/locale/gl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/gu/LC_MESSAGES/vlc.mo %%NLS%%share/locale/he/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hi/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hu/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hy/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ia/LC_MESSAGES/vlc.mo %%NLS%%share/locale/id/LC_MESSAGES/vlc.mo %%NLS%%share/locale/is/LC_MESSAGES/vlc.mo %%NLS%%share/locale/it/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ja/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ka/LC_MESSAGES/vlc.mo %%NLS%%share/locale/kk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/km/LC_MESSAGES/vlc.mo %%NLS%%share/locale/kn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ko/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ks_IN/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ky/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lg/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lt/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lv/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mai/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ml/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ms/LC_MESSAGES/vlc.mo %%NLS%%share/locale/my/LC_MESSAGES/vlc.mo %%NLS%%share/locale/nb/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ne/LC_MESSAGES/vlc.mo %%NLS%%share/locale/nl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/nn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/oc/LC_MESSAGES/vlc.mo %%NLS%%share/locale/or/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pa/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ps/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pt_PT/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ro/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ru/LC_MESSAGES/vlc.mo %%NLS%%share/locale/si/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sq/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sv/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ta/LC_MESSAGES/vlc.mo %%NLS%%share/locale/te/LC_MESSAGES/vlc.mo %%NLS%%share/locale/tet/LC_MESSAGES/vlc.mo %%NLS%%share/locale/th/LC_MESSAGES/vlc.mo %%NLS%%share/locale/tl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/tr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/uk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/uz/LC_MESSAGES/vlc.mo %%NLS%%share/locale/vi/LC_MESSAGES/vlc.mo %%NLS%%share/locale/wa/LC_MESSAGES/vlc.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/vlc.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/vlc.mo %%NLS%%share/locale/zu/LC_MESSAGES/vlc.mo