<!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>[116084] trunk/dports/multimedia</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/116084">116084</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-17 13:38:56 -0800 (Fri, 17 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ffmpeg, ffmpeg-devel: dependencies, configuration (#36849).
* add explicit dependency on libiconv to avoid opportunistic configuration
* add dependency and enable fontconfig (fonts by name in filter drawtext)
* add variant +libdc1394, enables experimental frame grabbing from FireWire cameras.
* increment revision to rebuild with these features and libass.5.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaffmpegPortfile">trunk/dports/multimedia/ffmpeg/Portfile</a></li>
<li><a href="#trunkdportsmultimediaffmpegdevelPortfile">trunk/dports/multimedia/ffmpeg-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/multimedia/ffmpeg/files/</li>
<li><a href="#trunkdportsmultimediaffmpegfilespatchlibdc1394diff">trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff</a></li>
<li>trunk/dports/multimedia/ffmpeg-devel/files/</li>
<li><a href="#trunkdportsmultimediaffmpegdevelfilespatchlibdc1394diff">trunk/dports/multimedia/ffmpeg-devel/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 (116083 => 116084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/Portfile 2014-01-17 21:01:09 UTC (rev 116083)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2014-01-17 21:38:56 UTC (rev 116084)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> conflicts ffmpeg-devel
</span><span class="cx"> epoch 1
</span><span class="cx"> version 2.1.3
</span><ins>+revision 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">@@ -59,6 +60,7 @@
</span><span class="cx"> port:texi2html
</span><span class="cx">
</span><span class="cx"> depends_lib port:lame \
</span><ins>+ port:libiconv \
</ins><span class="cx"> port:libvorbis \
</span><span class="cx"> port:libopus \
</span><span class="cx"> port:libogg \
</span><span class="lines">@@ -69,6 +71,7 @@
</span><span class="cx"> port:libbluray \
</span><span class="cx"> port:gnutls \
</span><span class="cx"> port:openjpeg15 \
</span><ins>+ port:fontconfig \
</ins><span class="cx"> port:freetype \
</span><span class="cx"> path:lib/libspeex.dylib:speex \
</span><span class="cx"> port:libvpx \
</span><span class="lines">@@ -76,6 +79,8 @@
</span><span class="cx"> port:bzip2 \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><ins>+patchfiles patch-libdc1394.diff
+
</ins><span class="cx"> build.cmd ${prefix}/bin/gmake
</span><span class="cx"> build.env-append V=1
</span><span class="cx">
</span><span class="lines">@@ -112,6 +117,7 @@
</span><span class="cx"> --enable-libass \
</span><span class="cx"> --enable-libbluray \
</span><span class="cx"> --enable-gnutls \
</span><ins>+ --enable-fontconfig \
</ins><span class="cx"> --enable-libfreetype \
</span><span class="cx"> --disable-indev=jack \
</span><span class="cx"> --disable-outdev=xv \
</span><span class="lines">@@ -180,6 +186,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
+ depends_lib-append port:libdc1394
+ configure.args-append --enable-libdc1394
+}
+
</ins><span class="cx"> variant gpl2 description {Enable GPL code, license will be GPL-2+} {
</span><span class="cx"> configure.args-append --enable-gpl \
</span><span class="cx"> --enable-postproc \
</span></span></pre></div>
<a id="trunkdportsmultimediaffmpegfilespatchlibdc1394diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff (0 => 116084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff 2014-01-17 21:38:56 UTC (rev 116084)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- configure.orig 2014-01-17 09:06:53.000000000 -0800
++++ configure 2014-01-17 09:07:35.000000000 -0800
+@@ -4358,9 +4358,12 @@
+ fi
+
+ # libdc1394 check
++# libraw1394 only required for Linux
+ if enabled libdc1394; then
+ { check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 &&
+ enable libdc1394_2; } ||
++ { check_lib dc1394/dc1394.h dc1394_new -ldc1394 &&
++ enable libdc1394_2; } ||
+ { check_lib libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 &&
+ enable libdc1394_1; } ||
+ die "ERROR: No version of libdc1394 found "
</ins></span></pre></div>
<a id="trunkdportsmultimediaffmpegdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile (116083 => 116084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg-devel/Portfile 2014-01-17 21:01:09 UTC (rev 116083)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2014-01-17 21:38:56 UTC (rev 116084)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> name ffmpeg-devel
</span><span class="cx"> conflicts ffmpeg
</span><span class="cx"> version 20140116
</span><ins>+revision 1
</ins><span class="cx"> set git_branch 3ca7085ae2f7734746174762e76a9b2b1c6e8626
</span><span class="cx"> license LGPL-2.1+
</span><span class="cx"> categories multimedia
</span><span class="lines">@@ -58,6 +59,7 @@
</span><span class="cx"> port:texi2html
</span><span class="cx">
</span><span class="cx"> depends_lib port:lame \
</span><ins>+ port:libiconv \
</ins><span class="cx"> port:libvorbis \
</span><span class="cx"> port:libopus \
</span><span class="cx"> port:libogg \
</span><span class="lines">@@ -68,6 +70,7 @@
</span><span class="cx"> port:libbluray \
</span><span class="cx"> port:gnutls \
</span><span class="cx"> port:openjpeg15 \
</span><ins>+ port:fontconfig \
</ins><span class="cx"> port:freetype \
</span><span class="cx"> path:lib/libspeex.dylib:speex \
</span><span class="cx"> port:libvpx \
</span><span class="lines">@@ -82,6 +85,8 @@
</span><span class="cx"> error "git branch hash must be at least 7 characters long."
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+patchfiles patch-libdc1394.diff
+
</ins><span class="cx"> build.cmd ${prefix}/bin/gmake
</span><span class="cx"> build.env-append V=1
</span><span class="cx">
</span><span class="lines">@@ -118,6 +123,7 @@
</span><span class="cx"> --enable-libass \
</span><span class="cx"> --enable-libbluray \
</span><span class="cx"> --enable-gnutls \
</span><ins>+ --enable-fontconfig \
</ins><span class="cx"> --enable-libfreetype \
</span><span class="cx"> --disable-indev=jack \
</span><span class="cx"> --disable-outdev=xv \
</span><span class="lines">@@ -186,6 +192,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
+ depends_lib-append port:libdc1394
+ configure.args-append --enable-libdc1394
+}
+
</ins><span class="cx"> variant gpl2 description {Enable GPL code, license will be GPL-2+} {
</span><span class="cx"> configure.args-append --enable-gpl \
</span><span class="cx"> --enable-postproc \
</span></span></pre></div>
<a id="trunkdportsmultimediaffmpegdevelfilespatchlibdc1394diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff (0 => 116084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff (rev 0)
+++ trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff 2014-01-17 21:38:56 UTC (rev 116084)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- configure.orig 2014-01-17 09:06:53.000000000 -0800
++++ configure 2014-01-17 09:07:35.000000000 -0800
+@@ -4358,9 +4358,12 @@
+ fi
+
+ # libdc1394 check
++# libraw1394 only required for Linux
+ if enabled libdc1394; then
+ { check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 &&
+ enable libdc1394_2; } ||
++ { check_lib dc1394/dc1394.h dc1394_new -ldc1394 &&
++ enable libdc1394_2; } ||
+ { check_lib libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 &&
+ enable libdc1394_1; } ||
+ die "ERROR: No version of libdc1394 found "
</ins></span></pre>
</div>
</div>
</body>
</html>