[143015] trunk/dports/graphics
devans at macports.org
devans at macports.org
Sat Dec 12 08:11:54 PST 2015
Revision: 143015
https://trac.macports.org/changeset/143015
Author: devans at macports.org
Date: 2015-12-01 14:49:28 -0800 (Tue, 01 Dec 2015)
Log Message:
-----------
gegl-0.3: new port, latest unstable release, installs in parallel with gegl without conflict.
Modified Paths:
--------------
trunk/dports/graphics/gegl-0.3/Portfile
trunk/dports/graphics/gegl-0.3/files/patch-configure.ac.diff
Added Paths:
-----------
trunk/dports/graphics/gegl-0.3/
Removed Paths:
-------------
trunk/dports/graphics/gegl-0.3/files/patch-ffmpeg.diff
trunk/dports/graphics/gegl-0.3/files/rename-for-altivec.patch
Property changes on: trunk/dports/graphics/gegl-0.3
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/graphics/gegl-devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
Modified: trunk/dports/graphics/gegl-0.3/Portfile
===================================================================
--- trunk/dports/graphics/gegl-devel/Portfile 2015-12-01 16:21:13 UTC (rev 143007)
+++ trunk/dports/graphics/gegl-0.3/Portfile 2015-12-01 22:49:28 UTC (rev 143015)
@@ -6,32 +6,32 @@
PortGroup compiler_blacklist_versions 1.0
PortGroup gobject_introspection 1.0
-name gegl-devel
-conflicts gegl
-set git_name gegl
-set git_commit ce4d45699564e5062f0ef003e405b75e8fa36f47
-set git_date 20151119
-version 0.3.1-${git_date}
+name gegl-0.3
+set gname gegl
+version 0.3.4
+set branch [join [lrange [split ${version} .] 0 1] .]
+conflicts gegl-devel
license {GPL-3+ LGPL-3+}
categories graphics
-maintainers devans
+maintainers devans openmaintainer
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.
+ one-off projects to interactive applications.
homepage http://gegl.org/
-master_sites https://git.gnome.org/browse/${git_name}/snapshot/
+master_sites gimp:${gname}/${branch}/
-distname ${git_name}-${git_commit}
+use_bzip2 yes
-checksums rmd160 a45d29ed5b167f8ac265902e4c7012bbcc0e7e01 \
- sha256 d5fc1d92e4eaa1542ba7eaa5e00cc14131710f2cc9477f5bca147661d8c4360d
+distname ${gname}-${version}
+checksums rmd160 5b7f1ba5601ee8d97b795c3635a3ebcc690443c6 \
+ sha256 846290a790854d1e6b7c17a2d6f82ad7cb14c72e240bd3b81b98cc0ceddbc3ec
+
depends_build port:pkgconfig \
port:intltool \
port:w3m \
@@ -40,13 +40,13 @@
port:libtool \
port:python27
-depends_lib port:babl-devel \
+depends_lib port:babl \
port:gtk2 \
port:jpeg \
port:lua \
- path:bin/dot:graphviz \
port:openexr \
port:exiv2 \
+ port:gexiv2 \
port:json-glib \
port:libraw \
port:librsvg \
@@ -56,9 +56,18 @@
port:vala
patchfiles patch-configure.ac.diff \
- patch-force-intltoolize.diff \
- patch-ffmpeg.diff
+ patch-force-intltoolize.diff
+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
+}
+
gobject_introspection yes
compiler.blacklist-append gcc-4.0 *gcc-4.2
@@ -71,16 +80,17 @@
configure.args --disable-docs \
--disable-silent-rules \
+ --without-graphviz \
--without-umfpack
-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
+# use version specific binary suffix to avoid conflict with gegl
+
+post-destroot {
+ set suffix "-0.3"
+ foreach bin [glob -nocomplain -tails -directory "${destroot}${prefix}/bin" *] {
+ move ${destroot}${prefix}/bin/${bin} \
+ ${destroot}${prefix}/bin/${bin}${suffix}
}
-
- # 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
}
platform darwin {
@@ -89,10 +99,10 @@
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"} {
+ } elseif {${build_arch} eq "ppc"} {
configure.cflags-append -fno-altivec
configure.cxxflags-append -fno-altivec
- } elseif {${build_arch} == "x86_64"} {
+ } elseif {${build_arch} eq "x86_64"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
}
@@ -108,6 +118,11 @@
configure.args-append --enable-workshop
}
+variant graphviz description {Build with graphviz support} {
+ depends_lib-append path:bin/dot:graphviz
+ configure.args-delete --without-graphviz
+}
+
#
# the following dummy variants are used
# to identify this port's binary dependencies
@@ -121,4 +136,6 @@
default_variants +x11
}
-livecheck.type none
+livecheck.type regex
+livecheck.url http://download.gimp.org/pub/${gname}/${branch}/
+livecheck.regex "${gname}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
Modified: trunk/dports/graphics/gegl-0.3/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/graphics/gegl-devel/files/patch-configure.ac.diff 2015-12-01 16:21:13 UTC (rev 143007)
+++ trunk/dports/graphics/gegl-0.3/files/patch-configure.ac.diff 2015-12-01 22:49:28 UTC (rev 143015)
@@ -1,8 +1,8 @@
---- 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" != :])
+--- configure.ac.orig 2015-11-24 13:15:06.000000000 -0800
++++ configure.ac 2015-12-01 11:00:04.000000000 -0800
+@@ -647,6 +647,17 @@
+ fi
+ AM_CONDITIONAL(HAVE_DOT, test "x$have_dot" = "xyes")
+dnl Override standard python locations with MacPorts version specific ones
+
@@ -16,5 +16,5 @@
+AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+
#################
- # Check for Cairo
+ # Check for Python (optional, used for introspection unittests)
#################
Deleted: trunk/dports/graphics/gegl-0.3/files/patch-ffmpeg.diff
===================================================================
--- trunk/dports/graphics/gegl-devel/files/patch-ffmpeg.diff 2015-12-01 16:21:13 UTC (rev 143007)
+++ trunk/dports/graphics/gegl-0.3/files/patch-ffmpeg.diff 2015-12-01 22:49:28 UTC (rev 143015)
@@ -1,74 +0,0 @@
---- 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);
Deleted: trunk/dports/graphics/gegl-0.3/files/rename-for-altivec.patch
===================================================================
--- trunk/dports/graphics/gegl-devel/files/rename-for-altivec.patch 2015-12-01 16:21:13 UTC (rev 143007)
+++ trunk/dports/graphics/gegl-0.3/files/rename-for-altivec.patch 2015-12-01 22:49:28 UTC (rev 143015)
@@ -1,152 +0,0 @@
---- 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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/3dd07062/attachment.html>
More information about the macports-changes
mailing list