From b6954efc183470804f52d8ded8609ee0c56e3d9f Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 7 Apr 2016 09:38:43 +0000 Subject: Changes 4.2: - All deprecated options and features of version 4.1 have been removed. - Enblend and Enfuse support layer (aka "page", aka "frame") selection in of multi-layer image-files. This includes processing any layers in user-defined order. - Both Enblend and Enfuse can now perform all their pyramidal blending operations in CIELAB (aka L*a*b*, aka L-star) and CIELUV (aka L*u*v*) color spaces, too. See section "New Commandline Options", option `--blend-colorspace'. The previous default, CIECAM for input images with ICC-profile has been changed to CIELUV. The default for RGB images without ICC-profile remains. However, the new default for floating-point image data is to use the RGB-cube, no matter whether the images come with profiles or not. - The new Graph-Cut algorithm is the default primary seam-line generator. - Avoid a division-by-zero in the Annealing Optimizer. - Fix a bug (1356551) in the seam-line vectorization code that was there since 2004. The fix changes the position of almost any coarse-mask seam line vertex by one pixel. - Fix a longstanding quirk, which allowed to load masks into Enblend and Enfuse that were unsuitable for processing. - Fix a bug in the highlight-recovery that caused Enfuse to bail out with the uncaught exception "Minimizer1D::set_bracket: minimum not bracketed". - The OpenMP enabled versions of Enblend and Enfuse benefit from Google's TCMalloc library. - Several exposure weight functions were added to Enfuse. The choice is now up to the user. The default still is the Gauss function as in all Enfuse versions before. --- graphics/enblend-enfuse/Makefile | 12 ++---- graphics/enblend-enfuse/distinfo | 15 +++---- graphics/enblend-enfuse/patches/patch-ab | 26 ------------ graphics/enblend-enfuse/patches/patch-ac | 26 ------------ graphics/enblend-enfuse/patches/patch-ad | 36 ----------------- graphics/enblend-enfuse/patches/patch-configure | 51 ++++++++++++++++++++++++ graphics/enblend-enfuse/patches/patch-src_gpu.cc | 15 ------- 7 files changed, 60 insertions(+), 121 deletions(-) delete mode 100644 graphics/enblend-enfuse/patches/patch-ab delete mode 100644 graphics/enblend-enfuse/patches/patch-ac delete mode 100644 graphics/enblend-enfuse/patches/patch-ad create mode 100644 graphics/enblend-enfuse/patches/patch-configure delete mode 100644 graphics/enblend-enfuse/patches/patch-src_gpu.cc (limited to 'graphics/enblend-enfuse') diff --git a/graphics/enblend-enfuse/Makefile b/graphics/enblend-enfuse/Makefile index 380b509dfe1..e1f6b92d51a 100644 --- a/graphics/enblend-enfuse/Makefile +++ b/graphics/enblend-enfuse/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.36 2016/01/03 20:45:23 markd Exp $ +# $NetBSD: Makefile,v 1.37 2016/04/07 09:38:43 adam Exp $ -DISTNAME= enblend-enfuse-4.1.4 +DISTNAME= enblend-enfuse-4.2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enblend/} @@ -13,23 +13,17 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake perl:build pkg-config GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-boost-filesystem CONFIGURE_ENV+= GNUPLOT=false BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= --enable-openmp -CONFIGURE_ARGS+= --with-apple-opengl-framework -.else +.if ${OPSYS} != "Darwin" CONFIGURE_ARGS+= --with-x .include "../../graphics/glut/buildlink3.mk" .endif -LIBS+= -lboost_system - .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" .include "../../graphics/glew/buildlink3.mk" diff --git a/graphics/enblend-enfuse/distinfo b/graphics/enblend-enfuse/distinfo index 2b22291775c..3128d463519 100644 --- a/graphics/enblend-enfuse/distinfo +++ b/graphics/enblend-enfuse/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.15 2015/11/03 21:33:56 agc Exp $ +$NetBSD: distinfo,v 1.16 2016/04/07 09:38:43 adam Exp $ -SHA1 (enblend-enfuse-4.1.4.tar.gz) = ae23b3a58f905da1d5fb349cbcc07f46d406db2d -RMD160 (enblend-enfuse-4.1.4.tar.gz) = e7db0f7888edd35478872878ec1992625f5efbfd -SHA512 (enblend-enfuse-4.1.4.tar.gz) = f04bf4a335f96bc95e9a39183665c435f1e20010c39cb305f84d569b0a42bfa25f07d37f21b67a910c5596cd2007b3df63a25d1801d8beccaf722852a992c82c -Size (enblend-enfuse-4.1.4.tar.gz) = 881787 bytes -SHA1 (patch-ab) = 7e641cf3806fe1b5e797085014a54b2fc16c6613 -SHA1 (patch-ac) = 883137e4e4920760d375d3dea27085c265ccf117 -SHA1 (patch-ad) = af20f116736699b10868385822163fe719dfc1d9 -SHA1 (patch-src_gpu.cc) = 8a126e995a4f993e940814f647f1b961037470cf +SHA1 (enblend-enfuse-4.2.tar.gz) = bc03ddb0066a0682cc8c08fa2529e602d671735a +RMD160 (enblend-enfuse-4.2.tar.gz) = 997a849a39da3f367b666c6d0d344059d97738d7 +SHA512 (enblend-enfuse-4.2.tar.gz) = 15d6e3bfbca94cc0f74741d6683ac211050877a4cddfd6b28872f1c159f74c2a0e5ef19f8a5f1ec554511e2c4cc1ec4e25d59d361e1e4bc6d3cad2720cd7c582 +Size (enblend-enfuse-4.2.tar.gz) = 777747 bytes +SHA1 (patch-configure) = 8a76cd08785909b358fbd8a8f6e374bd669cac37 diff --git a/graphics/enblend-enfuse/patches/patch-ab b/graphics/enblend-enfuse/patches/patch-ab deleted file mode 100644 index a9a9f574279..00000000000 --- a/graphics/enblend-enfuse/patches/patch-ab +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2012/12/09 00:11:42 adam Exp $ - ---- src/enfuse.cc.orig 2012-12-08 08:23:59.000000000 +0000 -+++ src/enfuse.cc -@@ -51,8 +51,12 @@ extern "C" char *optarg; - extern "C" int optind; - - #ifndef _MSC_VER -+#ifdef __NetBSD__ -+//#include -+#else - #include - #endif -+#endif - - #include - #include -@@ -1663,6 +1667,8 @@ int main(int argc, char** argv) - // functions in float_cast.h will work properly. - // See changes in vigra numerictraits.hxx - _controlfp(_RC_NEAR, _MCW_RC); -+#elif defined(__NetBSD__) -+ //fpsetround(FE_TONEAREST); - #else - fesetround(FE_TONEAREST); - #endif diff --git a/graphics/enblend-enfuse/patches/patch-ac b/graphics/enblend-enfuse/patches/patch-ac deleted file mode 100644 index a0825d7d5cb..00000000000 --- a/graphics/enblend-enfuse/patches/patch-ac +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2012/12/09 00:11:42 adam Exp $ - ---- src/enblend.cc.orig 2012-12-08 08:23:59.000000000 +0000 -+++ src/enblend.cc -@@ -51,8 +51,12 @@ extern "C" char *optarg; - extern "C" int optind; - - #ifndef _MSC_VER -+#ifdef __NetBSD__ -+//#include -+#else - #include - #endif -+#endif - - #include - #include -@@ -1657,6 +1661,8 @@ int main(int argc, char** argv) - // functions in float_cast.h will work properly. - // See changes in vigra numerictraits.hxx - _controlfp(_RC_NEAR, _MCW_RC); -+#elif defined(__NetBSD__) -+ //fpsetround(FE_TONEAREST); - #else - fesetround(FE_TONEAREST); - #endif diff --git a/graphics/enblend-enfuse/patches/patch-ad b/graphics/enblend-enfuse/patches/patch-ad deleted file mode 100644 index 99fd6f3874c..00000000000 --- a/graphics/enblend-enfuse/patches/patch-ad +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2014/11/07 19:39:34 adam Exp $ - ---- configure.orig 2014-03-19 07:27:50.000000000 +0000 -+++ configure -@@ -10218,7 +10218,7 @@ if test "$enable_debug" = yes; then - $as_echo "yes" >&6; } - enable_debug=yes - else -- CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -Wall" -+ CXXFLAGS="$CXXFLAGS -DNDEBUG -Wall" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - enable_debug=no -@@ -10271,7 +10271,7 @@ else - ax_cv_cxx_openmp=unknown - # Flags to try: -fopenmp (gcc), -openmp (icc), -mp (SGI & PGI), - # -xopenmp (Sun), -omp (Tru64), -qsmp=omp (AIX), none --ax_openmp_flags="-fopenmp -openmp -mp -xopenmp -omp -qsmp=omp none" -+ax_openmp_flags="-fopenmp -fopenmp=libiomp5 -openmp -mp -xopenmp -omp -qsmp=omp none" - if test "x$OPENMP_CXXFLAGS" != x; then - ax_openmp_flags="$OPENMP_CXXFLAGS $ax_openmp_flags" - fi -@@ -10289,11 +10289,11 @@ for ax_openmp_flag in $ax_openmp_flags; - #ifdef __cplusplus - extern "C" - #endif --char omp_set_num_threads (); -+#include - int - main () - { --return omp_set_num_threads (); -+return omp_get_num_threads (); - ; - return 0; - } diff --git a/graphics/enblend-enfuse/patches/patch-configure b/graphics/enblend-enfuse/patches/patch-configure new file mode 100644 index 00000000000..76d81ff0267 --- /dev/null +++ b/graphics/enblend-enfuse/patches/patch-configure @@ -0,0 +1,51 @@ +$NetBSD: patch-configure,v 1.1 2016/04/07 09:38:43 adam Exp $ + +Do not fail for missing LaTeX - it is not needed anyway. +Do not force optimisation flags. +Fix OpenMP detection. + +--- configure.orig 2016-03-28 14:51:58.000000000 +0000 ++++ configure +@@ -8716,10 +8716,6 @@ done + test -n "$latex" || latex="no" + + export latex; +-if test $latex = "no" ; +-then +- as_fn_error $? "Unable to find a LaTeX application" "$LINENO" 5; +-fi + + + +@@ -11710,7 +11706,7 @@ if test "$enable_debug" = yes; then + $as_echo "yes" >&6; } + enable_debug=yes + else +- CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG" ++ CXXFLAGS="$CXXFLAGS -DNDEBUG" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + enable_debug=no +@@ -11763,7 +11759,7 @@ else + ax_cv_cxx_openmp=unknown + # Flags to try: -fopenmp (gcc), -openmp (icc), -mp (SGI & PGI), + # -xopenmp (Sun), -omp (Tru64), -qsmp=omp (AIX), none +-ax_openmp_flags="-fopenmp -openmp -mp -xopenmp -omp -qsmp=omp none" ++ax_openmp_flags="-fopenmp -fopenmp=libiomp5 -openmp -mp -xopenmp -omp -qsmp=omp none" + if test "x$OPENMP_CXXFLAGS" != x; then + ax_openmp_flags="$OPENMP_CXXFLAGS $ax_openmp_flags" + fi +@@ -11781,11 +11777,11 @@ for ax_openmp_flag in $ax_openmp_flags; + #ifdef __cplusplus + extern "C" + #endif +-char omp_set_num_threads (); ++#include + int + main () + { +-return omp_set_num_threads (); ++return omp_get_num_threads (); + ; + return 0; + } diff --git a/graphics/enblend-enfuse/patches/patch-src_gpu.cc b/graphics/enblend-enfuse/patches/patch-src_gpu.cc deleted file mode 100644 index 095b4aa563e..00000000000 --- a/graphics/enblend-enfuse/patches/patch-src_gpu.cc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_gpu.cc,v 1.1 2012/12/09 00:11:42 adam Exp $ - -Fix type mismatch. - ---- src/gpu.cc.orig 2012-12-08 23:53:14.000000000 +0000 -+++ src/gpu.cc -@@ -155,7 +155,7 @@ CGLContextObj cgl_init() - }; - CGLPixelFormatObj pixel_format = NULL; - CGLContextObj cgl_context = NULL; -- long int pixel_formats = 0L; -+ GLint pixel_formats = 0; - CGLError cgl_error; - - -- cgit v1.2.3