<!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>[114579] trunk/dports/graphics</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/114579">114579</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-12-10 09:47:22 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>gegl-devel: new development version of gegl based on a snapshort of recent git master.</pre>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/graphics/gegl-devel/</li>
<li><a href="#trunkdportsgraphicsgegldevelPortfile">trunk/dports/graphics/gegl-devel/Portfile</a></li>
<li>trunk/dports/graphics/gegl-devel/files/</li>
<li><a href="#trunkdportsgraphicsgegldevelfilespatchconfigureacdiff">trunk/dports/graphics/gegl-devel/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgraphicsgegldevelfilespatchffmpegdiff">trunk/dports/graphics/gegl-devel/files/patch-ffmpeg.diff</a></li>
<li><a href="#trunkdportsgraphicsgegldevelfilesrenameforaltivecpatch">trunk/dports/graphics/gegl-devel/files/rename-for-altivec.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsgegldevelPortfile"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gegl-devel/Portfile (0 => 114579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl-devel/Portfile (rev 0)
+++ trunk/dports/graphics/gegl-devel/Portfile 2013-12-10 17:47:22 UTC (rev 114579)
</span><span class="lines">@@ -0,0 +1,123 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+PortGroup muniversal 1.0
+
+name gegl-devel
+set git_name gegl
+set git_commit c556f4323a9fc9c18b78596afd0357d0b4a52d90
+conflicts gegl
+version 0.3.0
+revision 20131208
+license {GPL-3+ LGPL-3+}
+categories graphics
+maintainers devans
+platforms darwin
+
+description GEGL is a graph based image processing framework.
+
+long_description \
+ GEGL is a graph based image processing framework offering image processing and \
+ compositing on large images. GEGL is suitable for projects ranging from small \
+ one-off projects to interactive applications. This is the development version \
+ based on a recent snapshot of upstream git master.
+
+homepage http://gegl.org/
+master_sites https://git.gnome.org/browse/${git_name}/snapshot/
+
+distname ${git_name}-${git_commit}
+
+checksums rmd160 7e22eec53682d8cc9b2bddacbd117fc29496ba3a \
+ sha256 c842a82ca02845bc29e91732d80e163c6f8087a5da16855de8bf32646f516a14
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:w3m \
+ port:autoconf \
+ port:automake \
+ port:libtool
+
+depends_lib port:babl-devel \
+ port:gtk2 \
+ port:jpeg \
+ port:lua \
+ port:gobject-introspection \
+ port:graphviz \
+ port:openexr \
+ port:exiv2 \
+ port:libopenraw \
+ port:librsvg \
+ port:libsdl \
+ path:lib/libavcodec.dylib:ffmpeg \
+ port:libspiro \
+ port:lensfun \
+ port:vala
+
+patchfiles patch-configure.ac.diff \
+ patch-ffmpeg.diff \
+ rename-for-altivec.patch
+
+compiler.blacklist-append gcc-4.2
+
+# gobject-introspection uses g-ir-scanner, which uses $CC from env
+
+if {[variant_isset universal]} {
+ foreach arch ${configure.universal_archs} {
+ lappend merger_build_args(${arch}) CC='${configure.cc} -arch ${arch}'
+ }
+} else {
+ build.args-append CC="${configure.cc} ${configure.cc_archflags}"
+}
+
+configure.cmd ./autogen.sh
+
+configure.args --disable-docs \
+ --disable-silent-rules \
+ --enable-introspection=yes \
+ --without-umfpack
+
+platform darwin {
+ if {[variant_isset universal]} {
+ # In order to build universal on Leopard, you need MacPorts 2.1
+ set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.version}
+ set merger_configure_cflags(ppc) -fno-altivec
+ set merger_configure_cxxflags(ppc) -fno-altivec
+ } elseif {${build_arch} == "ppc"} {
+ configure.cflags-append -fno-altivec
+ configure.cxxflags-append -fno-altivec
+ } elseif {${build_arch} == "x86_64"} {
+ configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
+ }
+}
+
+variant html_doc description {Build html docs with enscript and asciidoc} {
+ depends_build-append port:asciidoc
+ configure.args-delete --disable-docs
+ configure.args-append --enable-docs
+}
+
+variant workshop description {Enable build of workshop operations} {
+ configure.args-append --enable-workshop
+}
+
+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 none
</ins><span class="cx">Property changes on: trunk/dports/graphics/gegl-devel/Portfile
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkdportsgraphicsgegldevelfilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gegl-devel/files/patch-configure.ac.diff (0 => 114579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl-devel/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/graphics/gegl-devel/files/patch-configure.ac.diff 2013-12-10 17:47:22 UTC (rev 114579)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- configure.ac.orig 2013-11-30 11:08:51.000000000 -0800
++++ configure.ac 2013-11-30 20:32:39.000000000 -0800
+@@ -600,6 +600,17 @@
+ AM_PATH_PYTHON([2.5.0],, [:])
+ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+
++dnl Override standard python locations with MacPorts version specific ones
++
++AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
++AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
++
++am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++
++AC_SUBST([pythondir], [$am_cv_python_pythondir])
++AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
++
+ #################
+ # Check for Cairo
+ #################
</ins></span></pre></div>
<a id="trunkdportsgraphicsgegldevelfilespatchffmpegdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gegl-devel/files/patch-ffmpeg.diff (0 => 114579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl-devel/files/patch-ffmpeg.diff (rev 0)
+++ trunk/dports/graphics/gegl-devel/files/patch-ffmpeg.diff 2013-12-10 17:47:22 UTC (rev 114579)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+--- 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 @@
+ }
+
+ /* open the codec */
+- if (avcodec_open (c, codec) < 0)
++ if (avcodec_open2 (c, codec, NULL) < 0)
+ {
+ 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);
</ins></span></pre></div>
<a id="trunkdportsgraphicsgegldevelfilesrenameforaltivecpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gegl-devel/files/rename-for-altivec.patch (0 => 114579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl-devel/files/rename-for-altivec.patch (rev 0)
+++ trunk/dports/graphics/gegl-devel/files/rename-for-altivec.patch 2013-12-10 17:47:22 UTC (rev 114579)
</span><span class="lines">@@ -0,0 +1,152 @@
</span><ins>+--- operations/common/envelopes.h.orig 2012-09-03 14:29:05.000000000 -0700
++++ operations/common/envelopes.h 2012-09-03 14:31:00.000000000 -0700
+@@ -59,12 +59,12 @@ sample (gfloat *buf,
+ gint y,
+ gfloat *dst)
+ {
+- gfloat *pixel = (buf + ((width * y) + x) * 4);
++ gfloat *pixelp = (buf + ((width * y) + x) * 4);
+ gint c;
+
+ for (c=0;c<4;c++)
+ {
+- dst[c] = pixel[c];
++ dst[c] = pixelp[c];
+ }
+ }
+
+@@ -119,17 +119,17 @@ retry: /* if we've
+ goto retry;
+
+ {
+- gfloat *pixel = (buf + ((width * v) + u) * 4);
++ gfloat *pixelp = (buf + ((width * v) + u) * 4);
+
+- if (pixel[3]>0.0) /* ignore fully transparent pixels */
++ if (pixelp[3]>0.0) /* ignore fully transparent pixels */
+ {
+ for (c=0;c<3;c++)
+ {
+- if (pixel[c]<best_min[c])
+- best_min[c]=pixel[c];
++ if (pixelp[c]<best_min[c])
++ best_min[c]=pixelp[c];
+
+- if (pixel[c]>best_max[c])
+- best_max[c]=pixel[c];
++ if (pixelp[c]>best_max[c])
++ best_max[c]=pixelp[c];
+ }
+ }
+ else
+@@ -162,7 +162,7 @@ static inline void compute_envelopes (gf
+ gint c;
+ gfloat range_sum[4] = {0,0,0,0};
+ gfloat relative_brightness_sum[4] = {0,0,0,0};
+- gfloat *pixel = buf + (width*y+x)*4;
++ gfloat *pixelp = buf + (width*y+x)*4;
+
+ /* compute lookuptables for the gamma, currently not used/exposed
+ * as a tweakable property */
+@@ -193,7 +193,7 @@ static inline void compute_envelopes (gf
+
+ if (range>0.0)
+ {
+- relative_brightness = (pixel[c] - min[c]) / range;
++ relative_brightness = (pixelp[c] - min[c]) / range;
+ }
+ else
+ {
+@@ -211,8 +211,8 @@ static inline void compute_envelopes (gf
+ gfloat range = range_sum[c] / iterations;
+
+ if (max_envelope)
+- max_envelope[c] = pixel[c] + (1.0 - relative_brightness) * range;
++ max_envelope[c] = pixelp[c] + (1.0 - relative_brightness) * range;
+ if (min_envelope)
+- min_envelope[c] = pixel[c] - relative_brightness * range;
++ min_envelope[c] = pixelp[c] - relative_brightness * range;
+ }
+ }
+--- gegl/property-types/gegl-color.h.orig 2013-11-09 23:06:00.000000000 -0800
++++ gegl/property-types/gegl-color.h 2013-11-10 11:27:40.000000000 -0800
+@@ -117,7 +117,7 @@
+ */
+ void gegl_color_set_pixel (GeglColor *color,
+ const Babl *format,
+- const void *pixel);
++ const void *pixelp);
+ /**
+ * gegl_color_get_pixel: (skip)
+ * @color: a #GeglColor
+@@ -128,7 +128,7 @@
+ */
+ void gegl_color_get_pixel (GeglColor *color,
+ const Babl *format,
+- void *pixel);
++ void *pixelp);
+
+ /***
+ */
+--- operations/common/c2g.c.orig 2013-11-09 23:06:00.000000000 -0800
++++ operations/common/c2g.c 2013-11-10 11:27:40.000000000 -0800
+@@ -84,7 +84,7 @@
+ gint src_offset = (inw*y+radius)*4;
+ for (x=radius; x<outw+radius; x++)
+ {
+- gfloat *pixel= src_buf + src_offset;
++ gfloat *pixelp= src_buf + src_offset;
+ gfloat min[4];
+ gfloat max[4];
+
+@@ -108,8 +108,8 @@
+ gint c;
+ for (c=0; c<3; c++)
+ {
+- nominator += (pixel[c] - min[c]) * (pixel[c] - min[c]);
+- denominator += (pixel[c] - max[c]) * (pixel[c] - max[c]);
++ nominator += (pixelp[c] - min[c]) * (pixelp[c] - min[c]);
++ denominator += (pixelp[c] - max[c]) * (pixelp[c] - max[c]);
+ }
+
+ nominator = sqrt (nominator);
+--- operations/external/path.c.orig 2013-11-30 11:08:51.000000000 -0800
++++ operations/external/path.c 2013-11-30 20:35:17.000000000 -0800
+@@ -74,7 +74,7 @@
+
+ static void gegl_path_stroke (GeglBuffer *buffer,
+ const GeglRectangle *clip_rect,
+- GeglPath *vector,
++ GeglPath *vectorp,
+ GeglColor *color,
+ gdouble linewidth,
+ gdouble hardness,
+@@ -92,7 +92,7 @@
+ static void
+ gegl_path_stroke (GeglBuffer *buffer,
+ const GeglRectangle *clip_rect,
+- GeglPath *vector,
++ GeglPath *vectorp,
+ GeglColor *color,
+ gdouble linewidth,
+ gdouble hardness,
+@@ -105,7 +105,7 @@
+ gdouble xmin, xmax, ymin, ymax;
+ GeglRectangle extent;
+
+- if (!vector)
++ if (!vectorp)
+ return;
+
+ if (!clip_rect)
+@@ -114,8 +114,8 @@
+ clip_rect = gegl_buffer_get_extent (buffer);
+ }
+
+- iter = gegl_path_get_flat_path (vector);
+- gegl_path_get_bounds (vector, &xmin, &xmax, &ymin, &ymax);
++ iter = gegl_path_get_flat_path (vectorp);
++ gegl_path_get_bounds (vectorp, &xmin, &xmax, &ymin, &ymax);
+ extent.x = floor (xmin);
+ extent.y = floor (ymin);
+ extent.width = ceil (xmax) - extent.x;
</ins></span></pre>
</div>
</div>
</body>
</html>