On Mon, 7 Jan 2008, Vasil Dimov wrote:

I intend to upgrade graphics/hugin from 0.6.1 to 0.7.b4.
The beta4 has been available for quite sometime.

It would be nice if you can test the attached patch - that's what I am
going to commit in the next few days, provided there are not any
problems reported. There may be some pkg-plist issues with the current
patch.

Does the new port work for you?

Builds and installs, yes.  Too bad about needing Mono, but whatever.

Does hugin 0.7 beta4 work for you?

Unfortunately, no:

  % hugin
  Panorama obj created
  Segmentation fault (core dumped)

That core dump isn't hugin--no hugin.core. It's some component that I haven't yet located.

This is on 6-STABLE:

FreeBSD speedy.wonkity.com 6.3-PRERELEASE FreeBSD 6.3-PRERELEASE #0: Tue Jan  1 
14:16:24 MST 2008
[EMAIL PROTECTED]:/usr/obj/usr/src/sys/SPEEDY  i386

-Warren Block * Rapid City, South Dakota USA
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile	30 Sep 2007 04:46:53 -0000	1.20
+++ Makefile	7 Jan 2008 20:14:32 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hugin
-PORTVERSION=	0.6.1
-PORTREVISION=	2
+DISTVERSION=	0.7_beta4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,38 +14,59 @@
 MAINTAINER=	[EMAIL PROTECTED]
 COMMENT=	A GUI for Panorama Tools, to stitch panoramic images
 
-BUILD_DEPENDS=	libpano12>=2.8.4:${PORTSDIR}/graphics/libpano12 \
-		vigra-config:${PORTSDIR}/graphics/vigra \
-		zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
+# zip is needed for building the help file
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+LIB_DEPENDS=	pano13:${PORTSDIR}/graphics/libpano13 \
+		tiff:${PORTSDIR}/graphics/tiff \
 		png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg \
-		fftw:${PORTSDIR}/math/fftw \
 		boost_date_time:${PORTSDIR}/devel/boost
-RUN_DEPENDS=	PTOptimizer:${PORTSDIR}/graphics/libpano12 \
-		PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools
+
+OPTIONS=	ENBLEND "enblend for high quality blending" on \
+		AUTOPANOSIFT "autopano-sift for automatic control points" on \
+		PTSTITCHER "PTStitcher for stitching images" on
 
 USE_BZIP2=	yes
 
-USE_AUTOTOOLS=	autoconf:261:env autoheader:261:env aclocal:19:env \
-		automake:19:env libtool:15:env
+USE_AUTOTOOLS=	autoconf:261:env autoheader:261:env aclocal:110:env \
+		automake:110:env libtool:15:env
 
 IS_INTERACTIVE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} WXRC=${WXRC_CMD}
-CONFIGURE_ARGS+=	--with-boost=${LOCALBASE} \
-			--disable-desktop
+CONFIGURE_ARGS+=--with-boost=${LOCALBASE}
+#		--disable-desktop
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_WX=		2.6
+USE_WX=		2.6+
 WX_CONF_ARGS=	absolute
 
+.if defined(WX_UNICODE)
+CONFIGURE_ARGS+=--with-unicode=yes
+.else
+CONFIGURE_ARGS+=--with-unicode=no
+.endif
+
 MAN1=		fulla.1
 
 DOCSDIR=	${PREFIX}/share/hugin/xrc/data
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ENBLEND)
+RUN_DEPENDS+=	enblend:${PORTSDIR}/graphics/enblend
+.endif
+
+.if defined(WITH_AUTOPANOSIFT)
+RUN_DEPENDS+=	autopanog:${PORTSDIR}/graphics/autopano-sift
+.endif
+
+.if defined(WITH_PTSTITCHER)
+RUN_DEPENDS+=	PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools
+.endif
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
@@ -56,9 +76,6 @@
 .endif
 
 pre-configure:
-	cd ${WRKSRC} && \
-	${SETENV} ${AUTOTOOLS_ENV} \
-	ACLOCAL="${ACLOCAL} -I ${LOCALBASE}/share/aclocal" \
-	./bootstrap
+	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./bootstrap
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	19 Feb 2007 09:47:45 -0000	1.5
+++ distinfo	7 Jan 2008 20:14:32 -0000
@@ -1,3 +1,3 @@
-MD5 (hugin-0.6.1.tar.bz2) = 46bc3136d42acbabab837128ff471507
-SHA256 (hugin-0.6.1.tar.bz2) = 18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7
-SIZE (hugin-0.6.1.tar.bz2) = 2151921
+MD5 (hugin-0.7_beta4.tar.bz2) = 28b69d85ae06a22fe9514f7f77e6dddb
+SHA256 (hugin-0.7_beta4.tar.bz2) = 4527d40ae56a6ef67583a350ab67505e86054c0b297b2d18cf892c2751cabcfd
+SIZE (hugin-0.7_beta4.tar.bz2) = 2319243
Index: files/patch-bootstrap
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/files/patch-bootstrap,v
retrieving revision 1.3
diff -u -r1.3 patch-bootstrap
--- files/patch-bootstrap	28 Mar 2007 20:46:18 -0000	1.3
+++ files/patch-bootstrap	7 Jan 2008 20:14:32 -0000
@@ -1,11 +1,11 @@
---- bootstrap.orig	Mon Aug 21 01:19:33 2006
-+++ bootstrap	Wed Mar 28 22:25:54 2007
-@@ -42,7 +42,7 @@
- 	gettextize_version=`$GETTEXTIZE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- #	echo gettextize version: $gettextize_version
- 	case $gettextize_version in
--	    0.11*|0.12*|0.13*|0.14*)
-+	    0.1[1-9]*)
- 		have_gettextize=true
+--- bootstrap.orig	2008-01-07 22:06:02.000000000 +0200
++++ bootstrap	2008-01-07 22:05:35.000000000 +0200
+@@ -79,7 +79,7 @@
+ 	automake_version=`$AUTOMAKE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ #	echo automake version: $automake_version
+ 	case $automake_version in
+-	    1.7*|1.8*|1.9*)
++	    1.7*|1.8*|1.9*|1.[1-9][0-9]*)
+ 		have_automake=true
  		;;
  	esac
Index: files/patch-m4_ax_boost.m4
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/files/patch-m4_ax_boost.m4,v
retrieving revision 1.1
diff -u -r1.1 patch-m4_ax_boost.m4
--- files/patch-m4_ax_boost.m4	19 Feb 2007 09:47:45 -0000	1.1
+++ files/patch-m4_ax_boost.m4	7 Jan 2008 20:14:32 -0000
@@ -1,5 +1,5 @@
---- m4/ax_boost.m4.orig	Tue Feb 21 01:45:30 2006
-+++ m4/ax_boost.m4	Mon Jan 22 17:52:39 2007
+--- m4/ax_boost.m4.orig	2006-11-30 09:36:48.000000000 +0200
++++ m4/ax_boost.m4	2007-12-12 18:39:43.000000000 +0200
 @@ -97,7 +97,7 @@
          dnl this location ist chosen if boost libraries are installed with the --layout=system option
          dnl or if you install boost with RPM
@@ -9,3 +9,12 @@
                  BOOST_CPPFLAGS="-I$ac_boost_path/include"
          else
                  for ac_boost_path_tmp in /usr /usr/local /opt ; do
+@@ -331,7 +331,7 @@
+                                                 for BT in "-mt" ""; do
+                                                     for BL in "" "-s" ; do
+                                                         ax_lib=$BP$BN$BC$BT$BL$BV;
+-                                                        AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"
++                                                        AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib $BOOST_LDFLAGS" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"
+  break 5],
+                                                         [link_thread="no"])
+                                                     done
Index: files/patch-m4_ax_check_panotools.m4
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/files/patch-m4_ax_check_panotools.m4,v
retrieving revision 1.1
diff -u -r1.1 patch-m4_ax_check_panotools.m4
--- files/patch-m4_ax_check_panotools.m4	19 Feb 2007 09:47:45 -0000	1.1
+++ files/patch-m4_ax_check_panotools.m4	7 Jan 2008 20:14:32 -0000
@@ -1,6 +1,6 @@
---- m4/ax_check_panotools.m4.orig	Wed Jan 17 15:30:39 2007
-+++ m4/ax_check_panotools.m4	Wed Jan 17 15:31:10 2007
-@@ -44,7 +44,7 @@
+--- m4/ax_check_panotools.m4.orig	Wed Dec 20 21:41:29 2006
++++ m4/ax_check_panotools.m4	Wed May  2 21:54:25 2007
+@@ -57,7 +57,7 @@
      passed=0;
      PANO_OLD_LDFLAGS=$LDFLAGS
      PANO_OLD_CPPFLAGS=$CPPFLAGS
@@ -9,12 +9,12 @@
        LDFLAGS="$LDFLAGS -L$PANO_HOME/lib64"
      else
        LDFLAGS="$LDFLAGS -L$PANO_HOME/lib"
-@@ -76,7 +76,7 @@
-           LIB_PANO="-lpano12"
-           PANO_FLAGS="-DHasPANO"
+@@ -95,7 +95,7 @@
+             PANO_FLAGS="-DHasPANO12"
+           fi
          else
 -          if test "x$HCPU" = 'xamd64' ; then
 +          if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-             LIB_PANO="-L$PANO_HOME/lib64 -lpano12"
-           else
-             LIB_PANO="-L$PANO_HOME/lib -lpano12"
+             if test "$have_pano13" = 'yes' ; then
+               LIB_PANO="-L$PANO_HOME/lib64 -lpano13"
+             else
Index: files/patch-m4_fftw.m4
===================================================================
RCS file: files/patch-m4_fftw.m4
diff -N files/patch-m4_fftw.m4
--- files/patch-m4_fftw.m4	19 Feb 2007 09:47:45 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
---- m4/ax_fftw.m4.orig	Wed Jan 17 15:31:31 2007
-+++ m4/ax_fftw.m4	Wed Jan 17 15:32:36 2007
-@@ -12,7 +12,7 @@
-             AC_HELP_STRING([--with-fftw=DIR],
-                            [where the root of FFTW is installed ]),
-     [  ac_fftw_includes="$withval"/include
--	   if test "x$HCPU" = 'xamd64' ; then
-+	   if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-          ac_fftw_libraries="$withval"/lib64
- 	   else
-          ac_fftw_libraries="$withval"/lib
-@@ -45,12 +45,12 @@
- AC_FIND_FILE(fftw.h, $fftw_incdirs, fftw_incdir)
- ac_fftw_includes="$fftw_incdir"
- 
--if test "x$HCPU" = 'xamd64' ; then
-+if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-   fftw_libdirs="/usr/lib64/fftw/lib64 /usr/lib64 /opt/lib64 /mingw/lib64 /usr/local/fftw/lib64 /usr/local/lib64 /usr/lib64/fftw $FFTWLIB"
- else
-   fftw_libdirs="/usr/lib/fftw/lib /usr/lib /opt/lib /mingw/lib /usr/local/fftw/lib /usr/local/lib /usr/lib/fftw $FFTWLIB"
- fi
--if test "x$HCPU" = 'xamd64' ; then
-+if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-   test -n "$FFTWDIR" && fftw_libdirs="$FFTWDIR/lib64 $FFTWDIR $fftw_libdirs"
- else
-   test -n "$FFTWDIR" && fftw_libdirs="$FFTWDIR/lib $FFTWDIR $fftw_libdirs"
_______________________________________________
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "[EMAIL PROTECTED]"

Reply via email to