Revision: 148894 https://trac.macports.org/changeset/148894 Author: mcalhoun@macports.org Date: 2016-05-22 07:26:15 -0700 (Sun, 22 May 2016) Log Message: ----------- openexr, ilmbase: update version to 2.2.0 revbump dependencies since library name changes homepage states that new features "should be available to applications without code modifications" merge openexr and ilmbase into one Portfile since versions now seem linked fixes #44620, #44619, #49965, and #49966; maintainer timeout Modified Paths: -------------- trunk/dports/aqua/qtpfsgui/Portfile trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile trunk/dports/graphics/ImageMagick/Portfile trunk/dports/graphics/OpenSceneGraph/Portfile trunk/dports/graphics/OpenSceneGraph-devel/Portfile trunk/dports/graphics/ctlang/Portfile trunk/dports/graphics/darktable/Portfile trunk/dports/graphics/enblend/Portfile trunk/dports/graphics/exact-image/Portfile trunk/dports/graphics/field3d/Portfile trunk/dports/graphics/gegl/Portfile trunk/dports/graphics/gegl-0.3/Portfile trunk/dports/graphics/gegl-devel/Portfile trunk/dports/graphics/hugin-app/Portfile trunk/dports/graphics/opencv/Portfile trunk/dports/graphics/openexr/Portfile trunk/dports/graphics/povray/Portfile trunk/dports/graphics/synfig/Portfile trunk/dports/graphics/vigra/Portfile trunk/dports/graphics/vips/Portfile trunk/dports/kde/kde4-runtime/Portfile trunk/dports/kde/kdelibs4/Portfile trunk/dports/science/gmic/Portfile Added Paths: ----------- trunk/dports/graphics/openexr/files/patch-IlmImf-Makefile.diff Removed Paths: ------------- trunk/dports/graphics/ilmbase/ trunk/dports/graphics/openexr/files/patch-configure Modified: trunk/dports/aqua/qtpfsgui/Portfile =================================================================== --- trunk/dports/aqua/qtpfsgui/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/aqua/qtpfsgui/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -6,7 +6,7 @@ name qtpfsgui version 1.9.3 -revision 5 +revision 6 categories aqua graphics license GPL-2+ maintainers nomaintainer Modified: trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile =================================================================== --- trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -11,6 +11,7 @@ name gstreamer1-gst-plugins-bad set my_name gst-plugins-bad version 1.8.1 +revision 1 description A set of plug-ins for GStreamer that need more quality. long_description GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par compared \ to the rest. They might be close to being good quality, but they're missing \ Modified: trunk/dports/graphics/ImageMagick/Portfile =================================================================== --- trunk/dports/graphics/ImageMagick/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/ImageMagick/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -8,6 +8,7 @@ name ImageMagick version 6.9.4-1 +revision 1 set reasonable_version [lindex [split ${version} -] 0] homepage http://www.imagemagick.org/ categories graphics devel Modified: trunk/dports/graphics/OpenSceneGraph/Portfile =================================================================== --- trunk/dports/graphics/OpenSceneGraph/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/OpenSceneGraph/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -9,7 +9,7 @@ name OpenSceneGraph conflicts OpenSceneGraph-devel version 3.4.0 -revision 3 +revision 4 platforms darwin categories graphics maintainers nomaintainer Modified: trunk/dports/graphics/OpenSceneGraph-devel/Portfile =================================================================== --- trunk/dports/graphics/OpenSceneGraph-devel/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/OpenSceneGraph-devel/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -12,7 +12,7 @@ github.setup openscenegraph OpenSceneGraph ${git_commit} name OpenSceneGraph-devel version 3.5.2-${git_date} -revision 2 +revision 3 conflicts OpenSceneGraph platforms darwin categories graphics Modified: trunk/dports/graphics/ctlang/Portfile =================================================================== --- trunk/dports/graphics/ctlang/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/ctlang/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -6,7 +6,7 @@ PortGroup cmake 1.0 github.setup ampas CTL 1.5.2 ctl- -revision 1 +revision 2 name ctlang categories graphics lang # the license is a GPL incompatible BSD Variant Modified: trunk/dports/graphics/darktable/Portfile =================================================================== --- trunk/dports/graphics/darktable/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/darktable/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -6,7 +6,7 @@ name darktable version 1.1.2 -revision 5 +revision 6 set branch [join [lrange [split ${version} .] 0 1] .] categories graphics platforms darwin Modified: trunk/dports/graphics/enblend/Portfile =================================================================== --- trunk/dports/graphics/enblend/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/enblend/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -4,7 +4,7 @@ name enblend version 4.1.3 -revision 2 +revision 3 set branch [join [lrange [split ${version} .] 0 1] .] categories graphics maintainers gmail.com:hvdwolf Modified: trunk/dports/graphics/exact-image/Portfile =================================================================== --- trunk/dports/graphics/exact-image/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/exact-image/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -4,7 +4,7 @@ name exact-image version 0.8.7 -revision 1 +revision 2 categories graphics license GPL-2 maintainers tobias-elze.de:macports openmaintainer Modified: trunk/dports/graphics/field3d/Portfile =================================================================== --- trunk/dports/graphics/field3d/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/field3d/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -6,7 +6,7 @@ github.setup imageworks Field3D 1.3.2 v name field3d -revision 9 +revision 10 categories graphics maintainers blair license BSD Modified: trunk/dports/graphics/gegl/Portfile =================================================================== --- trunk/dports/graphics/gegl/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/gegl/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -8,7 +8,7 @@ name gegl conflicts gegl-devel version 0.2.0 -revision 18 +revision 19 license {GPL-3+ LGPL-3+} set branch [join [lrange [split ${version} .] 0 1] .] categories graphics Modified: trunk/dports/graphics/gegl-0.3/Portfile =================================================================== --- trunk/dports/graphics/gegl-0.3/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/gegl-0.3/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -9,7 +9,7 @@ name gegl-0.3 set gname gegl version 0.3.6 -revision 3 +revision 4 set branch [join [lrange [split ${version} .] 0 1] .] conflicts gegl-devel license {GPL-3+ LGPL-3+} Modified: trunk/dports/graphics/gegl-devel/Portfile =================================================================== --- trunk/dports/graphics/gegl-devel/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/gegl-devel/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -12,6 +12,7 @@ set git_commit 734a53526bb90b37370ee01eb28c1747590d6ebf set git_date 20160515 version 0.3.7-${git_date} +revision 1 license {GPL-3+ LGPL-3+} categories graphics maintainers devans Modified: trunk/dports/graphics/hugin-app/Portfile =================================================================== --- trunk/dports/graphics/hugin-app/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/hugin-app/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -11,7 +11,7 @@ name hugin-app version 2016.0.0 -revision 1 +revision 2 set branch [join [lrange [split ${version} .] 0 1] .] categories graphics maintainers nomaintainer Modified: trunk/dports/graphics/opencv/Portfile =================================================================== --- trunk/dports/graphics/opencv/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/opencv/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -7,7 +7,7 @@ name opencv version 3.1.0 -revision 2 +revision 3 categories graphics science platforms darwin license BSD Modified: trunk/dports/graphics/openexr/Portfile =================================================================== --- trunk/dports/graphics/openexr/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/openexr/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -1,9 +1,10 @@ +# -*- 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 - + name openexr -version 1.7.0 +version 2.2.0 categories graphics license BSD maintainers blair @@ -11,24 +12,36 @@ long_description \ OpenEXR is a high dynamic-range (HDR) image file format developed \ by Industrial Light & Magic for use in computer imaging applications. -homepage http://www.openexr.org +homepage http://www.openexr.com platforms darwin master_sites http://savannah.nongnu.org/download/openexr -checksums md5 27113284f7d26a58f853c346e0851d7a \ - sha1 91d0d4e69f06de956ec7e0710fc58ec0d4c4dc2b \ - rmd160 410ae4490988067cc80324e776b52ae6a261f157 +checksums rmd160 a825ed42e731da3bc39f25ce2a310712a5b0f956 \ + sha256 36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231 -depends_build port:libtool -depends_lib port:ilmbase +if {${subport} ne "ilmbase"} { + depends_build-append port:pkgconfig +} -patchfiles patch-configure +if {${subport} eq ${name}} { + depends_lib-append port:ilmbase -configure.args --mandir=${prefix}/share/man \ - --infodir=${prefix}/share/info + # ImfCompressor.h is included in other header files + # see #49965 + # see also https://lists.nongnu.org/archive/html/openexr-devel/2013-06/msg00001.html + patchfiles \ + patch-IlmImf-Makefile.diff +} -post-configure { - copy -force ${prefix}/bin/glibtool ${worksrcpath}/libtool +subport ilmbase { + distname ilmbase-${version} + checksums \ + rmd160 b1adb0c96eff6b3554ddaf8f8bafe2cba8c114e3 \ + sha256 ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7 } test.run yes test.target check + +livecheck.type regex +livecheck.url ${homepage}/downloads.html +livecheck.regex ${name}-(\\d+(?:\\.\\d+)*) Added: trunk/dports/graphics/openexr/files/patch-IlmImf-Makefile.diff =================================================================== --- trunk/dports/graphics/openexr/files/patch-IlmImf-Makefile.diff (rev 0) +++ trunk/dports/graphics/openexr/files/patch-IlmImf-Makefile.diff 2016-05-22 14:26:15 UTC (rev 148894) @@ -0,0 +1,40 @@ +--- IlmImf/Makefile.am.orig 2016-01-27 22:22:38.000000000 +0100 ++++ IlmImf/Makefile.am 2016-01-27 22:26:22.000000000 +0100 +@@ -136,6 +136,7 @@ + ImfTiledOutputFile.h ImfTiledRgbaFile.h \ + ImfRgbaYca.h \ + ImfTestFile.h ImfThreading.h \ ++ ImfCompressor.h \ + ImfB44Compressor.h ImfStringVectorAttribute.h \ + ImfMultiView.h \ + ImfAcesFile.h \ +@@ -164,8 +165,7 @@ + ImfDeepImageState.h \ + ImfDeepImageStateAttribute.h + +-noinst_HEADERS = ImfCompressor.h \ +- ImfRleCompressor.h \ ++noinst_HEADERS = ImfRleCompressor.h \ + ImfZipCompressor.h \ + ImfPizCompressor.h \ + ImfDwaCompressor.h \ +--- IlmImf/Makefile.in.orig 2016-01-27 22:22:44.000000000 +0100 ++++ IlmImf/Makefile.in 2016-01-27 22:26:26.000000000 +0100 +@@ -409,6 +409,7 @@ + ImfTiledOutputFile.h ImfTiledRgbaFile.h \ + ImfRgbaYca.h \ + ImfTestFile.h ImfThreading.h \ ++ ImfCompressor.h \ + ImfB44Compressor.h ImfStringVectorAttribute.h \ + ImfMultiView.h \ + ImfAcesFile.h \ +@@ -437,8 +438,7 @@ + ImfDeepImageState.h \ + ImfDeepImageStateAttribute.h + +-noinst_HEADERS = ImfCompressor.h \ +- ImfRleCompressor.h \ ++noinst_HEADERS = ImfRleCompressor.h \ + ImfZipCompressor.h \ + ImfPizCompressor.h \ + ImfDwaCompressor.h \ Deleted: trunk/dports/graphics/openexr/files/patch-configure =================================================================== --- trunk/dports/graphics/openexr/files/patch-configure 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/openexr/files/patch-configure 2016-05-22 14:26:15 UTC (rev 148894) @@ -1,11 +0,0 @@ ---- configure.orig 2009-07-26 14:16:43.000000000 -0700 -+++ configure 2009-07-26 14:16:53.000000000 -0700 -@@ -21504,7 +21504,7 @@ - CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" - fi - -- CXXFLAGS="$CXXFLAGS -Wno-long-double" -+ CXXFLAGS="$CXXFLAGS" - ;; - esac - Modified: trunk/dports/graphics/povray/Portfile =================================================================== --- trunk/dports/graphics/povray/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/povray/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -6,7 +6,7 @@ PortGroup muniversal 1.0 github.setup POV-Ray povray 3.7.0.0 v -revision 1 +revision 2 set branch [join [lrange [split ${version} .] 0 1] .] categories graphics platforms darwin Modified: trunk/dports/graphics/synfig/Portfile =================================================================== --- trunk/dports/graphics/synfig/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/synfig/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -16,7 +16,7 @@ default distname {${subport}-${version}} if {${subport} eq ${name}} { - revision 2 + revision 3 description vector-based 2-D animation package Modified: trunk/dports/graphics/vigra/Portfile =================================================================== --- trunk/dports/graphics/vigra/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/vigra/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -10,7 +10,7 @@ github.setup ukoethe vigra 1-11-0 Version- version [strsed ${github.version} {g/-/./}] -revision 1 +revision 2 categories graphics platforms darwin license MIT Modified: trunk/dports/graphics/vips/Portfile =================================================================== --- trunk/dports/graphics/vips/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/graphics/vips/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -6,6 +6,7 @@ name vips version 8.3.1 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] description VIPS is an image processing library. long_description VIPS is an image processing library. It is good for \ Modified: trunk/dports/kde/kde4-runtime/Portfile =================================================================== --- trunk/dports/kde/kde4-runtime/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/kde/kde4-runtime/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -10,7 +10,7 @@ name kde4-runtime version 4.14.4.20150225 -revision 4 +revision 5 categories kde kde4 maintainers nicos license GPL-2+ LGPL-2.1+ Modified: trunk/dports/kde/kdelibs4/Portfile =================================================================== --- trunk/dports/kde/kdelibs4/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/kde/kdelibs4/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -6,7 +6,7 @@ name kdelibs4 version 4.14.3 -revision 3 +revision 4 categories kde kde4 maintainers nicos license LGPL-2+ GPL-2+ BSD Modified: trunk/dports/science/gmic/Portfile =================================================================== --- trunk/dports/science/gmic/Portfile 2016-05-22 10:52:47 UTC (rev 148893) +++ trunk/dports/science/gmic/Portfile 2016-05-22 14:26:15 UTC (rev 148894) @@ -5,6 +5,7 @@ name gmic version 1.7.0 +revision 1 license CeCILL categories science platforms darwin