<!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>[148142] trunk/dports/multimedia/xine-lib</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/148142">148142</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-04-27 15:11:35 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>xine-lib: patch for ffmpeg-3.0 compatibility, increment revision (#51206).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaxinelibPortfile">trunk/dports/multimedia/xine-lib/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaxinelibfilespatchffmpeg30diff">trunk/dports/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaxinelibPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/xine-lib/Portfile (148141 => 148142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/xine-lib/Portfile        2016-04-27 22:02:37 UTC (rev 148141)
+++ trunk/dports/multimedia/xine-lib/Portfile        2016-04-27 22:11:35 UTC (rev 148142)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name                xine-lib
</span><span class="cx"> version 1.2.6
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> description        xine-lib is a free multimedia engine, released under the GPL.
</span><span class="cx"> long_description ${description}
</span><span class="cx"> maintainers        ryandesign openmaintainer
</span><span class="lines">@@ -45,7 +45,8 @@
</span><span class="cx"> port:xorg-libXvMC \
</span><span class="cx"> port:xorg-xcb-util
</span><span class="cx">
</span><del>-patchfiles-append patch-src-post-planar-eq2.c.diff
</del><ins>+patchfiles-append patch-src-post-planar-eq2.c.diff \
+ patch-ffmpeg-3.0.diff
</ins><span class="cx">
</span><span class="cx"> # bad register name `%rax'
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportsmultimediaxinelibfilespatchffmpeg30diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff (0 => 148142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff         (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff        2016-04-27 22:11:35 UTC (rev 148142)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+diff -u src/combined/ffmpeg.orig/ff_audio_decoder.c src/combined/ffmpeg/ff_audio_decoder.c
+--- src/combined/ffmpeg.orig/ff_audio_decoder.c        2014-06-09 09:08:42.000000000 -0700
++++ src/combined/ffmpeg/ff_audio_decoder.c        2016-04-21 22:16:46.000000000 -0700
+@@ -590,7 +590,7 @@
+ int got_frame;
+ float gain = this->class->gain;
+ if (!this->av_frame)
+- this->av_frame = avcodec_alloc_frame ();
++ this->av_frame = av_frame_alloc ();
+
+ consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
+ if ((consumed >= 0) && got_frame) {
+@@ -1071,7 +1071,7 @@
+ /* try to reset the wma decoder */
+ if( this->decoder_ok ) {
+ #if AVAUDIO > 3
+- avcodec_free_frame (&this->av_frame);
++ av_frame_free (&this->av_frame);
+ #endif
+ pthread_mutex_lock (&ffmpeg_lock);
+ avcodec_close (this->context);
+@@ -1105,7 +1105,7 @@
+
+ if( this->context && this->decoder_ok ) {
+ #if AVAUDIO > 3
+- avcodec_free_frame (&this->av_frame);
++ av_frame_free (&this->av_frame);
+ #endif
+ pthread_mutex_lock (&ffmpeg_lock);
+ avcodec_close (this->context);
+diff -u src/combined/ffmpeg.orig/ff_video_decoder.c src/combined/ffmpeg/ff_video_decoder.c
+--- src/combined/ffmpeg.orig/ff_video_decoder.c        2014-06-24 09:21:06.000000000 -0700
++++ src/combined/ffmpeg/ff_video_decoder.c        2016-04-21 22:14:45.000000000 -0700
+@@ -2523,7 +2523,7 @@
+ this->stream = stream;
+ this->class = (ff_video_class_t *) class_gen;
+
+- this->av_frame = avcodec_alloc_frame();
++ this->av_frame = av_frame_alloc();
+ this->context = avcodec_alloc_context();
+ this->context->opaque = this;
+ #if AVPALETTE == 1
</ins></span></pre>
</div>
</div>
</body>
</html>