Revision: 111717 https://trac.macports.org/changeset/111717 Author: devans@macports.org Date: 2013-09-29 14:14:32 -0700 (Sun, 29 Sep 2013) Log Message: ----------- gegl: fix +workshop build failure resulting from ffmpeg and lua API changes, mentioned OT in #40429. Modified Paths: -------------- trunk/dports/graphics/gegl/Portfile trunk/dports/graphics/gegl/files/patch-ffmpeg-2.0.diff Added Paths: ----------- trunk/dports/graphics/gegl/files/patch-workshop-lua-5.2.diff Modified: trunk/dports/graphics/gegl/Portfile =================================================================== --- trunk/dports/graphics/gegl/Portfile 2013-09-29 20:27:31 UTC (rev 111716) +++ trunk/dports/graphics/gegl/Portfile 2013-09-29 21:14:32 UTC (rev 111717) @@ -47,11 +47,17 @@ port:libspiro \ port:lensfun +pre-patch { + copy ${worksrcpath}/operations/workshop/external/ff-save.c ${worksrcpath}/operations/workshop/external/ff-save.c.orig + copy ${worksrcpath}/operations/workshop/external/gluas.c ${worksrcpath}/operations/workshop/external/gluas.c.orig +} + patchfiles patch-configure.diff \ opencl.patch \ rename-for-altivec.patch \ patch-ffmpeg-1.0.diff \ - patch-ffmpeg-2.0.diff + patch-ffmpeg-2.0.diff \ + patch-workshop-lua-5.2.diff # introspection: Need to define Gegl_0_2_gir_FILES Modified: trunk/dports/graphics/gegl/files/patch-ffmpeg-2.0.diff =================================================================== --- trunk/dports/graphics/gegl/files/patch-ffmpeg-2.0.diff 2013-09-29 20:27:31 UTC (rev 111716) +++ trunk/dports/graphics/gegl/files/patch-ffmpeg-2.0.diff 2013-09-29 21:14:32 UTC (rev 111717) @@ -9,8 +9,8 @@ { g_warning ("error opening codec %s", p->enc->codec->name); return; ---- operations/workshop/external/ff-save.c.orig 2013-07-28 22:46:58.000000000 -0700 -+++ operations/workshop/external/ff-save.c 2013-07-28 22:47:36.000000000 -0700 +--- operations/workshop/external/ff-save.c.orig 2012-03-29 13:05:50.000000000 -0700 ++++ operations/workshop/external/ff-save.c 2013-09-29 13:36:04.000000000 -0700 @@ -568,7 +568,7 @@ } @@ -20,3 +20,46 @@ { fprintf (stderr, "could not open codec\n"); exit (1); +@@ -769,26 +769,24 @@ + /*XXX: FOO p->audio_st = add_audio_stream (op, p->oc, p->fmt->audio_codec);*/ + } + +- if (av_set_parameters (p->oc, NULL) < 0) +- { +- fprintf (stderr, "Invalid output format propeters\n%s", ""); +- return -1; +- } +- +- dump_format (p->oc, 0, self->path, 1); ++ av_dump_format (p->oc, 0, self->path, 1); + + if (p->video_st) + open_video (p, p->oc, p->video_st); + if (p->audio_st) + open_audio (p, p->oc, p->audio_st); + +- if (url_fopen (&p->oc->pb, self->path, URL_WRONLY) < 0) ++ if (avio_open (&p->oc->pb, self->path, AVIO_FLAG_WRITE) < 0) + { + fprintf (stderr, "couldn't open '%s'\n", self->path); + return -1; + } + +- av_write_header (p->oc); ++ if (avformat_write_header (p->oc, NULL) < 0) ++ { ++ fprintf(stderr, "Error occurred when opening output file\n"); ++ return 1; ++ } + + return 0; + } +@@ -858,7 +856,7 @@ + av_freep (&p->oc->streams[i]); + } + +- url_fclose (&p->oc->pb); ++ avio_close (p->oc->pb); + free (p->oc); + } + g_free (o->chant_data); Added: trunk/dports/graphics/gegl/files/patch-workshop-lua-5.2.diff =================================================================== --- trunk/dports/graphics/gegl/files/patch-workshop-lua-5.2.diff (rev 0) +++ trunk/dports/graphics/gegl/files/patch-workshop-lua-5.2.diff 2013-09-29 21:14:32 UTC (rev 111717) @@ -0,0 +1,29 @@ +--- operations/workshop/external/gluas.c.orig 2012-03-29 13:05:50.000000000 -0700 ++++ operations/workshop/external/gluas.c 2013-09-29 13:51:53.000000000 -0700 +@@ -97,7 +97,7 @@ + static int l_flush (lua_State * lua); + static int l_print (lua_State * lua); + +-static const luaL_reg gluas_functions[] = ++static const luaL_Reg gluas_functions[] = + { + {"set_rgba", l_set_rgba}, + {"get_rgba", l_get_rgba}, +@@ -122,7 +122,7 @@ + }; + static void + register_functions (lua_State *L, +- const luaL_reg *l) ++ const luaL_Reg *l) + { + for (;l->name; l++) + lua_register (L, l->name, l->func); +@@ -146,7 +146,7 @@ + lua_State *L; + Priv p; + +- L = lua_open (); ++ L = luaL_newstate (); + luaL_openlibs (L); + + register_functions (L, gluas_functions);