cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update enblend-enfuse to 4.0, with a patch to allow documentation to

Browse Source 
built with in-tree texinfo (it wanted the textdegree macro which wasn't
added until texinfo-4.11).
This commit is contained in:
sthen 2010-07-11 20:09:00 +00:00
parent 531dc884d4
commit f4523c2e9d
13 changed files with 40 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
graphics/enblend-enfuse/Makefile
View File

@ -1,19 +1,17 @@
# $OpenBSD: Makefile,v 1.7 2010/06/16 09:26:28 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2010/07/11 20:09:00 sthen Exp $
VMEM_WARNING = Yes
# and I'm not joking! - don't waste build time on the following arch
# where MAXDSIZ is simply too low to compile this software:
NOT_FOR_ARCHS = m68k m88k sparc vax
# and restrict to -O0 for the largest files, except on selected arch
# (needs approx 1.3GB datasize to build with -O2 on 64-bit gcc4 arch)
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
.if (${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64")
# likely to bump into MAXDSIZ on arch other than the above
MAKE_ENV += CXXNOOPT=-O0
.endif
COMMENT = blend seams in panoramic image mosaics
DISTNAME = enblend-enfuse-3.2
PKGNAME = ${DISTNAME}p1
DISTNAME = enblend-enfuse-4.0
PKGNAME = ${DISTNAME:L}
WRKDIST = ${WRKDIR}/enblend-enfuse-4.0-753b534c819d
CATEGORIES = graphics
HOMEPAGE = http://enblend.sourceforge.net/
@ -26,24 +24,26 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL GLU ICE SM X11 Xi Xmu c jpeg m pthread pthread-stubs xcb \
stdc++ z
WANTLIB = GL GLEW GLU Half ICE Iex IlmImf IlmThread Imath SM X11 Xi Xmu
WANTLIB += boost_filesystem boost_system c glut.>=4 jpeg lcms m png pthread
WANTLIB += stdc++ tiff xmi z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=enblend/}
BUILD_DEPENDS += ::devel/boost
LIB_DEPENDS = GLEW::graphics/glew \
glut.>=4::graphics/freeglut \
Half,Iex,IlmThread,Imath::graphics/ilmbase \
lcms::graphics/lcms \
xmi::graphics/libxmi \
IlmImf::graphics/openexr \
png::graphics/png \
tiff::graphics/tiff
BUILD_DEPENDS = ::print/transfig
LIB_DEPENDS = ::devel/boost \
::graphics/glew \
::graphics/freeglut \
::graphics/ilmbase \
::graphics/lcms \
::graphics/libxmi \
::graphics/openexr \
::graphics/png \
::graphics/tiff
CONFIGURE_STYLE = gnu
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}
USE_GMAKE = Yes
CPPFLAGS += -I${WRKSRC}/src/vigra_impex \
-I${LOCALBASE}/include \

10
graphics/enblend-enfuse/distinfo
View File

@ -1,5 +1,5 @@
MD5 (enblend-enfuse-3.2.tar.gz) = m2669nL1EDxjOlPJcj2Zww==
RMD160 (enblend-enfuse-3.2.tar.gz) = epsAN7ghrChzJ0d9UmZTctCFDbs=
SHA1 (enblend-enfuse-3.2.tar.gz) = 5EIm7GdZ3T5tz0a7NISLZFNq1JU=
SHA256 (enblend-enfuse-3.2.tar.gz) = hONnujEQLlyeQNVdH7RnLj/8iTYMP+JCNTtUX2xzxlM=
SIZE (enblend-enfuse-3.2.tar.gz) = 831504
MD5 (enblend-enfuse-4.0.tar.gz) = LnyVAGHgCF/XXZRXYTAlDw==
RMD160 (enblend-enfuse-4.0.tar.gz) = nlMbW/b3JY74d4wBtFaXngvAQzg=
SHA1 (enblend-enfuse-4.0.tar.gz) = NMOlzhHG7w71INihWjy2qUpWcDM=
SHA256 (enblend-enfuse-4.0.tar.gz) = oSpEwqB4lPJ+HVoWdXKBdalDyJuRwayauszmLwjCU8Q=
SIZE (enblend-enfuse-4.0.tar.gz) = 1046677

12
graphics/enblend-enfuse/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2009/04/19 11:14:37 sthen Exp $
--- configure.orig Sat Oct 25 01:25:26 2008
+++ configure Sat Oct 25 01:25:46 2008
@@ -11378,7 +11378,7 @@ if test "x$enable_debug" = "xyes"; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
- CXXFLAGS="$CXXFLAGS -O3 -ffast-math -DNDEBUG -Wall"
+ CXXFLAGS="$CXXFLAGS -ffast-math -DNDEBUG -Wall"
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi

12
graphics/enblend-enfuse/patches/patch-configure_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2009/04/19 11:14:37 sthen Exp $
--- configure.in.orig Fri Jul 25 00:52:20 2008
+++ configure.in Fri Jul 25 00:52:27 2008
@@ -119,7 +119,7 @@ if test "x$enable_debug" = "xyes"; then
CXXFLAGS="$CXXFLAGS -g -DDEBUG -Wall"
AC_MSG_RESULT(yes)
else
- CXXFLAGS="$CXXFLAGS -O3 -ffast-math -DNDEBUG -Wall"
+ CXXFLAGS="$CXXFLAGS -ffast-math -DNDEBUG -Wall"
AC_MSG_RESULT(no)
fi

14
graphics/enblend-enfuse/patches/patch-doc_enblend_texi
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-doc_enblend_texi,v 1.1.1.1 2009/04/19 11:14:37 sthen Exp $
--- doc/enblend.texi.orig Sat Oct 25 15:10:09 2008
+++ doc/enblend.texi Sat Oct 25 15:11:19 2008
@@ -3,6 +3,10 @@
@c %** start of header
@setfilename enblend.info
@settitle Combining Multiple Images with Enblend
+@dircategory Enblend
+@direntry
+* enblend: (enblend). seamlessly combines overlapping images.
+@end direntry
@c %** end of header

14
graphics/enblend-enfuse/patches/patch-doc_enfuse-focus-stacking_texi
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-doc_enfuse-focus-stacking_texi,v 1.1.1.1 2009/04/19 11:14:37 sthen Exp $
--- doc/enfuse-focus-stacking.texi.orig Sat Oct 25 15:10:34 2008
+++ doc/enfuse-focus-stacking.texi Sat Oct 25 15:11:50 2008
@@ -2,6 +2,10 @@
@c %** start of header
@setfilename enfuse-focus-stacking.info
@settitle Focus Stacking with Enfuse
+@dircategory Enblend
+@direntry
+* Focus Stacking with Enfuse (enfuse-focus-stacking).
+@end direntry
@c %** end of header

14
graphics/enblend-enfuse/patches/patch-doc_enfuse_texi
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-doc_enfuse_texi,v 1.1.1.1 2009/04/19 11:14:37 sthen Exp $
--- doc/enfuse.texi.orig Sat Oct 25 15:10:21 2008
+++ doc/enfuse.texi Sat Oct 25 15:12:01 2008
@@ -3,6 +3,10 @@
@c %** start of header
@setfilename enfuse.info
@settitle Fusing Multiple Images with Enfuse
+@dircategory Enblend
+@direntry
+* enfuse: (enfuse). combines overlapping images into one with good exposure and focus.
+@end direntry
@c %** end of header

12
graphics/enblend-enfuse/patches/patch-src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2009/04/21 09:20:26 sthen Exp $
--- src/Makefile.in.orig Tue Sep 9 05:07:35 2008
+++ src/Makefile.in Tue Apr 21 10:11:46 2009
@@ -301,7 +301,7 @@ distclean-compile:
$OpenBSD: patch-src_Makefile_in,v 1.2 2010/07/11 20:09:00 sthen Exp $
--- src/Makefile.in.orig Wed Nov 25 09:16:30 2009
+++ src/Makefile.in Fri Nov 27 23:55:41 2009
@@ -375,7 +375,7 @@ distclean-compile:
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
enblend-enblend.o: enblend.cc
@ -10,8 +10,8 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 2009/04/21 09:20:26 sthen Exp $
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/enblend-enblend.Tpo $(DEPDIR)/enblend-enblend.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='enblend.cc' object='enblend-enblend.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -329,7 +329,7 @@ enblend-gpu.obj: gpu.cc
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enblend_CXXFLAGS) $(CXXFLAGS) -c -o enblend-gpu.obj `if test -f 'gpu.cc'; then $(CYGPATH_W) 'gpu.cc'; else $(CYGPATH_W) '$(srcdir)/gpu.cc'; fi`
@@ -473,7 +473,7 @@ enblend-tiff_message.obj: tiff_message.cc
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enblend_CXXFLAGS) $(CXXFLAGS) -c -o enblend-tiff_message.obj `if test -f 'tiff_message.cc'; then $(CYGPATH_W) 'tiff_message.cc'; else $(CYGPATH_W) '$(srcdir)/tiff_message.cc'; fi`
enfuse-enfuse.o: enfuse.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enfuse_CXXFLAGS) $(CXXFLAGS) -MT enfuse-enfuse.o -MD -MP -MF $(DEPDIR)/enfuse-enfuse.Tpo -c -o enfuse-enfuse.o `test -f 'enfuse.cc' || echo '$(srcdir)/'`enfuse.cc

49
graphics/enblend-enfuse/patches/patch-src_assemble_h
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-src_assemble_h,v 1.1.1.1 2009/04/19 11:14:37 sthen Exp $
--- src/assemble.h.orig Sat Mar 8 23:16:23 2008
+++ src/assemble.h Fri Apr 17 20:18:16 2009
@@ -81,14 +81,18 @@ void checkpoint(pair<ImageType*, AlphaType*> &p, Image
Threshold<AlphaPixelType, ImagePixelComponentType>, AlphaAccessor>
ThresholdingAccessor;
+ AlphaType* alphaType = p.second;
+ ImagePixelComponentType alphaMaxValue = AlphaTraits<ImagePixelComponentType>::max();
+ ImagePixelComponentType alphaZeroValue = AlphaTraits<ImagePixelComponentType>::zero();
+ AlphaPixelType numericZeroValue = NumericTraits<AlphaPixelType>::zero();
+ Threshold<AlphaPixelType, ImagePixelComponentType> curThreshold =
+ Threshold<AlphaPixelType, ImagePixelComponentType>(numericZeroValue,
+ numericZeroValue,
+ alphaMaxValue,
+ alphaZeroValue);
ThresholdingAccessor ata(
- Threshold<AlphaPixelType, ImagePixelComponentType>(
- NumericTraits<AlphaPixelType>::zero(),
- NumericTraits<AlphaPixelType>::zero(),
- AlphaTraits<ImagePixelComponentType>::max(),
- AlphaTraits<ImagePixelComponentType>::zero()
- ),
- (p.second)->accessor());
+ curThreshold,
+ alphaType->accessor());
try {
exportImageAlpha(srcImageRange(*(p.first)),
@@ -118,12 +122,15 @@ void import(const ImageImportInfo &info,
// Threshold the alpha mask so that all pixels are either contributing
// or not contributing.
+ ImagePixelComponentType imagePixelMaxValue = AlphaTraits<ImagePixelComponentType>::max();
+ AlphaPixelType alphaPixelMaxValue = AlphaTraits<AlphaPixelType>::max();
+ AlphaPixelType alphaPixelZeroValue = AlphaTraits<AlphaPixelType>::zero();
ThresholdingAccessor ata(
Threshold<ImagePixelComponentType, AlphaPixelType>(
- AlphaTraits<ImagePixelComponentType>::max() / 2,
- AlphaTraits<ImagePixelComponentType>::max(),
- AlphaTraits<AlphaPixelType>::zero(),
- AlphaTraits<AlphaPixelType>::max()
+ imagePixelMaxValue / 2,
+ imagePixelMaxValue,
+ alphaPixelZeroValue,
+ alphaPixelMaxValue
),
alpha.second);

8
graphics/enblend-enfuse/patches/patch-src_enblend_cc
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_enblend_cc,v 1.2 2009/05/19 08:41:38 sthen Exp $
$OpenBSD: patch-src_enblend_cc,v 1.3 2010/07/11 20:09:00 sthen Exp $
we don't have fenv.h/fesetround(), but we can set rounding behaviour
this way instead. probably a noop anyway; FP_RN is the default.
--- src/enblend.cc.orig Fri Feb 15 10:18:21 2008
+++ src/enblend.cc Fri Jul 25 00:49:48 2008
@@ -61,8 +61,14 @@ extern "C" {
--- src/enblend.cc.orig Sun Dec 20 15:32:28 2009
+++ src/enblend.cc Wed Feb 10 08:38:35 2010
@@ -50,8 +50,14 @@
extern "C" char *optarg;
extern "C" int optind;

8
graphics/enblend-enfuse/patches/patch-src_enfuse_cc
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_enfuse_cc,v 1.2 2009/05/19 08:41:38 sthen Exp $
$OpenBSD: patch-src_enfuse_cc,v 1.3 2010/07/11 20:09:00 sthen Exp $
we don't have fenv.h/fesetround(), but we can set rounding behaviour
this way instead. probably a noop anyway; FP_RN is the default.
--- src/enfuse.cc.orig Thu Mar 13 20:34:35 2008
+++ src/enfuse.cc Fri Jul 25 00:49:41 2008
@@ -61,8 +61,14 @@ extern "C" {
--- src/enfuse.cc.orig Sun Dec 20 15:32:59 2009
+++ src/enfuse.cc Wed Feb 10 08:38:35 2010
@@ -50,8 +50,14 @@
extern "C" char *optarg;
extern "C" int optind;

33
graphics/enblend-enfuse/patches/patch-src_pyramid_h
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-src_pyramid_h,v 1.1.1.1 2009/04/19 11:14:37 sthen Exp $
--- src/pyramid.h.orig Sat Feb 2 21:30:51 2008
+++ src/pyramid.h Fri Apr 17 20:18:27 2009
@@ -641,7 +641,8 @@ inline void reduce(bool wraparound,
// Main pixels in first row
for (sx = sy, evenX = true, srcx = 0, dstx = 0; srcx < src_w; ++srcx, ++sx.x) {
- SKIPSMImagePixelType icurrent(SKIPSMImagePixelType(sa(sx)));
+ SKIPSMImagePixelType foo = SKIPSMImagePixelType(sa(sx));
+ SKIPSMImagePixelType icurrent(foo);
if (evenX) {
isc0[dstx] = isr1 + IMUL6(isr0) + isrp + icurrent;
isc1[dstx] = IMUL5(isc0[dstx]);
@@ -708,7 +709,8 @@ inline void reduce(bool wraparound,
// Main entries in row
for (evenX = false, srcx = 1, dstx = 0; srcx < src_w; ++srcx, ++sx.x) {
- SKIPSMImagePixelType icurrent(SKIPSMImagePixelType(sa(sx)));
+ SKIPSMImagePixelType foo = SKIPSMImagePixelType(sa(sx));
+ SKIPSMImagePixelType icurrent(foo);
if (evenX) {
SKIPSMImagePixelType ip = isc1[dstx] + IMUL6(isc0[dstx]) + iscp[dstx];
isc1[dstx] = isc0[dstx] + iscp[dstx];
@@ -770,7 +772,8 @@ inline void reduce(bool wraparound,
// Main entries in odd-numbered row
for (evenX = false, srcx = 1, dstx = 0; srcx < src_w; ++srcx, ++sx.x) {
- SKIPSMImagePixelType icurrent(SKIPSMImagePixelType(sa(sx)));
+ SKIPSMImagePixelType foo = SKIPSMImagePixelType(sa(sx));
+ SKIPSMImagePixelType icurrent(foo);
if (evenX) {
iscp[dstx] = (isr1 + IMUL6(isr0) + isrp + icurrent) * 4;
isr1 = isr0 + isrp;

3
graphics/enblend-enfuse/pkg/PLIST
View File

@ -1,8 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/04/19 11:14:37 sthen Exp $
@comment $OpenBSD: PLIST,v 1.2 2010/07/11 20:09:00 sthen Exp $
@bin bin/enblend
@bin bin/enfuse
@info info/enblend.info
@info info/enfuse-focus-stacking.info
@info info/enfuse.info
@man man/man1/enblend.1
@man man/man1/enfuse.1