<!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>[126686] trunk/dports/devel/libdc1394</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/126686">126686</a></dd>
<dt>Author</dt> <dd>ctreleaven@macports.org</dd>
<dt>Date</dt> <dd>2014-10-13 11:30:37 -0700 (Mon, 13 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>libdc1394: Update to 2.2.0, add sdl dep, build fixes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibdc1394Portfile">trunk/dports/devel/libdc1394/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/libdc1394/files/</li>
<li><a href="#trunkdportsdevellibdc1394filespatch01macosxstatusdiff">trunk/dports/devel/libdc1394/files/patch-01-macosx-status.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibdc1394Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libdc1394/Portfile (126685 => 126686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdc1394/Portfile 2014-10-13 18:04:03 UTC (rev 126685)
+++ trunk/dports/devel/libdc1394/Portfile 2014-10-13 18:30:37 UTC (rev 126686)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name libdc1394
</span><del>-version 2.1.3
</del><ins>+version 2.2.0
</ins><span class="cx"> categories devel
</span><span class="cx"> license LGPL-2.1+
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -23,13 +23,16 @@
</span><span class="cx">
</span><span class="cx"> master_sites sourceforge
</span><span class="cx">
</span><del>-checksums sha1 cab77199f2e434ece3cf31c798d00d79326679b4 \
- rmd160 298ad9c92187bea0f127f0a0f9960483d50201aa
</del><ins>+checksums sha1 7e831258a65e7e111a9d52d8062aec6d28a1e4c4 \
+ rmd160 41a8bc28824a58bcdfdbd3226adf4b0c88555574
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><del>-depends_lib path:lib/pkgconfig/libusb-1.0.pc:libusb
</del><ins>+depends_lib path:lib/pkgconfig/libusb-1.0.pc:libusb \
+ port:libsdl
</ins><span class="cx">
</span><ins>+patchfiles patch-01-macosx-status.diff
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s:-lIOKit:-framework IOKit:" \
</span><span class="cx"> ${worksrcpath}/configure \
</span><span class="lines">@@ -37,6 +40,8 @@
</span><span class="cx"> ${worksrcpath}/dc1394/macosx/Makefile.in
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.args --disable-examples
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://sourceforge.net/projects/libdc1394/files/libdc1394-2/
</span><span class="cx"> livecheck.regex "(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span></span></pre></div>
<a id="trunkdportsdevellibdc1394filespatch01macosxstatusdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libdc1394/files/patch-01-macosx-status.diff (0 => 126686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdc1394/files/patch-01-macosx-status.diff (rev 0)
+++ trunk/dports/devel/libdc1394/files/patch-01-macosx-status.diff 2014-10-13 18:30:37 UTC (rev 126686)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+# fix issue due to bug in OSX Firewire stack
+# libdc1394 author comments here:
+# http://permalink.gmane.org/gmane.comp.multimedia.libdc1394.devel/517
+
+Index: dc1394/macosx/capture.c
+===================================================================
+--- dc1394/macosx/capture.c (revision 594)
++++ dc1394/macosx/capture.c (working copy)
+@@ -150,7 +150,7 @@
+
+ for (i = 0; i < buffer->num_dcls; i++) {
+ int packet_size = capture->frames[buffer->i].packet_size;
+- if ((buffer->pkts[i].status & 0x1F) != 0x11) {
++ if ((buffer->pkts[i].status & 0x1F) != 0x11 && (buffer->pkts[i].status & 0x1F) != 0) {
+ dc1394_log_warning ("packet %d had error status %x",
+ i, buffer->pkts[i].status);
+ corrupt = 1;
</ins></span></pre>
</div>
</div>
</body>
</html>