[117524] trunk/dports/multimedia/VLC-devel
jeremyhu at macports.org
jeremyhu at macports.org
Sun Mar 2 12:30:53 PST 2014
Revision: 117524
https://trac.macports.org/changeset/117524
Author: jeremyhu at macports.org
Date: 2014-03-02 12:30:53 -0800 (Sun, 02 Mar 2014)
Log Message:
-----------
VLC-devel: Bump to current git and enable FreeRDP support (#42664)
Modified Paths:
--------------
trunk/dports/multimedia/VLC-devel/Portfile
Added Paths:
-----------
trunk/dports/multimedia/VLC-devel/files/rdp.patch
Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile 2014-03-02 20:29:59 UTC (rev 117523)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2014-03-02 20:30:53 UTC (rev 117524)
@@ -6,7 +6,7 @@
name VLC-devel
version 2.1.99
-revision 7
+revision 8
categories multimedia
@@ -29,7 +29,7 @@
fetch.type git
#git.url git://git.videolan.org/vlc/vlc-2.1.git
git.url git://git.videolan.org/vlc.git
-git.branch ee6b5cefbc89b56b9688698e1e03eb178b653762
+git.branch 508d92f2f8168ac9def51eea59f133af50352d07
#master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
#distname vlc-${version}
@@ -50,8 +50,8 @@
port:libdvdnav port:libdvdread port:libproxy \
port:fluidsynth port:libsamplerate port:libupnp \
port:avahi path:lib/libavcodec.dylib:ffmpeg \
- port:openjpeg15 port:libbluray \
- port:libdc1394 port:libmpeg2 port:dirac port:libass port:libsdl \
+ port:openjpeg15 port:libbluray port:FreeRDP \
+ port:libdc1394 port:libmpeg2 port:libass port:libsdl \
port:libsdl_image port:schroedinger port:speex port:libmodplug \
port:libmpcdec port:fontconfig port:freetype port:fribidi port:libdvbpsi \
port:XviD port:bzip2 port:gettext path:lib/pkgconfig/glib-2.0.pc:glib2 port:gmp \
@@ -60,7 +60,7 @@
port:readline port:xorg-libX11 port:xorg-libXau port:xorg-libXdmcp \
port:xorg-libXext port:xorg-libXrandr port:xorg-libxcb port:xrender
-# TODO: live555 opencv FreeRDP
+# TODO: live555 opencv
# VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
universal_variant no
@@ -81,7 +81,8 @@
PR-34741-no__clang_version__.patch \
class_struct.patch \
static_assert.patch \
- no-sparkle.patch
+ no-sparkle.patch \
+ rdp.patch
post-patch {
reinplace "s:librsvg-2/librsvg:librsvg:" \
@@ -132,12 +133,11 @@
--disable-gnomevfs --disable-growl --disable-macosx-vlc-app \
# Input Plugins
-# build fails when FreeRDP is installed
# build fails when opencv is installed
configure.args-append \
--enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \
--disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
- --disable-freerdp --disable-opencv \
+ --enable-freerdp --disable-opencv \
--enable-sftp
# Mux/Demux Plugins
@@ -152,7 +152,7 @@
--enable-dca --enable-png --disable-quicktime --enable-twolame \
--enable-speex --enable-theora --enable-x264 --enable-postproc \
--enable-avcodec --enable-avformat --enable-swscale \
- --disable-fluidsynth --enable-dirac --enable-schroedinger
+ --disable-fluidsynth --enable-schroedinger
# Video Plugins
configure.args-append \
Added: trunk/dports/multimedia/VLC-devel/files/rdp.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/rdp.patch (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/rdp.patch 2014-03-02 20:30:53 UTC (rev 117524)
@@ -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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140302/89c5ab8a/attachment.html>
More information about the macports-changes
mailing list