[84329] trunk/dports/graphics/gegl

[devans at macports.org]

Revision: 84329
          http://trac.macports.org/changeset/84329
Author:   devans at macports.org
Date:     2011-09-22 12:49:32 -0700 (Thu, 22 Sep 2011)
Log Message:
-----------
gegl: rework ffmpeg-devel patch, same result, no autoreconf.

Modified Paths:
--------------
    trunk/dports/graphics/gegl/Portfile
    trunk/dports/graphics/gegl/files/patch-operations-external-ff-load.c.diff

Removed Paths:
-------------
    trunk/dports/graphics/gegl/files/patch-configure.ac.diff

Modified: trunk/dports/graphics/gegl/Portfile
===================================================================
--- trunk/dports/graphics/gegl/Portfile	2011-09-22 18:42:29 UTC (rev 84328)
+++ trunk/dports/graphics/gegl/Portfile	2011-09-22 19:49:32 UTC (rev 84329)
@@ -45,12 +45,8 @@
     path:lib/libavcodec.dylib:ffmpeg \
     port:libspiro
 
-patchfiles      patch-configure.ac.diff \
-                patch-operations-external-ff-load.c.diff
+patchfiles      patch-operations-external-ff-load.c.diff
 
-use_autoreconf  yes
-autoreconf.args -fvi
-
 configure.args  --disable-docs
 
 platform darwin {

Deleted: trunk/dports/graphics/gegl/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/graphics/gegl/files/patch-configure.ac.diff	2011-09-22 18:42:29 UTC (rev 84328)
+++ trunk/dports/graphics/gegl/files/patch-configure.ac.diff	2011-09-22 19:49:32 UTC (rev 84329)
@@ -1,12 +0,0 @@
---- configure.ac.orig	2011-02-13 09:54:23.000000000 -0800
-+++ configure.ac	2011-09-21 11:55:42.000000000 -0700
-@@ -852,6 +852,9 @@
-   PKG_CHECK_MODULES(AVFORMAT, libavformat libavcodec,
-     have_libavformat="yes",
-     have_libavformat="no  (libavformat not found)")
-+  PKG_CHECK_EXISTS(libavformat >= 53.0.0,
-+    AC_DEFINE(HAVE_LIBAVFORMAT_53, 1,
-+          [define to 1 if libavformat version >= 53.0.0]),)
-   # verify the presence of the avformat.h header
-   if test "x$have_libavformat" = "xyes"; then
-     gegl_save_CPPFLAGS=$CPPFLAGS

Modified: trunk/dports/graphics/gegl/files/patch-operations-external-ff-load.c.diff
===================================================================
--- trunk/dports/graphics/gegl/files/patch-operations-external-ff-load.c.diff	2011-09-22 18:42:29 UTC (rev 84328)
+++ trunk/dports/graphics/gegl/files/patch-operations-external-ff-load.c.diff	2011-09-22 19:49:32 UTC (rev 84329)
@@ -5,10 +5,10 @@
    switch (err)
      {
 -    case AVERROR_NUMEXPECTED:
-+#ifdef HAVE_LIBAVFORMAT_53
-+      case AVERROR(EINVAL):
++#if LIBAVFORMAT_VERSION_MAJOR >= 53
++    case AVERROR(EINVAL):
 +#else
-+      case AVERROR_NUMEXPECTED:
++    case AVERROR_NUMEXPECTED:
 +#endif
        g_warning ("%s: Incorrect image filename syntax.\n"
                   "Use '%%d' to specify the image number:\n"
@@ -17,7 +17,7 @@
                   filename);
        break;
      case AVERROR_INVALIDDATA:
-+#ifdef HAVE_LIBAVFORMAT_53
++#if LIBAVFORMAT_VERSION_MAJOR >= 53
 +      g_warning ("%s: Error while parsing header or unknown format\n", filename);
 +#else
        g_warning ("%s: Error while parsing header\n", filename);
@@ -32,7 +32,7 @@
        for (i = 0; i< p->ic->nb_streams; i++)
          {
            AVCodecContext *c = p->ic->streams[i]->codec;
-+#ifdef HAVE_LIBAVFORMAT_53
++#if LIBAVFORMAT_VERSION_MAJOR >= 53
 +          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
 +#else
            if (c->codec_type == CODEC_TYPE_VIDEO)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110922/1d00cc8a/attachment-0001.html>