<!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>[148087] trunk/dports/audio/cmus</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/148087">148087</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-04-26 14:05:49 -0700 (Tue, 26 Apr 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>cmus: add missing patch file (#51243).</pre>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/audio/cmus/files/</li>
<li><a href="#trunkdportsaudiocmusfilespatchffmpeg30diff">trunk/dports/audio/cmus/files/patch-ffmpeg-3.0.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaudiocmusfilespatchffmpeg30diff"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/cmus/files/patch-ffmpeg-3.0.diff (0 => 148087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/cmus/files/patch-ffmpeg-3.0.diff                                (rev 0)
+++ trunk/dports/audio/cmus/files/patch-ffmpeg-3.0.diff        2016-04-26 21:05:49 UTC (rev 148087)
</span><span class="lines">@@ -0,0 +1,127 @@
</span><ins>+--- configure.orig        2015-07-13 03:00:56.000000000 -0700
++++ configure        2016-04-22 15:22:53.000000000 -0700
+@@ -387,7 +387,7 @@
+         fi
+         # ffmpeg api changes so frequently that it is best to compile the module
+         libs=&quot;$LDDLFLAGS $FFMPEG_LIBS&quot;
+-        cflags=&quot;$SOFLAGS $FFMPEG_CFLAGS&quot;
++        cflags=&quot;-std=gnu99 $SOFLAGS $FFMPEG_CFLAGS&quot;
+         if test &quot;$HAVE_FFMPEG_AVCODEC_H&quot; = y
+         then
+                 cflags=&quot;$cflags -DHAVE_FFMPEG_AVCODEC_H&quot;
+--- ffmpeg.c.orig        2015-07-13 03:00:56.000000000 -0700
++++ ffmpeg.c        2016-04-22 15:22:53.000000000 -0700
+@@ -39,7 +39,11 @@
+ #include &lt;libavformat/avio.h&gt;
+ #include &lt;libswresample/swresample.h&gt;
+ #include &lt;libavutil/opt.h&gt;
++#if LIBAVUTIL_VERSION_MAJOR &gt;= 53
++#include &lt;libavutil/channel_layout.h&gt;
++#else
+ #include &lt;libavutil/audioconvert.h&gt;
++#endif
+ #ifndef AVUTIL_MATHEMATICS_H
+ #include &lt;libavutil/mathematics.h&gt;
+ #endif
+@@ -115,7 +119,11 @@

+ static void ffmpeg_input_free(struct ffmpeg_input *input)
+ {
++#if LIBAVCODEC_VERSION_MAJOR &gt;= 56
++        av_packet_unref(&amp;input-&gt;pkt);
++#else
+         av_free_packet(&amp;input-&gt;pkt);
++#endif
+         free(input);
+ }

+@@ -235,7 +243,11 @@

+                 codec = avcodec_find_decoder(cc-&gt;codec_id);
+                 if (!codec) {
++#if LIBAVCODEC_VERSION_MAJOR &gt;= 54
++                        d_print(&quot;codec not found: %d, %s\n&quot;, cc-&gt;codec_id, avcodec_get_name(cc-&gt;codec_id));
++#else
+                         d_print(&quot;codec not found: %d, %s\n&quot;, cc-&gt;codec_id, cc-&gt;codec_name);
++#endif
+                         err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
+                         break;
+                 }
+@@ -248,7 +260,11 @@
+ #else
+                 if (avcodec_open2(cc, codec, NULL) &lt; 0) {
+ #endif
++#if LIBAVCODEC_VERSION_MAJOR &gt;= 54
++                        d_print(&quot;could not open codec: %d, %s\n&quot;, cc-&gt;codec_id, avcodec_get_name(cc-&gt;codec_id));
++#else
+                         d_print(&quot;could not open codec: %d, %s\n&quot;, cc-&gt;codec_id, cc-&gt;codec_name);
++#endif
+                         err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
+                         break;
+                 }
+@@ -347,7 +363,11 @@
+                               struct ffmpeg_output *output, SwrContext *swr)
+ {
+ #if (LIBAVCODEC_VERSION_INT &gt;= ((53&lt;&lt;16) + (25&lt;&lt;8) + 0))
++#if LIBAVCODEC_VERSION_MAJOR &gt;= 56
++        AVFrame *frame = av_frame_alloc();
++#else
+         AVFrame *frame = avcodec_alloc_frame();
++#endif
+         int got_frame;
+ #endif
+         while (1) {
+@@ -359,10 +379,16 @@
+                 int len;

+                 if (input-&gt;curr_pkt_size &lt;= 0) {
++#if LIBAVCODEC_VERSION_MAJOR &gt;= 56
++                        av_packet_unref(&amp;input-&gt;pkt);
++#else
+                         av_free_packet(&amp;input-&gt;pkt);
++#endif
+                         if (av_read_frame(ic, &amp;input-&gt;pkt) &lt; 0) {
+                                 /* Force EOF once we can read no longer. */
+-#if (LIBAVCODEC_VERSION_INT &gt;= ((53&lt;&lt;16) + (25&lt;&lt;8) + 0))
++#if LIBAVCODEC_VERSION_MAJOR &gt;= 56
++                                av_frame_free(&amp;frame);
++#elif (LIBAVCODEC_VERSION_INT &gt;= ((53&lt;&lt;16) + (25&lt;&lt;8) + 0))
+                                 avcodec_free_frame(&amp;frame);
+ #endif
+                                 return 0;
+@@ -399,7 +425,11 @@
+                         av_new_packet(&amp;avpkt, input-&gt;curr_pkt_size);
+                         memcpy(avpkt.data, input-&gt;curr_pkt_buf, input-&gt;curr_pkt_size);
+                         len = avcodec_decode_audio4(cc, frame, &amp;got_frame, &amp;avpkt);
++#if LIBAVCODEC_VERSION_MAJOR &gt;= 56
++                        av_packet_unref(&amp;avpkt);
++#else
+                         av_free_packet(&amp;avpkt);
++#endif
+                 }
+ #endif
+                 if (len &lt; 0) {
+@@ -426,7 +456,11 @@
+                                 res = 0;
+                         output-&gt;buffer_pos = output-&gt;buffer;
+                         output-&gt;buffer_used_len = res * cc-&gt;channels * sizeof(int16_t);
++#if LIBAVCODEC_VERSION_MAJOR &gt;= 56
++                        av_frame_free(&amp;frame);
++#else
+                         avcodec_free_frame(&amp;frame);
++#endif
+                         return output-&gt;buffer_used_len;
+                 }
+ #endif
+@@ -566,7 +600,11 @@
+         long bitrate = -1;
+ #if (LIBAVFORMAT_VERSION_INT &gt; ((51&lt;&lt;16)+(43&lt;&lt;8)+0))
+         /* ape codec returns silly numbers */
++#if LIBAVCODEC_VERSION_MAJOR &gt;= 55
++        if (priv-&gt;codec-&gt;id == AV_CODEC_ID_APE)
++#else
+         if (priv-&gt;codec-&gt;id == CODEC_ID_APE)
++#endif
+                 return -1;
+ #endif
+         if (priv-&gt;input-&gt;curr_duration &gt; 0) {
</ins></span></pre>
</div>
</div>

</body>
</html>