<!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>[150044] 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/150044">150044</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-07-09 14:00:40 -0700 (Sat, 09 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ffmpeg: update to version 3.1.1, ABI compatible with previous version, enable audiotoolbox where supported, minor reordering to match ffmpeg-devel.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaffmpegPortfile">trunk/dports/multimedia/ffmpeg/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaffmpegfilespatchlibavcodecaudiotoolboxenccdiff">trunk/dports/multimedia/ffmpeg/files/patch-libavcodec-audiotoolboxenc.c.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 (150043 => 150044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/Portfile 2016-07-09 15:41:11 UTC (rev 150043)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2016-07-09 21:00:40 UTC (rev 150044)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> name ffmpeg
</span><span class="cx"> conflicts ffmpeg-devel
</span><span class="cx"> epoch 1
</span><del>-version 3.0.2
</del><ins>+version 3.1.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">@@ -52,8 +52,8 @@
</span><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 7255df119a4efef1b0da58e6e148028edeeed7f2 \
- sha256 30e3c77c2f4c358ed087869455a7496cbd7753a5e1b98d20ba49c1004009fd36
</del><ins>+checksums rmd160 1b2b8e480d7140e43ff6f61ac4b05f2234b5681a \
+ sha256 a5bca50a90a37b983eaa17c483a387189175f37ca678ae7e51d43e7610b4b3b4
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:gmake \
</span><span class="lines">@@ -86,8 +86,7 @@
</span><span class="cx"> port:xz \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-build.cmd ${prefix}/bin/gmake
-build.env-append V=1
</del><ins>+patchfiles patch-libavcodec-audiotoolboxenc.c.diff
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # enable auto configure of asm optimizations
</span><span class="lines">@@ -132,6 +131,7 @@
</span><span class="cx"> --disable-indev=jack \
</span><span class="cx"> --disable-outdev=xv \
</span><span class="cx"> --disable-vda \
</span><ins>+ --disable-audiotoolbox \
</ins><span class="cx"> --disable-videotoolbox \
</span><span class="cx"> --mandir=${prefix}/share/man \
</span><span class="cx"> --enable-shared --enable-pthreads \
</span><span class="lines">@@ -157,6 +157,12 @@
</span><span class="cx"> configure.args-append --enable-vda
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # AudiotoolBox support requires CoreMedia Framework available on 10.7+
+ if {${os.major} > 10} {
+ configure.args-delete --disable-audiotoolbox
+ configure.args-append --enable-audiotoolbox
+ }
+
</ins><span class="cx"> # VideotoolBox, a new hardware acceleration framework, is supported on 10.8+ and "here to stay".
</span><span class="cx"> # It provides support for H264, H263, MPEG1, MPEG2 and MPEG4.
</span><span class="cx"> if {${os.major} > 11} {
</span><span class="lines">@@ -175,8 +181,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+build.cmd ${prefix}/bin/gmake
+build.env-append V=1
+
</ins><span class="cx"> test.run yes
</span><span class="cx">
</span><ins>+destroot.env-append V=1
+
</ins><span class="cx"> #
</span><span class="cx"> # configure isn't autoconf and they do use a dep cache
</span><span class="cx"> #
</span></span></pre></div>
<a id="trunkdportsmultimediaffmpegfilespatchlibavcodecaudiotoolboxenccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/ffmpeg/files/patch-libavcodec-audiotoolboxenc.c.diff (0 => 150044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/files/patch-libavcodec-audiotoolboxenc.c.diff (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libavcodec-audiotoolboxenc.c.diff 2016-07-09 21:00:40 UTC (rev 150044)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- libavcodec/audiotoolboxenc.c.orig 2016-05-18 05:07:43.000000000 -0700
++++ libavcodec/audiotoolboxenc.c 2016-05-18 05:09:16.000000000 -0700
+@@ -64,8 +64,10 @@
+ return kAudioFormatMPEG4AAC_HE_V2;
+ case FF_PROFILE_AAC_LD:
+ return kAudioFormatMPEG4AAC_LD;
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+ case FF_PROFILE_AAC_ELD:
+ return kAudioFormatMPEG4AAC_ELD;
++#endif
+ }
+ case AV_CODEC_ID_ADPCM_IMA_QT:
+ return kAudioFormatAppleIMA4;
</ins></span></pre>
</div>
</div>
</body>
</html>