<!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>[143017] trunk/dports/graphics/gegl-devel</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/143017">143017</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-12-01 14:57:08 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gegl-devel: update to version 0.3.5, git master as of 20151201, dependencies, remove outdated patch files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgegldevelPortfile">trunk/dports/graphics/gegl-devel/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgegldevelfilespatchconfigureacdiff">trunk/dports/graphics/gegl-devel/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<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="modfile"><h4>Modified: trunk/dports/graphics/gegl-devel/Portfile (143016 => 143017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl-devel/Portfile        2015-12-01 22:53:57 UTC (rev 143016)
+++ trunk/dports/graphics/gegl-devel/Portfile        2015-12-01 22:57:08 UTC (rev 143017)
</span><span class="lines">@@ -9,9 +9,9 @@
</span><span class="cx"> name gegl-devel
</span><span class="cx"> conflicts gegl
</span><span class="cx"> set git_name gegl
</span><del>-set git_commit ce4d45699564e5062f0ef003e405b75e8fa36f47
-set git_date 20151119
-version 0.3.1-${git_date}
</del><ins>+set git_commit 3609b3f4b21ec04cec9f20daf251c9da83d14293
+set git_date 20151201
+version 0.3.5-${git_date}
</ins><span class="cx"> license {GPL-3+ LGPL-3+}
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx">
</span><span class="cx"> distname ${git_name}-${git_commit}
</span><span class="cx">
</span><del>-checksums rmd160 a45d29ed5b167f8ac265902e4c7012bbcc0e7e01 \
- sha256 d5fc1d92e4eaa1542ba7eaa5e00cc14131710f2cc9477f5bca147661d8c4360d
</del><ins>+checksums rmd160 4f6239a4510454400ffcb9345d23b576c1e4231c \
+ sha256 ffadf91815e17f147d1e7dc3a30f5b0d545d16946e8cff4405de57b261387f43
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> path:bin/dot:graphviz \
</span><span class="cx"> port:openexr \
</span><span class="cx"> port:exiv2 \
</span><ins>+ port:gexiv2 \
</ins><span class="cx"> port:json-glib \
</span><span class="cx"> port:libraw \
</span><span class="cx"> port:librsvg \
</span><span class="lines">@@ -56,9 +57,18 @@
</span><span class="cx"> port:vala
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure.ac.diff \
</span><del>- patch-force-intltoolize.diff \
- patch-ffmpeg.diff
</del><ins>+ patch-force-intltoolize.diff
</ins><span class="cx">
</span><ins>+post-patch {
+ # http://trac.macports.org/ticket/35148
+ if {${os.major} < 10} {
+ reinplace "s|OpenGL/CGLDevice.h|OpenGL/CGLTypes.h|" ${worksrcpath}/gegl/opencl/cl_gl.h
+ }
+
+ # Not sure what they expected by using these macros... they only belong in system headers...
+ reinplace "s/AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER//" ${worksrcpath}/gegl/opencl/cl_platform.h
+}
+
</ins><span class="cx"> gobject_introspection yes
</span><span class="cx">
</span><span class="cx"> compiler.blacklist-append gcc-4.0 *gcc-4.2
</span><span class="lines">@@ -73,16 +83,6 @@
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --without-umfpack
</span><span class="cx">
</span><del>-post-patch {
- # http://trac.macports.org/ticket/35148
- if {${os.major} < 10} {
- reinplace "s|OpenGL/CGLDevice.h|OpenGL/CGLTypes.h|" ${worksrcpath}/gegl/opencl/cl_gl.h
- }
-
- # Not sure what they expected by using these macros... they only belong in system headers...
- reinplace "s/AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER//" ${worksrcpath}/gegl/opencl/cl_platform.h
-}
-
</del><span class="cx"> platform darwin {
</span><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx"> # In order to build universal on Leopard, you need MacPorts 2.1
</span></span></pre></div>
<a id="trunkdportsgraphicsgegldevelfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gegl-devel/files/patch-configure.ac.diff (143016 => 143017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl-devel/files/patch-configure.ac.diff        2015-12-01 22:53:57 UTC (rev 143016)
+++ trunk/dports/graphics/gegl-devel/files/patch-configure.ac.diff        2015-12-01 22:57:08 UTC (rev 143017)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>---- configure.ac.orig        2015-06-29 19:28:12.000000000 -0700
-+++ configure.ac        2015-07-01 11:04:28.000000000 -0700
-@@ -646,6 +646,17 @@
- AM_PATH_PYTHON([2.5.0],, [:])
- AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
</del><ins>+--- configure.ac.orig        2015-12-01 08:33:44.000000000 -0800
++++ configure.ac        2015-12-01 10:04:11.000000000 -0800
+@@ -647,6 +647,17 @@
+ fi
+ AM_CONDITIONAL(HAVE_DOT, test "x$have_dot" = "xyes")
</ins><span class="cx">
</span><span class="cx"> +dnl Override standard python locations with MacPorts version specific ones
</span><span class="cx"> +
</span><span class="lines">@@ -16,5 +16,5 @@
</span><span class="cx"> +AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
</span><span class="cx"> +
</span><span class="cx"> #################
</span><del>- # Check for Cairo
</del><ins>+ # Check for Python (optional, used for introspection unittests)
</ins><span class="cx"> #################
</span></span></pre></div>
<a id="trunkdportsgraphicsgegldevelfilespatchffmpegdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gegl-devel/files/patch-ffmpeg.diff (143016 => 143017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl-devel/files/patch-ffmpeg.diff        2015-12-01 22:53:57 UTC (rev 143016)
+++ trunk/dports/graphics/gegl-devel/files/patch-ffmpeg.diff        2015-12-01 22:57:08 UTC (rev 143017)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>---- operations/workshop/external/ff-save.c.orig        2014-07-18 03:23:57.000000000 -0700
-+++ operations/workshop/external/ff-save.c        2014-07-20 10:47:31.000000000 -0700
-@@ -573,7 +573,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);
-@@ -774,26 +774,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;
- }
-@@ -863,7 +861,7 @@
- av_freep (&p->oc->streams[i]);
- }
-
-- url_fclose (&p->oc->pb);
-+ avio_close (p->oc->pb);
- free (p->oc);
- }
- g_free (o->user_data);
---- operations/workshop/external/ff-save.c.orig        2014-09-18 13:10:57.000000000 -0700
-+++ operations/workshop/external/ff-save.c        2014-09-18 13:10:57.000000000 -0700
-@@ -363,7 +363,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");
-@@ -492,7 +492,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);
</del></span></pre></div>
<a id="trunkdportsgraphicsgegldevelfilesrenameforaltivecpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gegl-devel/files/rename-for-altivec.patch (143016 => 143017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl-devel/files/rename-for-altivec.patch        2015-12-01 22:53:57 UTC (rev 143016)
+++ trunk/dports/graphics/gegl-devel/files/rename-for-altivec.patch        2015-12-01 22:57:08 UTC (rev 143017)
</span><span class="lines">@@ -1,152 +0,0 @@
</span><del>---- 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;
</del></span></pre>
</div>
</div>
</body>
</html>