<!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>[125493] trunk/dports/multimedia/gpac</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/125493">125493</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-09-18 13:51:52 -0700 (Thu, 18 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gpac: patch for ffmpeg 2.4 compatibility, increment revision to rebuild.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediagpacPortfile">trunk/dports/multimedia/gpac/Portfile</a></li>
<li><a href="#trunkdportsmultimediagpacfilespatchffmpeg20diff">trunk/dports/multimedia/gpac/files/patch-ffmpeg-2.0.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediagpacfilespatchffmpeg24diff">trunk/dports/multimedia/gpac/files/patch-ffmpeg-2.4.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediagpacPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/gpac/Portfile (125492 => 125493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gpac/Portfile 2014-09-18 20:50:50 UTC (rev 125492)
+++ trunk/dports/multimedia/gpac/Portfile 2014-09-18 20:51:52 UTC (rev 125493)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name gpac
</span><span class="cx"> version 0.5.0
</span><del>-revision 4
</del><ins>+revision 5
</ins><span class="cx"> categories multimedia
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -54,7 +54,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure.diff \
</span><del>- patch-ffmpeg-2.0.diff
</del><ins>+ patch-ffmpeg-2.0.diff \
+ patch-ffmpeg-2.4.diff
</ins><span class="cx">
</span><span class="cx"> # This project's build system misuses the prefix "cpp" to refer to the C++ compiler instead of the C preprocessor.
</span><span class="cx"> # https://sourceforge.net/p/gpac/bugs/287/
</span></span></pre></div>
<a id="trunkdportsmultimediagpacfilespatchffmpeg20diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/gpac/files/patch-ffmpeg-2.0.diff (125492 => 125493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gpac/files/patch-ffmpeg-2.0.diff 2014-09-18 20:50:50 UTC (rev 125492)
+++ trunk/dports/multimedia/gpac/files/patch-ffmpeg-2.0.diff 2014-09-18 20:51:52 UTC (rev 125493)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> #define AVERROR_NOFMT AVERROR(EINVAL)
</span><span class="cx"> #endif /* AVERROR_NOFMT */
</span><span class="cx">
</span><del>-+#if (LIBAVFORMAT_VERSION_MAJOR >= 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)
</del><ins>++#if (LIBAVFORMAT_VERSION_MAJOR > 54) || ((LIBAVFORMAT_VERSION_MAJOR == 54) && (LIBAVFORMAT_VERSION_MINOR >= 20))
</ins><span class="cx"> +#define av_find_stream_info(__c) avformat_find_stream_info(__c, NULL)
</span><span class="cx"> +#define FF_API_FORMAT_PARAMETERS 1
</span><span class="cx"> +#endif
</span></span></pre></div>
<a id="trunkdportsmultimediagpacfilespatchffmpeg24diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/gpac/files/patch-ffmpeg-2.4.diff (0 => 125493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gpac/files/patch-ffmpeg-2.4.diff (rev 0)
+++ trunk/dports/multimedia/gpac/files/patch-ffmpeg-2.4.diff 2014-09-18 20:51:52 UTC (rev 125493)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+--- modules/ffmpeg_in/ffmpeg_demux.c.orig 2014-09-17 11:11:54.000000000 -0700
++++ modules/ffmpeg_in/ffmpeg_demux.c 2014-09-17 11:14:34.000000000 -0700
+@@ -54,7 +54,9 @@
+
+ #if (LIBAVFORMAT_VERSION_MAJOR > 54) || ((LIBAVFORMAT_VERSION_MAJOR == 54) && (LIBAVFORMAT_VERSION_MINOR >= 20))
+ #define av_find_stream_info(__c) avformat_find_stream_info(__c, NULL)
+-#define FF_API_FORMAT_PARAMETERS 1
++#ifndef FF_API_FORMAT_PARAMETERS
++#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
++#endif
+ #endif
+
+
+@@ -346,7 +348,7 @@
+ }
+
+ exit:
+- if (ctx) av_close_input_file(ctx);
++ if (ctx) avformat_close_input(&ctx);
+ return ret;
+ }
+
+@@ -705,7 +707,7 @@
+
+ ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
+ if (!ffd->seekable) {
+- av_close_input_file(ffd->ctx);
++ avformat_close_input(&(ffd->ctx));
+ open_file(&ffd->ctx, szName, av_in);
+ av_find_stream_info(ffd->ctx);
+ }
+@@ -719,7 +721,7 @@
+
+ err_exit:
+ GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
+- if (ffd->ctx) av_close_input_file(ffd->ctx);
++ if (ffd->ctx) avformat_close_input(&(ffd->ctx));
+ ffd->ctx = NULL;
+ gf_term_on_connect(serv, NULL, e);
+ return GF_OK;
+@@ -773,7 +775,7 @@
+
+ ffd->is_running = 0;
+
+- if (ffd->ctx) av_close_input_file(ffd->ctx);
++ if (ffd->ctx) avformat_close_input(&(ffd->ctx));
+ ffd->ctx = NULL;
+ ffd->audio_ch = ffd->video_ch = NULL;
+ ffd->audio_run = ffd->video_run = 0;
+--- modules/ffmpeg_in/ffmpeg_demux.c.orig 2014-09-17 11:20:35.000000000 -0700
++++ modules/ffmpeg_in/ffmpeg_demux.c 2014-09-17 11:21:52.000000000 -0700
+@@ -624,11 +624,7 @@
+ }
+ /*setup downloader*/
+ av_in->flags |= AVFMT_NOFILE;
+-#if FF_API_FORMAT_PARAMETERS /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
+ res = avformat_open_input(&ffd->ctx, szName, av_in, NULL);
+-#else
+- res = av_open_input_stream(&ffd->ctx, &ffd->io, szName, av_in, NULL);
+-#endif
+ }
+ } else {
+ res = open_file(&ffd->ctx, szName, av_in);
</ins></span></pre>
</div>
</div>
</body>
</html>