<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[117999] trunk/dports/multimedia/VLC-devel</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/117999">117999</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-03-18 12:29:55 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>VLC-devel: Add missing pulseaudio dependency and bump to latest git</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCdevelPortfile">trunk/dports/multimedia/VLC-devel/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCdevelfilesrdppatch">trunk/dports/multimedia/VLC-devel/files/rdp.patch</a></li>
<li><a href="#trunkdportsmultimediaVLCdevelfilesvcdxpatch">trunk/dports/multimedia/VLC-devel/files/vcdx.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaVLCdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC-devel/Portfile (117998 => 117999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/Portfile 2014-03-18 18:32:52 UTC (rev 117998)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2014-03-18 19:29:55 UTC (rev 117999)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name VLC-devel
</span><span class="cx"> version 2.1.99
</span><del>-revision 12
</del><ins>+revision 13
</ins><span class="cx">
</span><span class="cx"> categories multimedia
</span><span class="cx">
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> fetch.type git
</span><span class="cx"> #git.url git://git.videolan.org/vlc/vlc-2.1.git
</span><span class="cx"> git.url git://git.videolan.org/vlc.git
</span><del>-git.branch 508d92f2f8168ac9def51eea59f133af50352d07
</del><ins>+git.branch 4c156e1054ce76bf305ae103646ce92ed6295e7b
</ins><span class="cx">
</span><span class="cx"> #master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
</span><span class="cx"> #distname vlc-${version}
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> port:x264 port:libtheora port:twolame port:libssh2 \
</span><span class="cx"> port:libdvdnav port:libdvdread port:vcdimager port:libproxy \
</span><span class="cx"> port:fluidsynth port:libsamplerate port:libupnp port:opencv \
</span><del>- port:avahi path:lib/libavcodec.dylib:ffmpeg \
</del><ins>+ port:avahi path:lib/libavcodec.dylib:ffmpeg port:pulseaudio \
</ins><span class="cx"> port:openjpeg15 port:libbluray port:FreeRDP port:live555 \
</span><span class="cx"> port:libdc1394 port:libmpeg2 port:libass port:libsdl \
</span><span class="cx"> port:libsdl_image port:schroedinger port:speex port:libmodplug \
</span><span class="lines">@@ -79,9 +79,7 @@
</span><span class="cx"> PR-34741-no__clang_version__.patch \
</span><span class="cx"> class_struct.patch \
</span><span class="cx"> static_assert.patch \
</span><del>- no-sparkle.patch \
- rdp.patch \
- vcdx.patch
</del><ins>+ no-sparkle.patch
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s:librsvg-2/librsvg:librsvg:" \
</span><span class="lines">@@ -119,6 +117,9 @@
</span><span class="cx"> # gl.c:121:3: error: Platform not recognized.
</span><span class="cx"> configure.cppflags-append -D__unix__=1
</span><span class="cx">
</span><ins>+# access/rdp.c:45:11: fatal error: 'freerdp/version.h' file not found
+configure.cppflags-append -DFREERDP_INTERFACE_VERSION -DFREERDP_VERSION_MAJOR=1 -DFREERDP_VERSION_MINOR=1
+
</ins><span class="cx"> # live555 is installed to a weird location
</span><span class="cx"> configure.cppflags-append -I${prefix}/lib/live/liveMedia/include
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediaVLCdevelfilesrdppatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC-devel/files/rdp.patch (117998 => 117999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/files/rdp.patch 2014-03-18 18:32:52 UTC (rev 117998)
+++ trunk/dports/multimedia/VLC-devel/files/rdp.patch 2014-03-18 19:29:55 UTC (rev 117999)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>---- 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;
</del></span></pre></div>
<a id="trunkdportsmultimediaVLCdevelfilesvcdxpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC-devel/files/vcdx.patch (117998 => 117999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/files/vcdx.patch 2014-03-18 18:32:52 UTC (rev 117998)
+++ trunk/dports/multimedia/VLC-devel/files/vcdx.patch 2014-03-18 19:29:55 UTC (rev 117999)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-https://trac.videolan.org/vlc/ticket/10834
---- modules/access/Makefile.am
-+++ modules/access/Makefile.am
-@@ -244,8 +244,9 @@ libvcdx_plugin_la_SOURCES = \
- access/vcdx/vcdplayer.h access/vcdx/vcdplayer.c \
- access/vcdx/info.c access/vcdx/info.h
- libvcdx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-+libvcdx_plugin_la_LIBADD = $(VCDX_LIBS)
- if HAVE_WIN32
--libvcdx_plugin_la_LIBADD = -lwinmm
-+libvcdx_plugin_la_LIBADD += -lwinmm
- endif
- libvcdx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
- if HAVE_DARWIN
</del></span></pre>
</div>
</div>
</body>
</html>