[87558] trunk/dports/graphics/gegl

[devans at macports.org]

Revision: 87558
          http://trac.macports.org/changeset/87558
Author:   devans at macports.org
Date:     2011-11-25 09:10:48 -0800 (Fri, 25 Nov 2011)
Log Message:
-----------
gegl: update to version 0.1.8, configuration, dependencies, add variants +vala, +python25, +python26, +python27.

Modified Paths:
--------------
    trunk/dports/graphics/gegl/Portfile

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

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

Modified: trunk/dports/graphics/gegl/Portfile
===================================================================
--- trunk/dports/graphics/gegl/Portfile	2011-11-25 17:02:43 UTC (rev 87557)
+++ trunk/dports/graphics/gegl/Portfile	2011-11-25 17:10:48 UTC (rev 87558)
@@ -4,9 +4,8 @@
 PortSystem      1.0
 
 name            gegl
-version         0.1.6
-revision        1
-license         GPL-3 LGPL-3
+version         0.1.8
+license         {GPL-3+ LGPL-3+}
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      graphics
 maintainers     devans
@@ -26,8 +25,8 @@
 
 universal_variant  no
 
-checksums       sha1    27bedcfd077da7a6913b82966dbec904b22c121d \
-                rmd160  8b7bf74fe769cee289b336b5d815b370aa3a125d
+checksums       sha1    3d4d902580f5c5122b01b5188b6b5da03089ecac \
+                rmd160  5ebd7663285a57205661868452e650ba41b9df7f
 
 depends_build \
     port:pkgconfig \
@@ -43,11 +42,15 @@
     path:lib/pkgconfig/sdl.pc:libsdl \
     path:bin/dot:graphviz \
     path:lib/libavcodec.dylib:ffmpeg \
-    port:libspiro
+    port:libspiro \
+    port:lensfun
 
-patchfiles      patch-operations-external-ff-load.c.diff
+patchfiles     patch-configure.diff
 
-configure.args  --disable-docs
+configure.args  --disable-docs \
+                --enable-introspection=no \
+                --without-vala \
+                --without-umfpack
 
 # disable parallel build, see #31498
 
@@ -69,6 +72,30 @@
     configure.args-append --enable-workshop
 }
 
+variant vala description {Enable Vala bindings} {
+    depends_lib-append    port:vala
+    configure.args-delete --without-vala
+}
+
+variant python25 conflicts python26 python27 description {Build using Python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_build-append      port:python25
+}
+
+variant python26 conflicts python25 python27 description {Build using Python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_build-append      port:python26
+}
+
+variant python27 conflicts python25 python26 description {Build using Python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_build-append      port:python27
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 livecheck.type  regex
 livecheck.url   http://ftp.iut-bm.univ-fcomte.fr/gimp/${name}/${branch}/
 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/graphics/gegl/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/gegl/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/graphics/gegl/files/patch-configure.diff	2011-11-25 17:10:48 UTC (rev 87558)
@@ -0,0 +1,14 @@
+--- configure.orig	2011-11-18 11:13:16.000000000 -0800
++++ configure	2011-11-25 07:19:14.000000000 -0800
+@@ -18259,9 +18259,9 @@
+ 
+ 
+ 
+-  PYTHON_PREFIX='${prefix}'
++  PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
+ 
+-  PYTHON_EXEC_PREFIX='${exec_prefix}'
++  PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
+ 
+ 
+ 

Deleted: 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-11-25 17:02:43 UTC (rev 87557)
+++ trunk/dports/graphics/gegl/files/patch-operations-external-ff-load.c.diff	2011-11-25 17:10:48 UTC (rev 87558)
@@ -1,42 +0,0 @@
---- operations/external/ff-load.c.orig	2011-09-21 12:11:08.000000000 -0700
-+++ operations/external/ff-load.c	2011-09-21 12:20:20.000000000 -0700
-@@ -69,7 +69,11 @@
- {
-   switch (err)
-     {
--    case AVERROR_NUMEXPECTED:
-+#if LIBAVFORMAT_VERSION_MAJOR >= 53
-+    case AVERROR(EINVAL):
-+#else
-+    case AVERROR_NUMEXPECTED:
-+#endif
-       g_warning ("%s: Incorrect image filename syntax.\n"
-                  "Use '%%d' to specify the image number:\n"
-                  "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
-@@ -77,10 +81,14 @@
-                  filename);
-       break;
-     case AVERROR_INVALIDDATA:
-+#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);
-       break;
-     case AVERROR_NOFMT:
-       g_warning ("%s: Unknown format\n", filename);
-+#endif
-       break;
-     default:
-       g_warning ("%s: Error while opening file\n", filename);
-@@ -278,7 +286,11 @@
-       for (i = 0; i< p->ic->nb_streams; i++)
-         {
-           AVCodecContext *c = p->ic->streams[i]->codec;
-+#if LIBAVFORMAT_VERSION_MAJOR >= 53
-+          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
-+#else
-           if (c->codec_type == CODEC_TYPE_VIDEO)
-+#endif
-             {
-               p->video_st = p->ic->streams[i];
-               p->video_stream = i;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111125/3a00998e/attachment.html>