mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

* Upgrade graphics/hugin from 0.6.1 to 0.7.b4

Browse Source 
* Update libpano dependency to libpano13
* Add OPTIONS to depend on enblend, autopano-sift and ptstitcher
* Update automake dependency to 1.10
* Get rid of the autotools hack in pre-configure:, not necessary anymore
* Sync pkg-plist
* Sync the patches in files/
This commit is contained in:
Vasil Dimov 2008-01-19 08:31:35 +00:00
parent a0544a6584
commit 1d5fcf9ea0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=205823
7 changed files with 79 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
graphics/hugin/Makefile
View File

@ -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 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= vd@FreeBSD.org
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 @@ PLIST_SUB+= NLS=""
.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>

6
graphics/hugin/distinfo
View File

@ -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

18
graphics/hugin/files/patch-bootstrap
View File

@ -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

13
graphics/hugin/files/patch-m4_ax_boost.m4
View File

@ -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

18
graphics/hugin/files/patch-m4_ax_check_panotools.m4
View File

@ -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

26
graphics/hugin/files/patch-m4_fftw.m4
View File

@ -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"

36
graphics/hugin/pkg-plist
View File

@ -7,10 +7,11 @@ bin/nona_gui
bin/zhang_undistort
%%DATADIR%%/xrc/about.xrc
%%DATADIR%%/xrc/anchor_orientation.xrc
%%DATADIR%%/xrc/cp_editor_panel.xrc
%%DATADIR%%/xrc/assistant_panel.xrc
%%DATADIR%%/xrc/cp_editor_panel-2.5.xrc
%%DATADIR%%/xrc/cp_editor_panel.xrc
%%DATADIR%%/xrc/cp_list_frame.xrc
%%DATADIR%%/xrc/data/about_pl.htm
%%DATADIR%%/xrc/crop_panel.xrc
%%DATADIR%%/xrc/data/1leftarrow.png
%%DATADIR%%/xrc/data/1rightarrow.png
%%DATADIR%%/xrc/data/CPCursor0.png
@ -22,6 +23,7 @@ bin/zhang_undistort
%%DATADIR%%/xrc/data/CPCursor6.png
%%DATADIR%%/xrc/data/about.htm
%%DATADIR%%/xrc/data/about_fr.htm
%%DATADIR%%/xrc/data/about_pl.htm
%%DATADIR%%/xrc/data/center_pano.xpm
%%DATADIR%%/xrc/data/close.xpm
%%DATADIR%%/xrc/data/druid.control.128.png
@ -76,17 +78,24 @@ bin/zhang_undistort
%%DATADIR%%/xrc/data/list.png
%%DATADIR%%/xrc/data/logo.png
%%DATADIR%%/xrc/data/manual.html
%%DATADIR%%/xrc/data/nona_enblend.mk
%%DATADIR%%/xrc/data/nona_multilayer.mk
%%DATADIR%%/xrc/data/nona_smartblend.mk
%%DATADIR%%/xrc/data/optimize.png
%%DATADIR%%/xrc/data/optimize.xpm
%%DATADIR%%/xrc/data/preview.png
%%DATADIR%%/xrc/data/preview_auto_update.png
%%DATADIR%%/xrc/data/preview_num_transform.png
%%DATADIR%%/xrc/data/preview_show_all.png
%%DATADIR%%/xrc/data/preview_show_none.png
%%DATADIR%%/xrc/data/print.xpm
%%DATADIR%%/xrc/data/ptmender_enblend.mk
%%DATADIR%%/xrc/data/ptmender_smartblend.mk
%%DATADIR%%/xrc/data/redo.png
%%DATADIR%%/xrc/data/reload.png
%%DATADIR%%/xrc/data/searchfind.xpm
%%DATADIR%%/xrc/data/splash.png
%%DATADIR%%/xrc/data/straighten_pano.xpm
%%DATADIR%%/xrc/data/tips.txt
%%DATADIR%%/xrc/data/undo.png
%%DATADIR%%/xrc/data/zoomin.xpm
@ -94,7 +103,6 @@ bin/zhang_undistort
%%DATADIR%%/xrc/edit_script_dialog.xrc
%%DATADIR%%/xrc/edit_text.xrc
%%DATADIR%%/xrc/help.xrc
%%DATADIR%%/xrc/image_center.xrc
%%DATADIR%%/xrc/images_panel.xrc
%%DATADIR%%/xrc/images_panel-2.5.xrc
%%DATADIR%%/xrc/keyboard_help.xrc
@ -118,28 +126,6 @@ bin/zhang_undistort
%%DATADIR%%/xrc/vig_corr_dlg.xrc
share/applications/hugin.desktop
share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
%%NLS%%share/locale/ca_ES/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/cs_CZ/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/de/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/de/LC_MESSAGES/nona_gui.mo
%%NLS%%share/locale/fr/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/fr/LC_MESSAGES/nona_gui.mo
%%NLS%%share/locale/hu/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/nona_gui.mo
%%NLS%%share/locale/it/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/nl/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/nl/LC_MESSAGES/nona_gui.mo
%%NLS%%share/locale/pl/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/pl/LC_MESSAGES/nona_gui.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/nona_gui.mo
%%NLS%%share/locale/ru/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/ru/LC_MESSAGES/nona_gui.mo
%%NLS%%share/locale/sv/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/uk/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/nona_gui.mo
share/mime/packages/hugin.xml
share/pixmaps/hugin.png
@dirrmtry share/applications