From owner-freebsd-multimedia@FreeBSD.ORG Tue Feb 4 20:10:01 2014 Return-Path: Delivered-To: freebsd-multimedia@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70F2B469 for ; Tue, 4 Feb 2014 20:10:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5A35F155B for ; Tue, 4 Feb 2014 20:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s14KA1go024249 for ; Tue, 4 Feb 2014 20:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s14KA1lK024248; Tue, 4 Feb 2014 20:10:01 GMT (envelope-from gnats) Date: Tue, 4 Feb 2014 20:10:01 GMT Message-Id: <201402042010.s14KA1lK024248@freefall.freebsd.org> To: freebsd-multimedia@FreeBSD.org Cc: From: Juergen Lock Subject: Re: ports/185848: multimedia/vlc failed to compile with the new freerdp. X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Juergen Lock List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Feb 2014 20:10:01 -0000 The following reply was made to PR ports/185848; it has been noted by GNATS. From: Juergen Lock To: bug-followup@freebsd.org Cc: Christoph Moench-Tegeder , Anton Sayetsky , Guido Falsi Subject: Re: ports/185848: multimedia/vlc failed to compile with the new freerdp. Date: Tue, 4 Feb 2014 21:04:20 +0100 --n8g4imXOkfNTN/H1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline [Cc'ing submitters of all 3 PRs: ports/185848, ports/186413, ports/186452] Can you verify I extracted the patch out of ports/185848 correctly and that my merged version of it with the patch out of ports/186452 (attched) works properly? Thanx! Juergen --n8g4imXOkfNTN/H1 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="freerdp-ports-185848-186452.patch" Index: Makefile =================================================================== --- Makefile (revision 342459) +++ Makefile (working copy) @@ -22,7 +22,7 @@ BUILD_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ 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 Index: files/patch-modules-access-rdp.c =================================================================== --- files/patch-modules-access-rdp.c (revision 0) +++ files/patch-modules-access-rdp.c (working copy) @@ -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; --n8g4imXOkfNTN/H1--