<!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>[143186] trunk/dports/multimedia/VLC</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/143186">143186</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-12-06 14:59:35 -0800 (Sun, 06 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>VLC: various build fixes, openmaintainer.
* upstream lua 5.3 compatibility patch (#49405)
* patch to disable use of Xcode 7.0 C11 native atomics in bluray module
in favor of VLC's fall back code used with Xcode 6.4 and earlier (#49178)
* increment revision to remove binary references to libenca in libass module (#49908)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCPortfile">trunk/dports/multimedia/VLC/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCfilespatchbluraynoatomicsdiff">trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff</a></li>
<li><a href="#trunkdportsmultimediaVLCfilespatchlua53diff">trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaVLCPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/Portfile (143185 => 143186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/Portfile 2015-12-06 17:37:16 UTC (rev 143185)
+++ trunk/dports/multimedia/VLC/Portfile 2015-12-06 22:59:35 UTC (rev 143186)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name VLC
</span><span class="cx"> version 2.1.5
</span><del>-revision 6
</del><ins>+revision 7
</ins><span class="cx"> categories multimedia
</span><span class="cx">
</span><span class="cx"> maintainers gmail.com:rjvbertin openmaintainer
</span><span class="lines">@@ -79,6 +79,16 @@
</span><span class="cx"> no-sparkle.patch \
</span><span class="cx"> patch-ffmpeg-2.4.diff
</span><span class="cx">
</span><ins>+# upgrade of lua from 5.2 to 5.3 introduced API deprecations that broke build
+# apply upstream 5.3 compatibility patch (#49405)
+
+patchfiles-append patch-lua-5.3.diff
+
+# Xcode 7.0+ introduces C11 native atomics that break the bluray module
+# patch to disable native atomics for this module and fall back to VLC's backup implementation (#49178)
+
+patchfiles-append patch-bluray-no-atomics.diff
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s:librsvg-2/librsvg:librsvg:" \
</span><span class="cx"> ${worksrcpath}/modules/text_renderer/svg.c
</span></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchbluraynoatomicsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff (0 => 143186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff 2015-12-06 22:59:35 UTC (rev 143186)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- modules/access/bluray.c.orig 2015-12-06 06:41:52.000000000 -0800
++++ modules/access/bluray.c 2015-12-06 06:43:19.000000000 -0800
+@@ -43,6 +43,11 @@
+ #include <vlc_plugin.h>
+ #include <vlc_demux.h> /* demux_t */
+ #include <vlc_input.h> /* Seekpoints, chapters */
++
++#ifndef __STDC_NO_ATOMICS__
++#define __STDC_NO_ATOMICS__ 1
++#endif
++
+ #include <vlc_atomic.h>
+ #include <vlc_dialog.h> /* BD+/AACS warnings */
+ #include <vlc_vout.h> /* vout_PutSubpicture / subpicture_t */
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCfilespatchlua53diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff (0 => 143186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff 2015-12-06 22:59:35 UTC (rev 143186)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+From 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee@freedesktop.org>
+Date: Thu, 5 Feb 2015 14:48:53 -0800
+Subject: [PATCH] lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0
+ compatibility.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+In Lua 5.3.0, luaL_checkint was deprecated.
+
+This patch fixes this build error with Lua 5.3.0.
+
+lua/demux.c: In function âvlclua_demux_peekâ:
+lua/demux.c:55:5: error: implicit declaration of function âluaL_checkintâ [-Werror=implicit-function-declaration]
+ int n = luaL_checkint( L, 1 );
+ ^
+
+Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/lua/vlc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index efd94f1..85c7fc1 100644
+--- modules/lua/vlc.h
++++ modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+
++#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h> /* Low level lua C API */
+ #include <lauxlib.h> /* Higher level C API */
+--
+1.7.10.4
+
</ins></span></pre>
</div>
</div>
</body>
</html>