<!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>[122170] 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/122170">122170</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-16 09:02:01 -0700 (Wed, 16 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ffmpeg: update to version 2.3, dependencies, configuration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaffmpegPortfile">trunk/dports/multimedia/ffmpeg/Portfile</a></li>
<li><a href="#trunkdportsmultimediaffmpegfilespatchlibdc1394diff">trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.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 (122169 => 122170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/Portfile 2014-07-16 15:09:14 UTC (rev 122169)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2014-07-16 16:02:01 UTC (rev 122170)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> name ffmpeg
</span><span class="cx"> conflicts ffmpeg-devel
</span><span class="cx"> epoch 1
</span><del>-version 2.2.5
</del><ins>+version 2.3
</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">@@ -51,8 +51,8 @@
</span><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 2584ee7fa1f5dc3608e8edef9bd5f218e1797a41 \
- sha256 c8587a1ac91599dd87fcfb53de6e32b9ab81449e7f22ff55044faf7815a68633
</del><ins>+checksums rmd160 8140c254d008cfc623ae42ffbda8e0f453b383c7 \
+ sha256 6b3dbb64e20951480bfd64bcbe305f6ee9031e5fccfd3b3e94cc5055525f809e
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:gmake \
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> port:openjpeg15 \
</span><span class="cx"> port:fontconfig \
</span><span class="cx"> port:freetype \
</span><ins>+ port:fribidi \
</ins><span class="cx"> path:lib/libspeex.dylib:speex \
</span><span class="cx"> port:libvpx \
</span><span class="cx"> port:libsdl \
</span><span class="lines">@@ -118,6 +119,7 @@
</span><span class="cx"> --enable-gnutls \
</span><span class="cx"> --enable-fontconfig \
</span><span class="cx"> --enable-libfreetype \
</span><ins>+ --enable-libfribidi \
</ins><span class="cx"> --disable-indev=jack \
</span><span class="cx"> --disable-outdev=xv \
</span><span class="cx"> --disable-vda \
</span><span class="lines">@@ -127,6 +129,7 @@
</span><span class="cx">
</span><span class="cx"> # disable asm on Tiger
</span><span class="cx"> # libblueray doesn't build on Tiger so disable for now (#39442)
</span><ins>+
</ins><span class="cx"> platform darwin {
</span><span class="cx"> if {${os.major} < 9} {
</span><span class="cx"> depends_lib-delete port:libbluray
</span><span class="lines">@@ -141,6 +144,11 @@
</span><span class="cx"> configure.args-delete --disable-vda
</span><span class="cx"> configure.args-append --enable-vda
</span><span class="cx"> }
</span><ins>+
+ # kCVPixelFormatType_OneComponent8 used in avfoundation indev is only available on 10.8+
+ if {${os.major} < 12} {
+ configure.args-append --disable-indev=avfoundation
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> test.run yes
</span><span class="lines">@@ -152,7 +160,6 @@
</span><span class="cx"> post-destroot {
</span><span class="cx"> file mkdir ${destroot}${prefix}/share/doc/ffmpeg
</span><span class="cx"> file copy ${worksrcpath}/doc/APIchanges ${destroot}${prefix}/share/doc/ffmpeg
</span><del>- file copy ${worksrcpath}/doc/RELEASE_NOTES ${destroot}${prefix}/share/doc/ffmpeg
</del><span class="cx"> foreach f [glob ${worksrcpath}/doc/*.txt] {
</span><span class="cx"> file copy $f ${destroot}${prefix}/share/doc/ffmpeg
</span><span class="cx"> }
</span><span class="lines">@@ -205,9 +212,9 @@
</span><span class="cx"> # https://trac.ffmpeg.org/ticket/1700
</span><span class="cx">
</span><span class="cx"> variant librtmp description {Use librtmp (from rtmpdump) as rtmp[t][es]:// protocol handler} {
</span><del>- configure.args-append --enable-librtmp
</del><ins>+ configure.args-append --enable-librtmp
</ins><span class="cx">
</span><del>- depends_lib-append port:rtmpdump
</del><ins>+ depends_lib-append port:rtmpdump
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant gpl2 description {Enable GPL code, license will be GPL-2+} {
</span><span class="lines">@@ -222,12 +229,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
</span><del>- configure.args-delete --disable-libopencore-amrnb \
- --disable-libopencore-amrwb
</del><span class="cx"> configure.args-append --enable-version3 \
</span><span class="cx"> --enable-libopencore-amrnb \
</span><del>- --enable-libopencore-amrwb
- depends_lib-append port:opencore-amr
</del><ins>+ --enable-libopencore-amrwb \
+ --enable-libsmbclient
+
+ depends_lib-append port:opencore-amr \
+ port:samba3
+
</ins><span class="cx"> license-delete LGPL-2.1+
</span><span class="cx"> license-append GPL-3+
</span><span class="cx"> }
</span><span class="lines">@@ -274,6 +283,7 @@
</span><span class="cx"> ******* The following modules are GPLed:
</span><span class="cx"> *******
</span><span class="cx"> ******* postproc
</span><ins>+******* libsambaclient
</ins><span class="cx"> ******* libx264
</span><span class="cx"> ******* libxvid
</span><span class="cx"> ******* opencore-amr
</span></span></pre></div>
<a id="trunkdportsmultimediaffmpegfilespatchlibdc1394diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff (122169 => 122170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff 2014-07-16 15:09:14 UTC (rev 122169)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff 2014-07-16 16:02:01 UTC (rev 122170)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2014-03-23 15:08:02.000000000 -0700
-+++ configure 2014-04-17 01:08:13.000000000 -0700
-@@ -4563,9 +4563,12 @@
</del><ins>+--- configure.orig 2014-07-15 18:00:37.000000000 -0700
++++ configure 2014-07-16 00:45:59.000000000 -0700
+@@ -4819,9 +4819,12 @@
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # libdc1394 check
</span></span></pre>
</div>
</div>
</body>
</html>