<!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>[149255] trunk/dports/science/paraview</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/149255">149255</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2016-06-07 14:52:42 -0700 (Tue, 07 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>paraview: Re-enable +ffmpeg with upstream patch. Fixes #51578 (maintainer).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceparaviewPortfile">trunk/dports/science/paraview/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsscienceparaviewfilesffmpeg3_compatpatch">trunk/dports/science/paraview/files/ffmpeg3_compat.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceparaviewPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/paraview/Portfile (149254 => 149255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/paraview/Portfile 2016-06-07 19:12:06 UTC (rev 149254)
+++ trunk/dports/science/paraview/Portfile 2016-06-07 21:52:42 UTC (rev 149255)
</span><span class="lines">@@ -9,9 +9,7 @@
</span><span class="cx">
</span><span class="cx"> name paraview
</span><span class="cx"> version 5.0.1
</span><del>-# versions 4.3.1 and 4.4.0 have some issues; see Notes section of https://github.com/OpenFOAM/ThirdParty-dev/
-# so just patch them?
-revision 0
</del><ins>+revision 1
</ins><span class="cx">
</span><span class="cx"> categories science graphics
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -40,9 +38,11 @@
</span><span class="cx">
</span><span class="cx"> #:info:build ld: file not found: @rpath/libIceTMPI.dylib for architecture x86_64
</span><span class="cx"> # https://github.com/OpenFOAM/ThirdParty-dev/
</span><ins>+# http://www.paraview.org/Bug/view.php?id=16001
</ins><span class="cx"> patchfiles patch-ThirdParty-IceT-vtkicet-CMakeLists.txt.diff \
</span><span class="cx"> patch-VTK-Cmake-GenerateExportHeader.cmake \
</span><del>- patch-VTK-Cmake-vtkCompilerExtras.cmake
</del><ins>+ patch-VTK-Cmake-vtkCompilerExtras.cmake \
+ ffmpeg3_compat.patch
</ins><span class="cx">
</span><span class="cx"> depends_build-append port:readline \
</span><span class="cx"> port:netcdf \
</span><span class="lines">@@ -126,15 +126,12 @@
</span><span class="cx"> "\n Currently Paraview installs as an app, including the Python modules. To use with macports python, add /Applications/Macports/paraview.app/Contents/Python/:/Applications/MacPorts/paraview.app/Contents/Libraries/ to PYTHONPATH and /Applications/MacPorts/paraview.app/Contents/Libraries/ to DYLD_LIBRARY_PATH. Also, simultaneous use of Mayavi may result in segfault."
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# does not work, gives:
-# VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx:281:36: error: use of undeclared identifier 'PIX_FMT_RGB24'; did you mean 'AV_PIX_FMT_RGB24'?
-#variant ffmpeg description {Add support for FFMPEG} {
-# depends_lib-append port:ffmpeg
-# configure.args-append -DPARAVIEW_ENABLE_FFMPEG:BOOL=ON
-#}
</del><ins>+variant ffmpeg description {Add support for FFMPEG} {
+ depends_lib-append port:ffmpeg
+ configure.args-append -DPARAVIEW_ENABLE_FFMPEG:BOOL=ON
+}
</ins><span class="cx">
</span><del>-default_variants-append +python27
-#+ffmpeg
</del><ins>+default_variants-append +python27 +ffmpeg
</ins><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}
</span></span></pre></div>
<a id="trunkdportsscienceparaviewfilesffmpeg3_compatpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/science/paraview/files/ffmpeg3_compat.patch (0 => 149255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/paraview/files/ffmpeg3_compat.patch (rev 0)
+++ trunk/dports/science/paraview/files/ffmpeg3_compat.patch 2016-06-07 21:52:42 UTC (rev 149255)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+--- VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
++++ VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
+@@ -191,11 +191,11 @@ int vtkFFMPEGWriterInternal::Start()
+ c->height = this->Dim[1];
+ if (this->Writer->GetCompression())
+ {
+- c->pix_fmt = PIX_FMT_YUVJ422P;
++ c->pix_fmt = AV_PIX_FMT_YUVJ422P;
+ }
+ else
+ {
+- c->pix_fmt = PIX_FMT_BGR24;
++ c->pix_fmt = AV_PIX_FMT_BGR24;
+ }
+
+ //to do playback at actual recorded rate, this will need more work see also below
+@@ -274,13 +274,13 @@ int vtkFFMPEGWriterInternal::Start()
+ #endif
+
+ //for the output of the writer's input...
+- this->rgbInput = avcodec_alloc_frame();
++ this->rgbInput = av_frame_alloc();
+ if (!this->rgbInput)
+ {
+ vtkGenericWarningMacro (<< "Could not make rgbInput avframe." );
+ return 0;
+ }
+- int RGBsize = avpicture_get_size(PIX_FMT_RGB24, c->width, c->height);
++ int RGBsize = avpicture_get_size(AV_PIX_FMT_RGB24, c->width, c->height);
+ unsigned char *rgb = (unsigned char *)av_malloc(sizeof(unsigned char) * RGBsize);
+ if (!rgb)
+ {
+@@ -288,10 +288,10 @@ int vtkFFMPEGWriterInternal::Start()
+ return 0;
+ }
+ //The rgb buffer should get deleted when this->rgbInput is.
+- avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height);
++ avpicture_fill((AVPicture *)this->rgbInput, rgb, AV_PIX_FMT_RGB24, c->width, c->height);
+
+ //and for the output to the codec's input.
+- this->yuvOutput = avcodec_alloc_frame();
++ this->yuvOutput = av_frame_alloc();
+ if (!this->yuvOutput)
+ {
+ vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
+@@ -349,12 +349,12 @@ int vtkFFMPEGWriterInternal::Write(vtkImageData *id)
+ //convert that to YUV for input to the codec
+ #ifdef VTK_FFMPEG_HAS_IMG_CONVERT
+ img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt,
+- (AVPicture *)this->rgbInput, PIX_FMT_RGB24,
++ (AVPicture *)this->rgbInput, AV_PIX_FMT_RGB24,
+ cc->width, cc->height);
+ #else
+ //convert that to YUV for input to the codec
+ SwsContext* convert_ctx = sws_getContext(
+- cc->width, cc->height, PIX_FMT_RGB24,
++ cc->width, cc->height, AV_PIX_FMT_RGB24,
+ cc->width, cc->height, cc->pix_fmt,
+ SWS_BICUBIC, NULL, NULL, NULL);
+
</ins></span></pre>
</div>
</div>
</body>
</html>