<!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>[127266] 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/127266">127266</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-10-24 07:57:40 -0700 (Fri, 24 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>VLC-devel: Bump to current 2.2 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="#trunkdportsmultimediaVLCdevelfilesclass_structpatch">trunk/dports/multimedia/VLC-devel/files/class_struct.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 (127265 => 127266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/Portfile 2014-10-24 14:15:50 UTC (rev 127265)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2014-10-24 14:57:40 UTC (rev 127266)
</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 17
</del><ins>+revision 18
</ins><span class="cx">
</span><span class="cx"> categories multimedia
</span><span class="cx">
</span><span class="lines">@@ -28,8 +28,9 @@
</span><span class="cx"> # http://git.videolan.org/?p=vlc.git;a=forks
</span><span class="cx"> fetch.type git
</span><span class="cx"> #git.url git://git.videolan.org/vlc/vlc-2.1.git
</span><del>-git.url git://git.videolan.org/vlc.git
-git.branch 4c156e1054ce76bf305ae103646ce92ed6295e7b
</del><ins>+git.url git://git.videolan.org/vlc/vlc-2.2.git
+#git.url git://git.videolan.org/vlc.git
+git.branch 70d70ee0460d3e4fedc98428de9d539ec9352a34
</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">@@ -136,7 +137,6 @@
</span><span class="cx"> patchfiles buildfix-package.mak.patch \
</span><span class="cx"> configure.ac-no-arch.patch \
</span><span class="cx"> PR-34741-no__clang_version__.patch \
</span><del>- class_struct.patch \
</del><span class="cx"> static_assert.patch \
</span><span class="cx"> no-sparkle.patch
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediaVLCdevelfilesclass_structpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC-devel/files/class_struct.patch (127265 => 127266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/files/class_struct.patch 2014-10-24 14:15:50 UTC (rev 127265)
+++ trunk/dports/multimedia/VLC-devel/files/class_struct.patch 2014-10-24 14:57:40 UTC (rev 127266)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-diff --git a/modules/demux/mkv/chapter_command.hpp b/modules/demux/mkv/chapter_command.hpp
-index 7c8a3c1..80b3e45 100644
---- modules/demux/mkv/chapter_command.hpp
-+++ modules/demux/mkv/chapter_command.hpp
-@@ -35,7 +35,7 @@ const binary MATROSKA_DVD_LEVEL_PG = 0x18;
- const binary MATROSKA_DVD_LEVEL_PTT = 0x10;
- const binary MATROSKA_DVD_LEVEL_CN = 0x08;
-
--class demux_sys_t;
-+struct demux_sys_t;
-
- class chapter_codec_cmds_c
- {
-diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp
-index 3cb5f60..4412044 100644
---- modules/demux/mkv/demux.hpp
-+++ modules/demux/mkv/demux.hpp
-@@ -326,7 +326,7 @@ private:
- };
-
-
--class demux_sys_t
-+struct demux_sys_t
- {
- public:
- demux_sys_t( demux_t & demux )
-diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
-index c2d5478..6086f17 100644
---- modules/demux/mkv/mkv.cpp
-+++ modules/demux/mkv/mkv.cpp
-@@ -73,7 +73,7 @@ vlc_module_begin ()
- add_shortcut( "mka", "mkv" )
- vlc_module_end ()
-
--class demux_sys_t;
-+struct demux_sys_t;
-
- static int Demux ( demux_t * );
- static int Control( demux_t *, int, va_list );
</del></span></pre>
</div>
</div>
</body>
</html>