ports/185848: multimedia/vlc failed to compile with the new freerdp.

[Ferenc Gál]

The following reply was made to PR ports/185848; it has been noted by GNATS.

From: =?ISO-8859-1?Q?Ferenc_G=E1l?= <gferenc88 at gmail.com>
To: bug-followup at FreeBSD.org, gferenc88 at gmail.com
Cc:  
Subject: Re: ports/185848: multimedia/vlc failed to compile with the new freerdp.
Date: Sun, 19 Jan 2014 11:37:09 +0100

 --047d7b5d86b57fc10c04f0505bfa
 Content-Type: text/plain; charset=ISO-8859-1
 
 Hi,
 
 i have made a patch for this problem:
 
 patch-modules-access-rdp.c:
 
 --- 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;
 
 --047d7b5d86b57fc10c04f0505bfa
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 <div dir=3D"ltr"><div>Hi,<br><br></div>i have made a patch for this problem=
 :<br><br>patch-modules-access-rdp.c:<br><br>--- modules/access/rdp.c.orig<b=
 r>+++ modules/access/rdp.c<br>@@ -198,17 +198,17 @@<br>=A0=A0=A0=A0 demux_s=
 ys_t *p_sys =3D p_vlccontext->p_demux->p_sys;<br>
 <br>=A0=A0=A0=A0 /* Configure connexion */<br>-=A0=A0=A0 p_instance->set=
 tings->sw_gdi =3D true; /* render in buffer */<br>-=A0=A0=A0 p_instance-=
 >settings->fullscreen =3D true;<br>-=A0=A0=A0 p_instance->settings=
 ->hostname =3D strdup( p_sys->psz_hostname );<br>
 -=A0=A0=A0 p_instance->settings->username =3D<br>+=A0=A0=A0 p_instanc=
 e->settings->SoftwareGdi =3D true; /* render in buffer */<br>+=A0=A0=
 =A0 p_instance->settings->Fullscreen =3D true;<br>+=A0=A0=A0 p_instan=
 ce->settings->ServerHostname =3D strdup( p_sys->psz_hostname );<br=
 >
 +=A0=A0=A0 p_instance->settings->Username =3D<br>=A0=A0=A0=A0=A0=A0=
 =A0=A0=A0=A0=A0=A0 var_InheritString( p_vlccontext->p_demux, CFG_PREFIX =
 "user" );<br>-=A0=A0=A0 p_instance->settings->password =3D<=
 br>+=A0=A0=A0 p_instance->settings->Password =3D<br>
 =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 var_InheritString( p_vlccontext->p_=
 demux, CFG_PREFIX "password" );<br>-=A0=A0=A0 p_instance->sett=
 ings->port =3D p_sys->i_port;<br>-=A0=A0=A0 p_instance->settings-&=
 gt;encryption =3D<br>+=A0=A0=A0 p_instance->settings->ServerPort =3D =
 p_sys->i_port;<br>
 +=A0=A0=A0 p_instance->settings->EncryptionMethods =3D<br>=A0=A0=A0=
 =A0=A0=A0=A0=A0=A0=A0=A0=A0 var_InheritBool( p_vlccontext->p_demux, CFG_=
 PREFIX "encrypt" );<br>-<br>+<br>=A0=A0=A0=A0 return true;<br>=A0=
 }<br><br>@@ -217,9 +217,9 @@<br>=A0=A0=A0=A0 vlcrdp_context_t * p_vlccontex=
 t =3D (vlcrdp_context_t *) p_instance->context;<br>
 <br>=A0=A0=A0=A0 msg_Dbg( p_vlccontext->p_demux, "connected to desk=
 top %dx%d (%d bpp)",<br>-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 p_instan=
 ce->settings->width,<br>-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 p_insta=
 nce->settings->height,<br>-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 p_ins=
 tance->settings->color_depth );<br>
 +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 p_instance->settings->DesktopWi=
 dth,<br>+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 p_instance->settings->D=
 esktopHeight,<br>+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 p_instance->setti=
 ngs->ColorDepth );<br><br>=A0=A0=A0=A0 p_instance->update->Desktop=
 Resize =3D desktopResizeHandler;<br>
 =A0=A0=A0=A0 p_instance->update->BeginPaint =3D beginPaintHandler;<br=
 >@@ -415,7 +415,7 @@<br>=A0=A0=A0=A0 p_sys->p_instance->Authenticate =
 =3D authenticateHandler;<br><br>=A0=A0=A0=A0 /* Set up context handlers and=
  let it be allocated */<br>
 -=A0=A0=A0 p_sys->p_instance->context_size =3D sizeof( vlcrdp_context=
 _t );<br>+=A0=A0=A0 p_sys->p_instance->ContextSize =3D sizeof( vlcrdp=
 _context_t );<br>=A0=A0=A0=A0 freerdp_context_new( p_sys->p_instance );<=
 br><br>=A0=A0=A0=A0 vlcrdp_context_t * p_vlccontext =3D (vlcrdp_context_t *=
 ) p_sys->p_instance->context;<br>
 <br></div>
 
 --047d7b5d86b57fc10c04f0505bfa--