[106055] trunk/dports/graphics/synfig

[ryandesign at macports.org]

Revision: 106055
          https://trac.macports.org/changeset/106055
Author:   ryandesign at macports.org
Date:     2013-05-13 19:42:53 -0700 (Mon, 13 May 2013)
Log Message:
-----------
synfig: revbump and patch to build with new ImageMagick library version

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

Added Paths:
-----------
    trunk/dports/graphics/synfig/files/
    trunk/dports/graphics/synfig/files/patch-MagickCore.diff

Modified: trunk/dports/graphics/synfig/Portfile
===================================================================
--- trunk/dports/graphics/synfig/Portfile	2013-05-14 02:35:37 UTC (rev 106054)
+++ trunk/dports/graphics/synfig/Portfile	2013-05-14 02:42:53 UTC (rev 106055)
@@ -5,7 +5,7 @@
 
 name                synfig
 version             0.64.0
-revision            3
+revision            4
 categories          graphics
 platforms           darwin
 maintainers         ryandesign
@@ -44,6 +44,15 @@
                     port:openexr \
                     path:lib/pkgconfig/pango.pc:pango
 
+patchfiles          patch-MagickCore.diff
+
+use_autoreconf      yes
+
+pre-configure {
+    # http://www.synfig.org/issues/thebuggenie/synfig/issues/71
+    configure.cppflags-append [exec ${prefix}/bin/Magick++-config --cppflags]
+}
+
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}
     xinstall -d ${docdir}

Added: trunk/dports/graphics/synfig/files/patch-MagickCore.diff
===================================================================
--- trunk/dports/graphics/synfig/files/patch-MagickCore.diff	                        (rev 0)
+++ trunk/dports/graphics/synfig/files/patch-MagickCore.diff	2013-05-14 02:42:53 UTC (rev 106055)
@@ -0,0 +1,72 @@
+http://www.synfig.org/issues/thebuggenie/synfig/issues/56
+synfig does not build with a Magick using MagickCore
+--- configure.ac.orig	2012-04-09 14:35:05.000000000 -0500
++++ configure.ac	2013-05-05 03:46:55.000000000 -0500
+@@ -160,11 +160,11 @@
+ ])
+ if test $with_magickpp = "yes" ; then {
+   AC_CHECK_HEADER([Magick++.h],[
+-  	MAGICKPP_LIBS="-lMagick++"
++  	MAGICKPP_LIBS="-lMagick++-6.Q16 -lMagickWand-6.Q16 -lMagickCore-6.Q16"
+   	AC_DEFINE(HAVE_MAGICKPP,[], [ Define if Magick++ library is available ] )
+   	AC_SUBST(MAGICKPP_LIBS)
+   	AM_CONDITIONAL(HAVE_LIBMAGICKPP,true)
+-	AC_CHECK_LIB(Magick,OptimizeImageTransparency,[
++	AC_CHECK_LIB(MagickCore-6.Q16,OptimizeImageTransparency,[
+ 		AC_DEFINE(HAVE_MAGICK_OPTIMIZE,[], [ Define if Magick++ defines OptimizeImageTransparency() ] )
+ 		AM_CONDITIONAL(HAVE_MAGICK_OPTIMIZE,true)
+ 	],[
+--- src/modules/mod_magickpp/trgt_magickpp.cpp.orig	2012-04-09 14:35:05.000000000 -0500
++++ src/modules/mod_magickpp/trgt_magickpp.cpp	2013-05-05 03:15:28.000000000 -0500
+@@ -53,16 +53,16 @@
+ /* === M E T H O D S ======================================================= */
+ 
+ template <class Container>
+-MagickLib::Image* copy_image_list(Container& container)
++MagickCore::Image* copy_image_list(Container& container)
+ {
+ 	typedef typename Container::iterator Iter;
+-	MagickLib::Image* previous = 0;
+-	MagickLib::Image* first = NULL;
+-	MagickLib::ExceptionInfo exceptionInfo;
+-	MagickLib::GetExceptionInfo(&exceptionInfo);
++	MagickCore::Image* previous = 0;
++	MagickCore::Image* first = NULL;
++	MagickCore::ExceptionInfo exceptionInfo;
++	MagickCore::GetExceptionInfo(&exceptionInfo);
+ 	for (Iter iter = container.begin(); iter != container.end(); ++iter)
+ 	{
+-		MagickLib::Image* current;
++		MagickCore::Image* current;
+ 
+ 		try
+ 		{
+@@ -86,8 +86,8 @@
+ 
+ magickpp_trgt::~magickpp_trgt()
+ {
+-	MagickLib::ExceptionInfo exceptionInfo;
+-	MagickLib::GetExceptionInfo(&exceptionInfo);
++	MagickCore::ExceptionInfo exceptionInfo;
++	MagickCore::GetExceptionInfo(&exceptionInfo);
+ 
+ 	try
+ 	{
+@@ -126,7 +126,7 @@
+ 			//   when we destroy our container, the image is re-freed, failing an assertion
+ 
+ 			synfig::info("copying image list");
+-			MagickLib::Image *image_list = copy_image_list(images);
++			MagickCore::Image *image_list = copy_image_list(images);
+ 
+ 			synfig::info("clearing old image list");
+ 			images.clear();
+@@ -176,7 +176,7 @@
+ 			// nothing is moving, we end up with objects disappearing when they shouldn't
+ 
+ 			// linkImages(images.begin(), images.end());
+-			// MagickLib::Image* new_images = DeconstructImages(images.begin()->image(),&exceptionInfo);
++			// MagickCore::Image* new_images = DeconstructImages(images.begin()->image(),&exceptionInfo);
+ 			// unlinkImages(images.begin(), images.end());
+ 			// images.clear();
+ 			// insertImages(&images, new_images);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130513/830b0ee5/attachment.html>