Date: Tue, 4 Feb 2014 22:07:42 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342613 - in head/multimedia/vlc: . files Message-ID: <201402042207.s14M7gCF082124@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Tue Feb 4 22:07:41 2014 New Revision: 342613 URL: http://svnweb.freebsd.org/changeset/ports/342613 QAT: https://qat.redports.org/buildarchive/r342613/ Log: Add FREERDP knob (default off) [1] and add patch to fix build with it. [2] PR: ports/186452 [1] PR: ports/185848 [2] PR: ports/186413 [3] Submitted by: madpilot [1] Submitted by: Ferenc Gal <gferenc88@gmail.com> [2] Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net> [3] Added: head/multimedia/vlc/files/patch-modules-access-rdp.c (contents, props changed) Modified: head/multimedia/vlc/Makefile Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Tue Feb 4 22:02:31 2014 (r342612) +++ head/multimedia/vlc/Makefile Tue Feb 4 22:07:41 2014 (r342613) @@ -22,7 +22,7 @@ BUILD_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/m RUN_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DIRAC DOCS DTS DVDREAD \ - DVDNAV FAAD FLAC FLUID FRIBIDI GNOMEVFS GNUTLS GOOM \ + DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GNOMEVFS GNUTLS GOOM \ HTTPD JACK LIBSSH2 LIRC LIVEMEDIA LUA MAD MATROSKA MODPLUG \ MPEG2 MTP MUSEPACK NCURSES NLS NOTIFY OPTIMIZED_CFLAGS OGG \ OPUS PNG PULSEAUDIO QT4 REALAUDIO RUNROOT \ @@ -39,6 +39,7 @@ DTS_DESC= DTS DVD audio decoder 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 GNOMEVFS_DESC= Gnome VFS support GOOM_DESC= the Goom visual effect library @@ -103,6 +104,9 @@ FLAC_CONFIGURE_ENABLE= flac FLUID_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth FLUID_CONFIGURE_ENABLE= fluidsynth +FREERDP_LIB_DEPENDS= libfreerdp-core.so:${PORTSDIR}/net/freerdp +FREERDP_CONFIGURE_ENABLE= libfreerdp + FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi FRIBIDI_CONFIGURE_ENABLE= fribidi Added: head/multimedia/vlc/files/patch-modules-access-rdp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-modules-access-rdp.c Tue Feb 4 22:07:41 2014 (r342613) @@ -0,0 +1,50 @@ +--- modules/access/rdp.c.orig ++++ modules/access/rdp.c +@@ -198,17 +198,17 @@ + demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; + + /* Configure connexion */ +- p_instance->settings->sw_gdi = true; /* render in buffer */ +- p_instance->settings->fullscreen = true; +- p_instance->settings->hostname = strdup( p_sys->psz_hostname ); +- p_instance->settings->username = ++ p_instance->settings->SoftwareGdi = true; /* render in buffer */ ++ p_instance->settings->Fullscreen = true; ++ p_instance->settings->ServerHostname = strdup( p_sys->psz_hostname ); ++ p_instance->settings->Username = + var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "user" ); +- p_instance->settings->password = ++ p_instance->settings->Password = + var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "password" ); +- p_instance->settings->port = p_sys->i_port; +- p_instance->settings->encryption = ++ p_instance->settings->ServerPort = p_sys->i_port; ++ p_instance->settings->EncryptionMethods = + var_InheritBool( p_vlccontext->p_demux, CFG_PREFIX "encrypt" ); +- ++ + return true; + } + +@@ -217,9 +217,9 @@ + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; + + msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", +- p_instance->settings->width, +- p_instance->settings->height, +- p_instance->settings->color_depth ); ++ p_instance->settings->DesktopWidth, ++ p_instance->settings->DesktopHeight, ++ p_instance->settings->ColorDepth ); + + p_instance->update->DesktopResize = desktopResizeHandler; + p_instance->update->BeginPaint = beginPaintHandler; +@@ -415,7 +415,7 @@ + p_sys->p_instance->Authenticate = authenticateHandler; + + /* Set up context handlers and let it be allocated */ +- p_sys->p_instance->context_size = sizeof( vlcrdp_context_t ); ++ p_sys->p_instance->ContextSize = sizeof( vlcrdp_context_t ); + freerdp_context_new( p_sys->p_instance ); + + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_sys->p_instance->context;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402042207.s14M7gCF082124>