[125491] trunk/dports/graphics/gegl
devans at macports.org
devans at macports.org
Thu Sep 18 13:49:00 PDT 2014
Revision: 125491
https://trac.macports.org/changeset/125491
Author: devans at macports.org
Date: 2014-09-18 13:49:00 -0700 (Thu, 18 Sep 2014)
Log Message:
-----------
gegl: patch for ffmpeg 2.4 compatibility, increment revision to rebuild.
Modified Paths:
--------------
trunk/dports/graphics/gegl/Portfile
trunk/dports/graphics/gegl/files/patch-ffmpeg.diff
Modified: trunk/dports/graphics/gegl/Portfile
===================================================================
--- 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)
@@ -7,7 +7,7 @@
name gegl
conflicts gegl-devel
version 0.2.0
-revision 12
+revision 13
license {GPL-3+ LGPL-3+}
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
Modified: trunk/dports/graphics/gegl/files/patch-ffmpeg.diff
===================================================================
--- 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)
@@ -1,23 +1,3 @@
---- 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;
--- operations/workshop/external/ff-save.c.orig 2013-10-15 16:41:03.000000000 -0700
+++ operations/workshop/external/ff-save.c 2013-10-15 16:41:16.000000000 -0700
@@ -568,7 +568,7 @@
@@ -72,3 +52,82 @@
free (p->oc);
}
g_free (o->chant_data);
+From 97067622352e58f86a24851dacb1f5daa0762897 Mon Sep 17 00:00:00 2001
+From: nick black <nick.black at 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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140918/fdffbc70/attachment.html>
More information about the macports-changes
mailing list