<!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>[148140] trunk/dports/office/goldendict</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/148140">148140</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-04-27 14:52:14 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>goldendict: backport upstream patches for ffmpeg 3.0 compatibility, increment revision (#51197).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsofficegoldendictPortfile">trunk/dports/office/goldendict/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsofficegoldendictfilespatchffmpeg30diff">trunk/dports/office/goldendict/files/patch-ffmpeg-3.0.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsofficegoldendictPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/office/goldendict/Portfile (148139 => 148140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/goldendict/Portfile 2016-04-27 21:38:11 UTC (rev 148139)
+++ trunk/dports/office/goldendict/Portfile 2016-04-27 21:52:14 UTC (rev 148140)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PortGroup qmake 1.0
</span><span class="cx">
</span><span class="cx"> github.setup goldendict goldendict 1.5.0-RC
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> # FIXME: add proper categories
</span><span class="cx"> categories office
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -40,7 +40,8 @@
</span><span class="cx"> port:phonon \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-patchfiles patch-goldendict.pro.diff
</del><ins>+patchfiles patch-goldendict.pro.diff \
+ patch-ffmpeg-3.0.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/goldendict.pro
</span></span></pre></div>
<a id="trunkdportsofficegoldendictfilespatchffmpeg30diff"></a>
<div class="addfile"><h4>Added: trunk/dports/office/goldendict/files/patch-ffmpeg-3.0.diff (0 => 148140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/goldendict/files/patch-ffmpeg-3.0.diff (rev 0)
+++ trunk/dports/office/goldendict/files/patch-ffmpeg-3.0.diff 2016-04-27 21:52:14 UTC (rev 148140)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+--- ffmpegaudio.cc.orig 2013-06-06 06:39:06.000000000 -0700
++++ ffmpegaudio.cc 2016-04-21 12:06:50.000000000 -0700
+@@ -326,7 +326,11 @@
+
+ bool DecoderContext::play( QString & errorString )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR < 28 )
+ AVFrame * frame = avcodec_alloc_frame();
++#else
++ AVFrame * frame = av_frame_alloc();
++#endif
+ if ( !frame )
+ {
+ errorString = QObject::tr( "avcodec_alloc_frame() failed." );
+@@ -348,7 +352,11 @@
+ }
+ }
+ // av_free_packet() must be called after each call to av_read_frame()
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+ av_free_packet( &packet );
++#else
++ av_packet_unref( &packet );
++#endif
+ }
+
+ if ( !isCancelled_ && codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+@@ -365,8 +373,10 @@
+
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
+-#else
++#elif LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR < 28 )
+ avcodec_free_frame( &frame );
++#else
++ av_frame_free( &frame );
+ #endif
+
+ return true;
</ins></span></pre>
</div>
</div>
</body>
</html>