View | Details | Raw Unified | Return to bug 236073
Collapse All | Expand All

(-)graphics/enblend/Makefile (-14 / +9 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	enblend
4
PORTNAME=	enblend
5
PORTVERSION=	4.1.4
5
PORTVERSION=	4.2
6
PORTREVISION=	23
7
CATEGORIES=	graphics
6
CATEGORIES=	graphics
8
MASTER_SITES=	SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R}
7
MASTER_SITES=	SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION}
9
DISTNAME=	enblend-enfuse-${PORTVERSION}
8
DISTNAME=	enblend-enfuse-${PORTVERSION}
10
9
11
MAINTAINER=	grog@FreeBSD.org
10
MAINTAINER=	grog@FreeBSD.org
Lines 14-38 Link Here
14
LICENSE=	GPLv2+
13
LICENSE=	GPLv2+
15
LICENSE_FILE=	${WRKSRC}/COPYING
14
LICENSE_FILE=	${WRKSRC}/COPYING
16
15
16
BROKEN_powerpc64=	fails to configure: libvigraimpex is required to compile Enblend
17
17
BUILD_DEPENDS=	help2man:misc/help2man \
18
BUILD_DEPENDS=	help2man:misc/help2man \
18
		openexr>=1.0:graphics/openexr
19
		${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
19
LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
20
LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
20
		libtiff.so:graphics/tiff \
21
		libtiff.so:graphics/tiff \
21
		libboost_filesystem.so:devel/boost-libs \
22
		libvigraimpex.so:graphics/vigra \
22
		libvigraimpex.so:graphics/vigra \
23
		libgsl.so:math/gsl \
23
		libgsl.so:math/gsl \
24
		libIlmImf.so:graphics/openexr \
24
		libpng.so:graphics/png
25
		libpng.so:graphics/png
25
RUN_DEPENDS=	openexr>=1.0:graphics/openexr
26
26
27
BROKEN_powerpc64=	fails to configure: libvigraimpex is required to compile Enblend
27
USES=		compiler:features gmake jpeg localbase pkgconfig
28
28
29
USES=		compiler:features gmake jpeg localbase makeinfo
30
CONFIGURE_ARGS=	--with-boost-filesystem
31
32
USE_GL=		glew glut
33
GNU_CONFIGURE=	yes
29
GNU_CONFIGURE=	yes
34
30
35
INFO=		enfuse enblend
36
PLIST_FILES=	bin/enblend bin/enfuse man/man1/enblend.1.gz man/man1/enfuse.1.gz
31
PLIST_FILES=	bin/enblend bin/enfuse man/man1/enblend.1.gz man/man1/enfuse.1.gz
37
PORTDOCS=	AUTHORS NEWS README
32
PORTDOCS=	AUTHORS NEWS README
38
33
Lines 49-56 Link Here
49
CXXFLAGS+=	-Wno-c++11-extensions
44
CXXFLAGS+=	-Wno-c++11-extensions
50
.endif
45
.endif
51
46
52
post-install:
47
post-patch:
53
	${INSTALL_DATA} ${WRKSRC}/doc/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
48
	@${REINPLACE_CMD} -e '/a LaTeX/d' ${WRKSRC}/configure
54
49
55
post-install-DOCS-on:
50
post-install-DOCS-on:
56
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
51
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
(-)graphics/enblend/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (enblend-enfuse-4.1.4.tar.gz) = 85f6c3506065c05425631d45677a3d84a9c6f31c501a5fa9c730891003e80808
1
TIMESTAMP = 1551167762
2
SIZE (enblend-enfuse-4.1.4.tar.gz) = 881787
2
SHA256 (enblend-enfuse-4.2.tar.gz) = 8703e324939ebd70d76afd350e56800f5ea2c053a040a5f5218b2a1a4300bd48
3
SIZE (enblend-enfuse-4.2.tar.gz) = 777747
(-)graphics/enblend/files/patch-include_vigra__ext_impexalpha.hxx (-57 lines)
Lines 1-57 Link Here
1
# HG changeset patch
2
# User Chris <cspiel@users.sourceforge.net>
3
# Date 1453651551 -3600
4
# Node ID 467a73754dbb0e269f1b515bc2ef6664ab328bfa
5
# Parent  6aec0cc8d22a6fa617f983e676df68d75ffabbcf
6
Fix issue #1537368: Unconditional usage of std::auto_ptr<>
7
in "vigra_ext" code.
8
9
diff -r 6aec0cc8d22a -r 467a73754dbb include/vigra_ext/impexalpha.hxx
10
--- include/vigra_ext/impexalpha.hxx.orig	2015-08-07 14:45:05 UTC
11
+++ include/vigra_ext/impexalpha.hxx
12
@@ -26,6 +26,9 @@
13
 #include <vigra/imageinfo.hxx>
14
 #include <vigra/impex.hxx>
15
 
16
+#ifndef VIGRA_UNIQUE_PTR
17
+#define VIGRA_UNIQUE_PTR std::auto_ptr
18
+#endif
19
 
20
 namespace vigra_ext
21
 {
22
@@ -194,7 +197,7 @@ namespace vigra_ext
23
                          AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
24
                          vigra::VigraTrueType)
25
         {
26
-            std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
27
+            VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
28
 
29
             switch (pixel_t_of_string(decoder->getPixelType()))
30
             {
31
@@ -249,7 +252,7 @@ namespace vigra_ext
32
                          AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
33
                          vigra::VigraFalseType)
34
         {
35
-            std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
36
+            VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
37
 
38
             switch (pixel_t_of_string(decoder->getPixelType()))
39
             {
40
@@ -467,7 +470,7 @@ namespace vigra_ext
41
                          vigra::VigraTrueType)
42
         {
43
             const std::string pixel_type(export_info.getPixelType());
44
-            std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
45
+            VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
46
 
47
             encoder->setPixelType(pixel_type);
48
 
49
@@ -525,7 +528,7 @@ namespace vigra_ext
50
                          vigra::VigraFalseType)
51
         {
52
             const std::string pixel_type(export_info.getPixelType());
53
-            std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
54
+            VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
55
 
56
             encoder->setPixelType(pixel_type);
57
 
(-)graphics/enblend/files/patch-src_filespec.cc (-40 lines)
Lines 1-40 Link Here
1
# HG changeset patch
2
# User Chris <cspiel@users.sourceforge.net>
3
# Date 1455528030 -3600
4
# Node ID 73e6f16de80a94175db61f82ad10d4cd96790e85
5
# Parent  596efbff27a8271a4c20184163e72b5914e334bf
6
Fix issue #1537368 (additional patch): Get rid of `boost::assign::map_list_of'.
7
8
diff -r 596efbff27a8 -r 73e6f16de80a src/filespec.cc
9
--- src/filespec.cc.orig	2015-08-07 14:45:02 UTC
10
+++ src/filespec.cc
11
@@ -37,7 +37,6 @@
12
 #include <cctype>
13
 
14
 #include <boost/algorithm/string/case_conv.hpp>
15
-#include <boost/assign/list_of.hpp>
16
 
17
 #include <vigra/imageinfo.hxx>
18
 
19
@@ -412,17 +411,12 @@ class Globbing
20
 public:
21
     Globbing() : algorithm_name_("literal"), algorithm_(NULL)
22
     {
23
-        installed_algorithms_ =
24
-            boost::assign::map_list_of
25
-            ("literal", MAKE_ALGORITHM(new LiteralGlobbingAlgorithm))
26
-            ("wildcard", MAKE_ALGORITHM(new WildcardGlobbingAlgorithm))
27
-#ifndef _WIN32
28
-            ("shell", MAKE_ALGORITHM(new ShellGlobbingAlgorithm))
29
-#endif
30
-            ;
31
-
32
+        installed_algorithms_["literal"] = MAKE_ALGORITHM(new LiteralGlobbingAlgorithm);
33
+        installed_algorithms_["wildcard"] = MAKE_ALGORITHM(new WildcardGlobbingAlgorithm);
34
         setup_alias("literal", "none");
35
+
36
 #ifndef _WIN32
37
+        installed_algorithms_["shell"] = MAKE_ALGORITHM(new ShellGlobbingAlgorithm);
38
         setup_alias("shell", "sh");
39
 #endif
40
     }

Return to bug 236073