<!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>[125491] trunk/dports/graphics/gegl</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/125491">125491</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-09-18 13:49:00 -0700 (Thu, 18 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gegl: patch for ffmpeg 2.4 compatibility, increment revision to rebuild.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgeglPortfile">trunk/dports/graphics/gegl/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgeglfilespatchffmpegdiff">trunk/dports/graphics/gegl/files/patch-ffmpeg.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsgeglPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gegl/Portfile (125490 => 125491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl/Portfile 2014-09-18 20:46:07 UTC (rev 125490)
+++ trunk/dports/graphics/gegl/Portfile 2014-09-18 20:49:00 UTC (rev 125491)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> name gegl
</span><span class="cx"> conflicts gegl-devel
</span><span class="cx"> version 0.2.0
</span><del>-revision 12
</del><ins>+revision 13
</ins><span class="cx"> license {GPL-3+ LGPL-3+}
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories graphics
</span></span></pre></div>
<a id="trunkdportsgraphicsgeglfilespatchffmpegdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gegl/files/patch-ffmpeg.diff (125490 => 125491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl/files/patch-ffmpeg.diff 2014-09-18 20:46:07 UTC (rev 125490)
+++ trunk/dports/graphics/gegl/files/patch-ffmpeg.diff 2014-09-18 20:49:00 UTC (rev 125491)
</span><span class="lines">@@ -1,23 +1,3 @@
</span><del>---- operations/external/ff-load.c.orig 2013-10-15 16:40:50.000000000 -0700
-+++ operations/external/ff-load.c 2013-10-15 16:41:16.000000000 -0700
-@@ -271,7 +271,7 @@
- gint err;
-
- ff_cleanup (o);
-- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+ err = avformat_open_input (&p->ic, o->path, NULL, NULL);
- if (err < 0)
- {
- print_error (o->path, err);
-@@ -312,7 +312,7 @@
- if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
- p->enc->flags |= CODEC_FLAG_TRUNCATED;
-
-- if (avcodec_open (p->enc, p->codec) < 0)
-+ if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
- {
- g_warning ("error opening codec %s", p->enc->codec->name);
- return;
</del><span class="cx"> --- operations/workshop/external/ff-save.c.orig 2013-10-15 16:41:03.000000000 -0700
</span><span class="cx"> +++ operations/workshop/external/ff-save.c 2013-10-15 16:41:16.000000000 -0700
</span><span class="cx"> @@ -568,7 +568,7 @@
</span><span class="lines">@@ -72,3 +52,82 @@
</span><span class="cx"> free (p->oc);
</span><span class="cx"> }
</span><span class="cx"> g_free (o->chant_data);
</span><ins>+From 97067622352e58f86a24851dacb1f5daa0762897 Mon Sep 17 00:00:00 2001
+From: nick black <nick.black@sprezzatech.com>
+Date: Thu, 13 Dec 2012 23:11:16 -0500
+Subject: port gegl forward to libav 54
+
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index 442ec5f..75d26e9 100644
+--- operations/external/ff-load.c
++++ operations/external/ff-load.c
+@@ -137,7 +137,7 @@ ff_cleanup (GeglChantO *o)
+ if (p->enc)
+ avcodec_close (p->enc);
+ if (p->ic)
+- av_close_input_file (p->ic);
++ avformat_close_input(&p->ic);
+ if (p->lavc_frame)
+ av_free (p->lavc_frame);
+
+@@ -216,9 +216,9 @@ decode_frame (GeglOperation *operation,
+ {
+ do
+ {
+- if (av_read_packet (p->ic, &p->pkt) < 0)
++ if (av_read_frame (p->ic, &p->pkt) < 0)
+ {
+- fprintf (stderr, "av_read_packet failed for %s\n",
++ fprintf (stderr, "av_read_frame failed for %s\n",
+ o->path);
+ return -1;
+ }
+@@ -271,12 +271,12 @@ prepare (GeglOperation *operation)
+ gint err;
+
+ ff_cleanup (o);
+- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
++ err = avformat_open_input(&p->ic, o->path, NULL, 0);
+ if (err < 0)
+ {
+ print_error (o->path, err);
+ }
+- err = av_find_stream_info (p->ic);
++ err = avformat_find_stream_info (p->ic, NULL);
+ if (err < 0)
+ {
+ g_warning ("ff-load: error finding stream info for %s", o->path);
+@@ -312,7 +312,7 @@ prepare (GeglOperation *operation)
+ if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
+ p->enc->flags |= CODEC_FLAG_TRUNCATED;
+
+- if (avcodec_open (p->enc, p->codec) < 0)
++ if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
+ {
+ g_warning ("error opening codec %s", p->enc->codec->name);
+ return;
+--
+cgit v0.10.1
+
+
+--- operations/workshop/external/ff-save.c.orig 2014-09-18 12:53:29.000000000 -0700
++++ operations/workshop/external/ff-save.c 2014-09-18 12:56:01.000000000 -0700
+@@ -358,7 +358,7 @@
+ AVStream *st;
+
+ p = NULL;
+- st = av_new_stream (oc, 1);
++ st = avformat_new_stream (oc, 1);
+ if (!st)
+ {
+ fprintf (stderr, "Could not alloc stream\n");
+@@ -487,7 +487,7 @@
+ AVCodecContext *c;
+ AVStream *st;
+
+- st = av_new_stream (oc, 0);
++ st = avformat_new_stream (oc, 0);
+ if (!st)
+ {
+ fprintf (stderr, "Could not alloc stream %p %p %i\n", op, oc, codec_id);
</ins></span></pre>
</div>
</div>
</body>
</html>