<!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>[113934] trunk/dports/graphics/enblend</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/113934">113934</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2013-11-25 20:30:45 -0800 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>enblend: update to 4.1.2 (#40628) which now compiles with clang; add dependencies on gnuplot (#28021) and gsl which get opportunistically used</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsenblendPortfile">trunk/dports/graphics/enblend/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsenblendfilespatchconfigurediff">trunk/dports/graphics/enblend/files/patch-configure.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsenblendfilespatchconfigureindiff">trunk/dports/graphics/enblend/files/patch-configure.in.diff</a></li>
<li><a href="#trunkdportsgraphicsenblendfilespatchfilenameparseccdiff">trunk/dports/graphics/enblend/files/patch-filenameparse.cc.diff</a></li>
<li><a href="#trunkdportsgraphicsenblendfilespatchlibpng15diff">trunk/dports/graphics/enblend/files/patch-libpng15.diff</a></li>
<li><a href="#trunkdportsgraphicsenblendfilessrc__vigra_impex__Makefileamdiff">trunk/dports/graphics/enblend/files/src__vigra_impex__Makefile.am.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsenblendPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/enblend/Portfile (113933 => 113934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/enblend/Portfile 2013-11-26 02:55:58 UTC (rev 113933)
+++ trunk/dports/graphics/enblend/Portfile 2013-11-26 04:30:45 UTC (rev 113934)
</span><span class="lines">@@ -3,8 +3,8 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name enblend
</span><del>-version 4.0
-revision 8
</del><ins>+version 4.1.2
+set branch [join [lrange [split ${version} .] 0 1] .]
</ins><span class="cx"> categories graphics
</span><span class="cx"> maintainers gmail.com:hvdwolf
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -14,36 +14,35 @@
</span><span class="cx"> with invisible (or very difficult to see) seams. Enfuse is a \
</span><span class="cx"> tool for automatic exposure and contrast blending.
</span><span class="cx"> homepage http://enblend.sourceforge.net/
</span><ins>+master_sites sourceforge:project/enblend/enblend-enfuse/enblend-enfuse-${branch}
</ins><span class="cx"> platforms darwin
</span><del>-master_sites sourceforge:project/enblend/enblend-enfuse/enblend-enfuse-${version}
</del><span class="cx"> distname enblend-enfuse-${version}
</span><del>-worksrcdir ${distname}-753b534c819d
-checksums md5 2e7c950061e0085fd75d94576130250f \
- sha1 34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033 \
- rmd160 9e531b5bf6f7258ef8778c01b456979e0bc04338
</del><span class="cx">
</span><ins>+checksums rmd160 cd739a63cb937e447e673e9a19b43205a22d9448 \
+ sha256 6dc2682d366776ff771fd6c9ae709bcfef0b7b00cac9e620b56d13bf81faaf6e
+
</ins><span class="cx"> depends_build port:pkgconfig port:help2man
</span><span class="cx">
</span><span class="cx"> depends_lib port:boost \
</span><ins>+ port:glew \
+ port:gnuplot \
+ port:gsl \
</ins><span class="cx"> port:jpeg \
</span><del>- port:lcms \
</del><ins>+ port:lcms2 \
</ins><span class="cx"> port:libpng \
</span><span class="cx"> port:libxmi \
</span><span class="cx"> port:mesa \
</span><span class="cx"> port:openexr \
</span><del>- port:freefont-ttf
</del><ins>+ port:freefont-ttf \
+ port:vigra
</ins><span class="cx">
</span><del>-patchfiles patch-libpng15.diff src__vigra_impex__Makefile.am.diff \
- patch-configure.in.diff patch-filenameparse.cc.diff
-# need to regenerate a Makefile.in after patching Makefile.am above
-use_autoreconf yes
-configure.args --mandir=${prefix}/share/man \
- --enable-image-cache=yes \
- --enable-split-doc=no
</del><ins>+patchfiles patch-configure.diff
</ins><span class="cx">
</span><del>-# TODO: Project has buggy C++ code
-# https://trac.macports.org/ticket/31762
-compiler.blacklist *clang*
</del><ins>+configure.args --disable-split-doc \
+ --enable-image-cache \
+ --with-boost-filesystem \
+ --with-gnuplot=${prefix}/bin/gnuplot \
+ --with-openexr
</ins><span class="cx">
</span><span class="cx"> # The build uses vast amounts of memory per job.
</span><span class="cx"> use_parallel_build no
</span><span class="lines">@@ -51,14 +50,8 @@
</span><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} AUTHORS ChangeLog COPYING \
</span><del>- NEWS README VIGRA_LICENSE \
</del><ins>+ NEWS README \
</ins><span class="cx"> ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-platform macosx {
- depends_lib-delete port:mesa
- depends_lib-append port:glew
- configure.args-append --with-apple-opengl-framework --with-glew
-}
-
</del><span class="cx"> livecheck.regex /enblend-enfuse-(\[0-9.\]+)${extract.suffix}
</span></span></pre></div>
<a id="trunkdportsgraphicsenblendfilespatchconfiguredifffromrev113929trunkdportsgraphicsenblendfilespatchconfigureindiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/enblend/files/patch-configure.diff (from rev 113929, trunk/dports/graphics/enblend/files/patch-configure.in.diff) (0 => 113934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/enblend/files/patch-configure.diff (rev 0)
+++ trunk/dports/graphics/enblend/files/patch-configure.diff 2013-11-26 04:30:45 UTC (rev 113934)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- configure.orig 2013-10-07 03:54:58.000000000 -0500
++++ configure 2013-11-25 22:25:24.000000000 -0600
+@@ -8308,7 +8308,7 @@
+
+
+
+-LIBS="-lboost_system $LIBS"
++LIBS="-lboost_system-mt $LIBS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new Boost system library" >&5
+ $as_echo_n "checking for new Boost system library... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -8375,7 +8375,7 @@
+
+ $as_echo "#define HAVE_BOOST_FILESYSTEM 1" >>confdefs.h
+
+- EXTRA_LIBS="-lboost_filesystem ${EXTRA_LIBS}"
++ EXTRA_LIBS="-lboost_filesystem-mt ${EXTRA_LIBS}"
+ else
+ ac_fn_cxx_check_header_mongrel "$LINENO" "boost/filesystem.hpp" "ac_cv_header_boost_filesystem_hpp" "$ac_includes_default"
+ if test "x$ac_cv_header_boost_filesystem_hpp" = xyes; then :
</ins></span></pre></div>
<a id="trunkdportsgraphicsenblendfilespatchconfigureindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/enblend/files/patch-configure.in.diff (113933 => 113934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/enblend/files/patch-configure.in.diff 2013-11-26 02:55:58 UTC (rev 113933)
+++ trunk/dports/graphics/enblend/files/patch-configure.in.diff 2013-11-26 04:30:45 UTC (rev 113934)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>---- configure.in.orig 2012-08-01 18:12:30.000000000 +0200
-+++ configure.in 2012-08-01 18:13:35.000000000 +0200
-@@ -140,6 +140,8 @@
- no_gpu_reason=", because it was disabled"
- fi
-
-+AX_PTHREAD
-+
- # Memory allocation debug support
- AC_MSG_CHECKING([if malloc debugging is wanted])
- AC_ARG_WITH(dmalloc,
-@@ -149,7 +151,7 @@
- AC_MSG_RESULT(yes)
- AC_DEFINE(WITH_DMALLOC, 1,
- [Define if using the dmalloc debugging malloc package])
-- if test x$acx_pthread_ok = xyes; then
-+ if test x$ax_pthread_ok = xyes; then
- LIBS="$LIBS -ldmallocthcxx"
- enable_dmalloc="yes (thread aware)"
- else
-@@ -214,14 +216,14 @@
- [AC_MSG_NOTICE([forcing use of Boost "filesystem" library])
- AC_DEFINE(HAVE_BOOST_FILESYSTEM, 1,
- [Define if you have boost/filesystem.hpp])
-- EXTRA_LIBS="-lboost_filesystem ${EXTRA_LIBS}"],
-+ EXTRA_LIBS="-lboost_filesystem -lboost_system ${EXTRA_LIBS}"],
- [AC_CHECK_HEADER(boost/filesystem.hpp,
- [],
- AC_MSG_NOTICE([Boost "filesystem" header is missing.]))
- if test x$ac_cv_header_boost_filesystem_hpp = xyes; then
- found_boost_filesystem_lib=no
- candidates="-lboost_filesystem"
-- if test x$acx_pthread_ok = xyes; then
-+ if test x$ax_pthread_ok = xyes; then
- candidates="-lboost_filesystem-mt $candidates"
- fi
- if test "x$with_boost_filesystem" != xCHECK \
-@@ -231,20 +233,21 @@
- fi
- LIBS_ORIG=$LIBS
- for x in $candidates; do
-- LIBS="$LIBS_ORIG $x"
-+ y=`echo $x | sed s/boost_filesystem/boost_system/g`
-+ LIBS="$LIBS_ORIG $x $y"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <string>
- #include "boost/filesystem.hpp"
- ]],
- [[
--boost::filesystem::basic_path<std::string, boost::filesystem::path_traits> p("foo/bar/baz.oo");
-+boost::filesystem::path p("foo/bar/baz.oo");
- p.branch_path().string();
- p.leaf();
- basename(p);
- extension(p);
- ]]
- )],
-- [EXTRA_LIBS="$x ${EXTRA_LIBS}"
-+ [EXTRA_LIBS="$x $y ${EXTRA_LIBS}"
- found_boost_filesystem_lib=yes
- AC_MSG_NOTICE([compiling with Boost's generic filename parsing support.])
- break])
</del></span></pre></div>
<a id="trunkdportsgraphicsenblendfilespatchfilenameparseccdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/enblend/files/patch-filenameparse.cc.diff (113933 => 113934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/enblend/files/patch-filenameparse.cc.diff 2013-11-26 02:55:58 UTC (rev 113933)
+++ trunk/dports/graphics/enblend/files/patch-filenameparse.cc.diff 2013-11-26 04:30:45 UTC (rev 113934)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-
-diff -r 152ffb1b6463 -r 6b2244bb400b src/filenameparse.cc
---- src/filenameparse.cc Sat Jan 01 15:41:31 2011 +0100
-+++ src/filenameparse.cc Tue May 03 19:16:30 2011 +0200
-@@ -50,7 +50,13 @@
- #ifdef HAVE_BOOST_FILESYSTEM
- #include <boost/filesystem.hpp>
-
-+#if BOOST_FILESYSTEM_VERSION < 3
- typedef boost::filesystem::basic_path<std::string, boost::filesystem::path_traits> basic_path;
-+#define GETPATHSTRING(x) x
-+#else
-+typedef boost::filesystem::path basic_path;
-+#define GETPATHSTRING(x) (x).string()
-+#endif
- #endif
-
-
-@@ -95,7 +101,7 @@
- {
- #ifdef HAVE_BOOST_FILESYSTEM
- const basic_path path(aFilename);
-- return path.leaf();
-+ return GETPATHSTRING(path.leaf());
- #else
- const std::string::size_type separator = aFilename.rfind(PATH_SEPARATOR);
- return
-@@ -179,7 +185,7 @@
- }
- else
- {
-- directories.push_back(*p);
-+ directories.push_back(GETPATHSTRING(*p));
- }
- }
- basic_path result;
-
-
-
-
</del></span></pre></div>
<a id="trunkdportsgraphicsenblendfilespatchlibpng15diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/enblend/files/patch-libpng15.diff (113933 => 113934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/enblend/files/patch-libpng15.diff 2013-11-26 02:55:58 UTC (rev 113933)
+++ trunk/dports/graphics/enblend/files/patch-libpng15.diff 2013-11-26 04:30:45 UTC (rev 113934)
</span><span class="lines">@@ -1,266 +0,0 @@
</span><del>---- src/vigra_impex/png.cxx.orig 2012-09-05 19:55:15.000000000 +0200
-+++ src/vigra_impex/png.cxx 2012-09-05 19:55:28.000000000 +0200
-@@ -65,10 +65,20 @@
- #include <png.h>
- }
-
-+#define STRINGIFY(m_argument) #m_argument
-+
- #if PNG_LIBPNG_VER < 10201
- #error "please update your libpng to at least 1.2.1"
- #endif
-
-+#if PNG_LIBPNG_VER >= 10400
-+#define PNG_SET_EXPAND_GRAY_1_2_4_TO_8_NAME png_set_expand_gray_1_2_4_to_8
-+#else
-+#define PNG_SET_EXPAND_GRAY_1_2_4_TO_8_NAME png_set_gray_1_2_4_to_8
-+#endif
-+#define PNG_SET_EXPAND_GRAY_1_2_4_TO_8_FUNCTION_NAME STRINGIFY(PNG_SET_EXPAND_GRAY_1_2_4_TO_8_NAME)
-+#define PNG_SET_EXPAND_GRAY_1_2_4_TO_8(m_image) PNG_SET_EXPAND_GRAY_1_2_4_TO_8_NAME(m_image)
-+
- // TODO: per-scanline reading/writing
-
- namespace {
-@@ -81,7 +91,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
- png_error_message = std::string(error_msg);
-- longjmp( png_ptr->jmpbuf, 1 );
-+ longjmp( png_jmpbuf(png_ptr), 1 );
- }
-
- // called on non-fatal errors
-@@ -203,9 +213,9 @@
- // check if the file is a png file
- const unsigned int sig_size = 8;
- png_byte sig[sig_size];
-- std::fread( sig, sig_size, 1, file.get() );
-+ std::size_t readCount = std::fread( sig, sig_size, 1, file.get() );
- const int no_png = png_sig_cmp( sig, 0, sig_size );
-- vigra_precondition( !no_png, "given file is not a png file.");
-+ vigra_precondition( (readCount == 1) && !no_png, "given file is not a png file.");
-
- // create png read struct with user defined handlers
- png = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL,
-@@ -213,7 +223,7 @@
- vigra_postcondition( png != 0, "could not create the read struct." );
-
- // create info struct
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
- }
-@@ -221,14 +231,14 @@
- vigra_postcondition( info != 0, "could not create the info struct." );
-
- // init png i/o
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
- }
- png_init_io( png, file.get() );
-
- // specify that the signature was already read
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
- }
-@@ -244,13 +254,13 @@
- void PngDecoderImpl::init()
- {
- // read all chunks up to the image data
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
- png_read_info( png, info );
-
- // pull over the header fields
- int interlace_method, compression_method, filter_method;
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
- png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
- &interlace_method, &compression_method, &filter_method );
-@@ -264,7 +274,7 @@
-
- // transform palette to rgb
- if ( color_type == PNG_COLOR_TYPE_PALETTE) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
- png_set_palette_to_rgb(png);
- color_type = PNG_COLOR_TYPE_RGB;
-@@ -273,9 +283,9 @@
-
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(png);
-+ if (setjmp(png_jmpbuf(png)))
-+ vigra_postcondition( false, png_error_message.insert(0, "error in " PNG_SET_EXPAND_GRAY_1_2_4_TO_8_FUNCTION_NAME " (): ").c_str());
-+ PNG_SET_EXPAND_GRAY_1_2_4_TO_8(png);
- bit_depth = 8;
- }
-
-@@ -283,7 +293,7 @@
- #if 0
- // strip alpha channel
- if ( color_type & PNG_COLOR_MASK_ALPHA ) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
- png_set_strip_alpha(png);
- color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -325,9 +335,13 @@
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
- char * dummyName;
- int dummyCompType;
-+#if (PNG_LIBPNG_VER < 10500)
- char * profilePtr;
-+#else
-+ png_byte * profilePtr;
-+#endif
- png_uint_32 profileLen;
-- if (info->valid & PNG_INFO_iCCP) {
-+ if (png_get_valid( png, info, PNG_INFO_iCCP )) {
- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
- iccProfilePtr = (unsigned char *) profilePtr;
- iccProfileLength = profileLen;
-@@ -340,7 +354,7 @@
- // image gamma
- double image_gamma = 0.45455;
- if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
- png_get_gAMA( png, info, &image_gamma );
- }
-@@ -349,26 +363,26 @@
- double screen_gamma = 2.2;
-
- // set gamma correction
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
- png_set_gamma( png, screen_gamma, image_gamma );
- #endif
-
- // interlace handling, get number of read passes needed
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
- n_interlace_passes = png_set_interlace_handling(png);
-
- // update png library state to reflect any changes that were made
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
- png_read_update_info( png, info );
-
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
- n_channels = png_get_channels(png, info);
-
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
- rowsize = png_get_rowbytes(png, info);
-
-@@ -378,9 +392,10 @@
-
- void PngDecoderImpl::nextScanline()
- {
-- for (int i=0; i < n_interlace_passes; i++) {
-- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-+ if (setjmp(png_jmpbuf(png)))
-+ vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-+ for (int i=0; i < n_interlace_passes; i++)
-+ {
- png_read_row(png, row_data.begin(), NULL);
- }
- }
-@@ -545,7 +560,7 @@
- vigra_postcondition( png != 0, "could not create the write struct." );
-
- // create info struct
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_write_struct( &png, &info );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
- }
-@@ -556,7 +571,7 @@
- }
-
- // init png i/o
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_write_struct( &png, &info );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
- }
-@@ -571,7 +586,7 @@
- void PngEncoderImpl::finalize()
- {
- // write the IHDR
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
- png_set_IHDR( png, info, width, height, bit_depth, color_type,
- PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -579,7 +594,7 @@
-
- // set resolution
- if (x_resolution > 0 && y_resolution > 0) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
- png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
- (png_uint_32) (y_resolution / 0.0254 + 0.5),
-@@ -588,7 +603,7 @@
-
- // set offset
- if (position.x > 0 && position.y > 0) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
- png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
- }
-@@ -596,13 +611,17 @@
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_WRITE_iCCP_SUPPORTED)
- // set icc profile
- if (iccProfile.size() > 0) {
-- png_set_iCCP(png, info, "icc", 0,
-- (char *)iccProfile.begin(), iccProfile.size());
-+ png_set_iCCP(png, info, (png_charp)("icc"), 0,
-+#if (PNG_LIBPNG_VER < 10500)
-+ (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#else
-+ (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#endif
- }
- #endif
-
- // write the info struct
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
- png_write_info( png, info );
-
-@@ -634,10 +653,10 @@
- }
-
- // write the whole image
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
- png_write_image( png, row_pointers.begin() );
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
- png_write_end(png, info);
- }
</del></span></pre></div>
<a id="trunkdportsgraphicsenblendfilessrc__vigra_impex__Makefileamdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/enblend/files/src__vigra_impex__Makefile.am.diff (113933 => 113934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/enblend/files/src__vigra_impex__Makefile.am.diff 2013-11-26 02:55:58 UTC (rev 113933)
+++ trunk/dports/graphics/enblend/files/src__vigra_impex__Makefile.am.diff 2013-11-26 04:30:45 UTC (rev 113934)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- src/vigra_impex/Makefile.am.orig 2009-12-21 02:32:28.000000000 +1100
-+++ src/vigra_impex/Makefile.am 2012-05-23 02:40:17.000000000 +1000
-@@ -15,6 +15,6 @@
- viff.hxx void_vector.cxx void_vector.hxx exr.cxx \
- exr.hxx
-
--libvigra_impex_a_CXXFLAGS = $(AM_CXXFLAGS) \
-- -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-+libvigra_impex_a_CXXFLAGS = $(AM_CXXFLAGS)
-+libvigra_impex_a_CPPFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
- -I${top_srcdir}/include
</del></span></pre>
</div>
</div>
</body>
</html>