Date: Tue, 8 Jan 2008 05:20:54 -0700 (MST) From: Warren Block <wblock@wonkity.com> To: Vasil Dimov <vd@freebsd.org> Cc: ports@freebsd.org, Dmitry Marakasov <amdmi3@amdmi3.ru> Subject: Re: WIP: graphics/hugin upgrade from 0.6.1 to 0.7.b4 Message-ID: <20080108050612.F70518@wonkity.com> In-Reply-To: <20080107202126.GA37997@polejan.hw.v5d.org> References: <20080107202126.GA37997@polejan.hw.v5d.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
--J/dobhs11T7y2rNN
Content-Type: TEXT/PLAIN; CHARSET=US-ASCII; format=flowed
Content-ID: <20080108050612.N70518@wonkity.com>
Content-Disposition: INLINE
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
root@speedy.wonkity.com:/usr/obj/usr/src/sys/SPEEDY i386
-Warren Block * Rapid City, South Dakota USA
--J/dobhs11T7y2rNN
Content-Type: TEXT/X-DIFF; CHARSET=us-ascii
Content-Transfer-Encoding: QUOTED-PRINTABLE
Content-ID: <20080108050612.X70518@wonkity.com>
Content-Description:
Content-Disposition: ATTACHMENT; FILENAME=hugin_0.6.1-0.7.b4.diff
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 @@
#
=20
PORTNAME=3D hugin
-PORTVERSION=3D 0.6.1
-PORTREVISION=3D 2
+DISTVERSION=3D 0.7_beta4
CATEGORIES=3D graphics
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=3D ${PORTNAME}
@@ -15,38 +14,59 @@
MAINTAINER=3D vd@FreeBSD.org
COMMENT=3D A GUI for Panorama Tools, to stitch panoramic images
=20
-BUILD_DEPENDS=3D libpano12>=3D2.8.4:${PORTSDIR}/graphics/libpano12 \
- vigra-config:${PORTSDIR}/graphics/vigra \
- zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=3D tiff:${PORTSDIR}/graphics/tiff \
+# zip is needed for building the help file
+BUILD_DEPENDS=3D zip:${PORTSDIR}/archivers/zip
+LIB_DEPENDS=3D 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=3D PTOptimizer:${PORTSDIR}/graphics/libpano12 \
- PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools
+
+OPTIONS=3D ENBLEND "enblend for high quality blending" on \
+ AUTOPANOSIFT "autopano-sift for automatic control points" on \
+ PTSTITCHER "PTStitcher for stitching images" on
=20
USE_BZIP2=3D yes
=20
-USE_AUTOTOOLS=3D autoconf:261:env autoheader:261:env aclocal:19:env \
- automake:19:env libtool:15:env
+USE_AUTOTOOLS=3D autoconf:261:env autoheader:261:env aclocal:110:env \
+ automake:110:env libtool:15:env
=20
IS_INTERACTIVE=3D yes
=20
GNU_CONFIGURE=3D yes
CONFIGURE_TARGET=3D--build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=3D PTHREAD_LIBS=3D${PTHREAD_LIBS} WXRC=3D${WXRC_CMD}
-CONFIGURE_ARGS+=3D --with-boost=3D${LOCALBASE} \
- --disable-desktop
+CONFIGURE_ARGS+=3D--with-boost=3D${LOCALBASE}
+# --disable-desktop
USE_GMAKE=3D yes
USE_ICONV=3D yes
-USE_WX=3D 2.6
+USE_WX=3D 2.6+
WX_CONF_ARGS=3D absolute
=20
+.if defined(WX_UNICODE)
+CONFIGURE_ARGS+=3D--with-unicode=3Dyes
+.else
+CONFIGURE_ARGS+=3D--with-unicode=3Dno
+.endif
+
MAN1=3D fulla.1
=20
DOCSDIR=3D ${PREFIX}/share/hugin/xrc/data
=20
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ENBLEND)
+RUN_DEPENDS+=3D enblend:${PORTSDIR}/graphics/enblend
+.endif
+
+.if defined(WITH_AUTOPANOSIFT)
+RUN_DEPENDS+=3D autopanog:${PORTSDIR}/graphics/autopano-sift
+.endif
+
+.if defined(WITH_PTSTITCHER)
+RUN_DEPENDS+=3D PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools
+.endif
+
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=3D--disable-nls
PLIST_SUB+=3D NLS=3D"@comment "
@@ -56,9 +76,6 @@
.endif
=20
pre-configure:
- cd ${WRKSRC} && \
- ${SETENV} ${AUTOTOOLS_ENV} \
- ACLOCAL=3D"${ACLOCAL} -I ${LOCALBASE}/share/aclocal" \
- ./bootstrap
+ cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./bootstrap
=20
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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) =3D 46bc3136d42acbabab837128ff471507
-SHA256 (hugin-0.6.1.tar.bz2) =3D 18546d42ef15154246d5b84ebde847aa2cf003c63=
05cc64a17cc5396db346ae7
-SIZE (hugin-0.6.1.tar.bz2) =3D 2151921
+MD5 (hugin-0.7_beta4.tar.bz2) =3D 28b69d85ae06a22fe9514f7f77e6dddb
+SHA256 (hugin-0.7_beta4.tar.bz2) =3D 4527d40ae56a6ef67583a350ab67505e86054=
c0b297b2d18cf892c2751cabcfd
+SIZE (hugin-0.7_beta4.tar.bz2) =3D 2319243
Index: files/patch-bootstrap
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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=3D`$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=3Dtrue
+--- 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=3D`$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=3Dtrue
;;
esac
Index: files/patch-m4_ax_boost.m4
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 wit=
h the --layout=3Dsystem option
dnl or if you install boost with RPM
@@ -9,3 +9,12 @@
BOOST_CPPFLAGS=3D"-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=3D$BP$BN$B=
C$BT$BL$BV;
+- AC_CHECK_LIB($ax_=
lib, main, [BOOST_THREAD_LIB=3D"-l$ax_lib" AC_SUBST(BOOST_THREAD_LIB) link_=
thread=3D"yes"
++ AC_CHECK_LIB($ax_=
lib, main, [BOOST_THREAD_LIB=3D"-l$ax_lib $BOOST_LDFLAGS" AC_SUBST(BOOST_TH=
READ_LIB) link_thread=3D"yes"
+ break 5],
+ [link_thread=3D"n=
o"])
+ done
Index: files/patch-m4_ax_check_panotools.m4
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/graphics/hugin/files/patch-m4_ax_check_panotools=
=2Em4,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=3D0;
PANO_OLD_LDFLAGS=3D$LDFLAGS
PANO_OLD_CPPFLAGS=3D$CPPFLAGS
@@ -9,12 +9,12 @@
LDFLAGS=3D"$LDFLAGS -L$PANO_HOME/lib64"
else
LDFLAGS=3D"$LDFLAGS -L$PANO_HOME/lib"
-@@ -76,7 +76,7 @@
- LIB_PANO=3D"-lpano12"
- PANO_FLAGS=3D"-DHasPANO"
+@@ -95,7 +95,7 @@
+ PANO_FLAGS=3D"-DHasPANO12"
+ fi
else
- if test "x$HCPU" =3D 'xamd64' ; then
+ if test "x$HCPU" =3D 'xamd64' -a "x$HSYS" !=3D 'xfreebsd' ; then
- LIB_PANO=3D"-L$PANO_HOME/lib64 -lpano12"
- else
- LIB_PANO=3D"-L$PANO_HOME/lib -lpano12"
+ if test "$have_pano13" =3D 'yes' ; then
+ LIB_PANO=3D"-L$PANO_HOME/lib64 -lpano13"
+ else
Index: files/patch-m4_fftw.m4
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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=3DDIR],
- [where the root of FFTW is installed ]),
- [ ac_fftw_includes=3D"$withval"/include
-- if test "x$HCPU" =3D 'xamd64' ; then
-+ if test "x$HCPU" =3D 'xamd64' -a "x$HSYS" !=3D 'xfreebsd' ; then
- ac_fftw_libraries=3D"$withval"/lib64
- else
- ac_fftw_libraries=3D"$withval"/lib
-@@ -45,12 +45,12 @@
- AC_FIND_FILE(fftw.h, $fftw_incdirs, fftw_incdir)
- ac_fftw_includes=3D"$fftw_incdir"
-=20
--if test "x$HCPU" =3D 'xamd64' ; then
-+if test "x$HCPU" =3D 'xamd64' -a "x$HSYS" !=3D 'xfreebsd' ; then
- fftw_libdirs=3D"/usr/lib64/fftw/lib64 /usr/lib64 /opt/lib64 /mingw/lib6=
4 /usr/local/fftw/lib64 /usr/local/lib64 /usr/lib64/fftw $FFTWLIB"
- else
- fftw_libdirs=3D"/usr/lib/fftw/lib /usr/lib /opt/lib /mingw/lib /usr/loc=
al/fftw/lib /usr/local/lib /usr/lib/fftw $FFTWLIB"
- fi
--if test "x$HCPU" =3D 'xamd64' ; then
-+if test "x$HCPU" =3D 'xamd64' -a "x$HSYS" !=3D 'xfreebsd' ; then
- test -n "$FFTWDIR" && fftw_libdirs=3D"$FFTWDIR/lib64 $FFTWDIR $fftw_lib=
dirs"
- else
- test -n "$FFTWDIR" && fftw_libdirs=3D"$FFTWDIR/lib $FFTWDIR $fftw_libdi=
rs"
--J/dobhs11T7y2rNN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080108050612.F70518>