<!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>[129590] trunk/dports/multimedia/ffmpeg</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/129590">129590</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-12-16 08:07:09 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ffmpeg: update to version 2.5.1, bug fixes including libsmbclient regression.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaffmpegPortfile">trunk/dports/multimedia/ffmpeg/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaffmpegfilespatchlibsmbclientdiff">trunk/dports/multimedia/ffmpeg/files/patch-libsmbclient.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaffmpegPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/ffmpeg/Portfile (129589 => 129590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/Portfile 2014-12-16 14:32:43 UTC (rev 129589)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2014-12-16 16:07:09 UTC (rev 129590)
</span><span class="lines">@@ -10,8 +10,7 @@
</span><span class="cx"> name ffmpeg
</span><span class="cx"> conflicts ffmpeg-devel
</span><span class="cx"> epoch 1
</span><del>-version 2.5
-revision 1
</del><ins>+version 2.5.1
</ins><span class="cx"> license LGPL-2.1+
</span><span class="cx"> categories multimedia
</span><span class="cx"> maintainers devans jeremyhu openmaintainer
</span><span class="lines">@@ -53,8 +52,8 @@
</span><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 285404e0e99463769d2e0189a8c1ae8b811453d8 \
- sha256 148cfd694b60245f9116f5932f3f60bb6dba47bcfef395cdda7a7d8ed48d57ac
</del><ins>+checksums rmd160 0ff92a2408872f9ce95614ac889fa57c843f926a \
+ sha256 03cf50b2f9109548e466f144c960b37031ffc1b9fab96382b4b26b7607c7ef52
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:gmake \
</span><span class="lines">@@ -82,8 +81,7 @@
</span><span class="cx"> port:xz \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-patchfiles patch-libdc1394.diff \
- patch-libsmbclient.diff
</del><ins>+patchfiles patch-libdc1394.diff
</ins><span class="cx">
</span><span class="cx"> build.cmd ${prefix}/bin/gmake
</span><span class="cx"> build.env-append V=1
</span></span></pre></div>
<a id="trunkdportsmultimediaffmpegfilespatchlibsmbclientdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/ffmpeg/files/patch-libsmbclient.diff (129589 => 129590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/files/patch-libsmbclient.diff 2014-12-16 14:32:43 UTC (rev 129589)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libsmbclient.diff 2014-12-16 16:07:09 UTC (rev 129590)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-X-Git-Url: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;p=ffmpeg.git;a=blobdiff_plain;f=configure;h=0933210069d9b3e9aa31e89d0a4351e7371d3420;hp=40d5428531f0b709ed14c5df4ab073cd024e5dc2;hb=754f4957d7a7e5be0df0e9de1d31aebeecdc4476;hpb=885e74622e3f3be31aebee35540339c7652e723f
-
-diff --git a/configure b/configure
-index 40d5428..0933210 100755
---- configure
-+++ configure
-@@ -4883,7 +4883,7 @@ enabled libquvi && require_pkg_config libquvi quvi/quvi.h quvi_init
- enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
- enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
- enabled libshine && require_pkg_config shine shine/layer3.h shine_encode_buffer
--enabled libsmbclient && { check_pkg_config smbclient libsmbclient.h smbc_init ||
-+enabled libsmbclient && { use_pkg_config smbclient libsmbclient.h smbc_init ||
- require smbclient libsmbclient.h smbc_init -lsmbclient; }
- enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
- enabled libssh && require_pkg_config libssh libssh/sftp.h sftp_init
</del></span></pre>
</div>
</div>
</body>
</html>