new hugin and libpano13 releases will be made soon; if you use
these, you might like to give this a go using the beta/rc code.
(if you use autopano-sift-c, you should also rebuild that against
the new libpano13).
files removed; use patch -E -p0 -d /usr/ports/graphics
Index: libpano13/Makefile
===================================================================
RCS file: /cvs/ports/graphics/libpano13/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- libpano13/Makefile 23 Jun 2010 16:53:20 -0000 1.4
+++ libpano13/Makefile 5 Sep 2010 09:58:49 -0000
@@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2010/06/23 16:53:20 landry Exp $
COMMENT = library for processing panoramic images
-DISTNAME = libpano13-2.9.14
+DISTNAME = libpano13-2.9.17_rc1
+PKGNAME = ${DISTNAME:S/_//}
+WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//}
-SHARED_LIBS += pano13 1.0
+SHARED_LIBS += pano13 2.0
CATEGORIES = graphics
HOMEPAGE = http://panotools.sourceforge.net/
Index: libpano13/distinfo
===================================================================
RCS file: /cvs/ports/graphics/libpano13/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- libpano13/distinfo 25 May 2009 09:19:05 -0000 1.3
+++ libpano13/distinfo 5 Sep 2010 09:58:49 -0000
@@ -1,5 +1,5 @@
-MD5 (libpano13-2.9.14.tar.gz) = +wEa6tY5dOYwc57VXXWksA==
-RMD160 (libpano13-2.9.14.tar.gz) = vEnIXoqxHq60iJj887nkrHXBIcQ=
-SHA1 (libpano13-2.9.14.tar.gz) = xudKzdpkzn1Bq+fZXykdxZ3nUaU=
-SHA256 (libpano13-2.9.14.tar.gz) = V5SXh6iG3n1xmPTeG2IT5rejCZ5wmfvxiVDpq5/i7u8=
-SIZE (libpano13-2.9.14.tar.gz) = 2501559
+MD5 (libpano13-2.9.17_rc1.tar.gz) = bBq+kXpmZyCcLqI4B/OAAQ==
+RMD160 (libpano13-2.9.17_rc1.tar.gz) = xjcQo7roCzMTwe/qsQcqKdqa3vM=
+SHA1 (libpano13-2.9.17_rc1.tar.gz) = Xsms9uCb7O2dTxgamWEv02StkYM=
+SHA256 (libpano13-2.9.17_rc1.tar.gz) =
mWt0Lbi+utHB3WCia1fuGFN7v3UV5F6AgYultOQbCYI=
+SIZE (libpano13-2.9.17_rc1.tar.gz) = 2731821
Index: libpano13/patches/patch-Makefile_am
===================================================================
RCS file: /cvs/ports/graphics/libpano13/patches/patch-Makefile_am,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_am
--- libpano13/patches/patch-Makefile_am 19 Apr 2009 11:14:34 -0000 1.1.1.1
+++ libpano13/patches/patch-Makefile_am 5 Sep 2010 09:58:49 -0000
@@ -1,6 +1,12 @@
$OpenBSD: patch-Makefile_am,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $
---- Makefile.am.orig Thu Feb 5 00:18:23 2009
-+++ Makefile.am Fri Apr 17 21:23:43 2009
+--- Makefile.am.orig Sat Jul 24 22:16:56 2010
++++ Makefile.am Sat Sep 4 21:31:30 2010
+@@ -1,4 +1,4 @@
+-ACLOCAL_AMFLAGS = -I m4
++beta2ACLOCAL_AMFLAGS = -I m4
+
+ STD_SRC = filter.c parser.c queryfeature.c correct.c perspect.c \
+ adjust.c remap.c lmdif.c file.c \
@@ -71,6 +71,16 @@ install-exec-hook:
endif
@@ -18,21 +24,21 @@ $OpenBSD: patch-Makefile_am,v 1.1.1.1 20
if HAVE_DARWIN
DAR_SRC = sys_ansi.c ppm.c
DAR_DEFS = -D__Ansi__=1
-@@ -81,13 +91,13 @@ install-exec-hook:
+@@ -91,13 +101,13 @@ install-exec-hook:
endif
--AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS)
$(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(ENDIAN_FLAG)
-+AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_CFLAGS) $(TIFF_FLAGS)
$(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(ENDIAN_FLAG) $(OBSD_DEFS)
+-AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS)
$(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG)
++AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS)
$(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(OBSD_DEFS)
$(ENDIAN_FLAG)
lib_LTLIBRARIES = libpano13.la
--libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC)
$(MAC_SRC) $(LIN_SRC) $(DAR_SRC)
+-libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC)
$(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
++libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC)
$(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(OBSD_SRC)
-libpano13_la_LIBADD = $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB)
@PANO_WIN32_RESOURCE@
--libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS)
-+libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC)
$(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(OBSD_SRC)
+libpano13_la_LIBADD = $(LIB_JPEG) $(PNG_LIBS) $(LIB_TIFF) $(LIB_ZLIB)
@PANO_WIN32_RESOURCE@
-+libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(OBSD_LDFS)
+-libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS)
++libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS)
$(OBSD_LDFS)
libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)
Index: libpano13/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/graphics/libpano13/patches/patch-configure_ac,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure_ac
--- libpano13/patches/patch-configure_ac 19 Apr 2009 11:14:34 -0000
1.1.1.1
+++ libpano13/patches/patch-configure_ac 5 Sep 2010 09:58:49 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $
---- configure.ac.orig Thu Feb 5 00:35:32 2009
-+++ configure.ac Fri Apr 17 21:23:37 2009
+--- configure.ac.orig Sat Jul 24 22:16:56 2010
++++ configure.ac Sat Sep 4 21:28:47 2010
@@ -45,6 +45,11 @@ case "${host_os}" in
;;
esac
@@ -13,15 +13,15 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2
*darwin*)
PANO_WIN32_RESOURCE=
HSYS=darwin
-@@ -73,6 +78,7 @@ esac
-
+@@ -79,6 +84,7 @@ esac
AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
+ AM_CONDITIONAL(HAVE_SOLARIS, test "${HSYS}" = "solaris")
AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
+AM_CONDITIONAL(HAVE_OPENBSD, test "${HSYS}" = "openbsd")
AM_CONDITIONAL(HAVE_MAC, test "${HSYS}" = "classic")
AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
AM_CONDITIONAL(HAVE_CYGWIN, test "${HSYS}" = "cygwin")
-@@ -96,7 +102,7 @@ if test "x$have_zlib" != xyes; then
+@@ -102,7 +108,7 @@ if test "x$have_zlib" != xyes; then
])
fi
@@ -30,7 +30,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2
if test "x$have_png" != xyes; then
AC_MSG_ERROR([
the png library must be installed on your system
-@@ -177,8 +183,8 @@ echo " CXX = $CXX"
+@@ -183,8 +189,8 @@ echo " CXX = $CXX"
echo " CXXFLAGS = $CXXFLAGS"
echo " JPEG_FLAGS = $JPEG_FLAGS"
echo " LIB_JPEG = $LIB_JPEG"
Index: libpano13/patches/patch-tools_Makefile_am
===================================================================
RCS file: /cvs/ports/graphics/libpano13/patches/patch-tools_Makefile_am,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tools_Makefile_am
--- libpano13/patches/patch-tools_Makefile_am 19 Apr 2009 11:14:34 -0000
1.1.1.1
+++ libpano13/patches/patch-tools_Makefile_am 5 Sep 2010 09:58:49 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-tools_Makefile_am,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $
---- tools/Makefile.am.orig Tue Jan 15 00:11:39 2008
-+++ tools/Makefile.am Fri Apr 17 21:23:45 2009
+--- tools/Makefile.am.orig Sat Jul 24 22:16:56 2010
++++ tools/Makefile.am Sat Sep 4 21:32:14 2010
@@ -24,6 +24,14 @@ LIN_SRC =
LIN_DEFS =
endif
@@ -16,21 +16,21 @@ $OpenBSD: patch-tools_Makefile_am,v 1.1.
if HAVE_DARWIN
DAR_SRC = panoinfo_unix.c
DAR_DEFS = -D__Ansi__=1
-@@ -32,7 +40,7 @@ DAR_SRC =
- DAR_DEFS =
+@@ -40,7 +48,7 @@ SOL_SRC =
+ SOL_DEFS =
endif
--AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS)
$(JPEG_FLAGS)
-+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS)
$(JPEG_FLAGS) $(OBSD_DEFS)
+-AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS)
$(JPEG_FLAGS)
++AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS)
$(JPEG_FLAGS) $(OBSD_DEFS)
AM_LDFLAGS = -L${top_builddir}
# PTAInterpolate can only be compiled with ptpicker.h, which in turn depends
on java
-@@ -77,7 +85,7 @@ PTtiffdump_LDADD = -l${PANOLIB} -ljpeg -ltiff
+@@ -85,7 +93,7 @@ PTtiffdump_LDADD = -l${PANOLIB} -ljpeg -ltiff
PToptimizer_SOURCES = PToptimizer.c
PToptimizer_LDADD = -l${PANOLIB}
--panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC)
-+panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(OBSD_SRC)
+-panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
++panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(OBSD_SRC)
panoinfo_LDADD = -l${PANOLIB}
- EXTRA_DIST = README.PTmender
+ EXTRA_DIST = README.PTmender \
Index: libpano13/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/libpano13/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- libpano13/pkg/PLIST 3 May 2009 09:02:16 -0000 1.2
+++ libpano13/pkg/PLIST 5 Sep 2010 09:58:49 -0000
@@ -24,6 +24,8 @@ include/pano13/queryfeature.h
include/pano13/version.h
lib/libpano13.a
lib/libpano13.la
+lib/pkgconfig/
+lib/pkgconfig/libpano13.pc
@man man/man1/PTAInterpolate.1
@man man/man1/PTblender.1
@man man/man1/PTcrop.1
Index: hugin/Makefile
===================================================================
RCS file: /cvs/ports/graphics/hugin/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- hugin/Makefile 10 Jun 2010 08:24:49 -0000 1.18
+++ hugin/Makefile 5 Sep 2010 09:58:49 -0000
@@ -4,16 +4,16 @@ VMEM_WARNING = Yes
COMMENT = panorama image stitcher
-DISTNAME = hugin-2010.0.0
+DISTNAME = hugin-2010.2.0_beta2
-PKGNAME = ${DISTNAME:S/_//:L}p1
+PKGNAME = ${DISTNAME:S/_//:L}
WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//}
-SHARED_LIBS = celeste 0.0 \
- huginANN 0.0 \
- huginbase 1.0 \
- huginjhead 0.0 \
- huginvigraimpex 0.0
+SHARED_LIBS += huginbasewx 0.0
+SHARED_LIBS += celeste 0.0
+SHARED_LIBS += huginANN 0.0
+SHARED_LIBS += huginbase 1.0
+SHARED_LIBS += huginvigraimpex 0.0
CATEGORIES = graphics x11
@@ -27,7 +27,11 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = GL GLU ICE SM X11 Xext Xi Xmu c m pthread stdc++ z
+WANTLIB += GL GLEW GLU Half Iex Imath IlmImf IlmThread ICE SM X11
+WANTLIB += Xext Xi Xmu boost_date_time-mt boost_thread-mt c
+WANTLIB += exiv2.>=0.1 glut.>=4.1 jpeg m pano13.>=2.0 png pthread
+WANTLIB += stdc++ tiff wx_base wx_base_net wx_base_xml wx_gtk2_adv
+WANTLIB += wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_xrc z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/}
@@ -36,17 +40,17 @@ RUN_DEPENDS = :desktop-file-utils-*:dev
::graphics/enblend-enfuse \
::graphics/p5-Image-ExifTool \
::devel/gmake # yes, really a RUN_DEPENDS
-LIB_DEPENDS = boost_thread-mt::devel/boost \
- exiv2.>=0.1:exiv2->=0.12:graphics/exiv2 \
- GLEW::graphics/glew \
- glut.>=4.1::graphics/freeglut \
- Half,Iex,Imath,IlmThread::graphics/ilmbase \
- jpeg::graphics/jpeg \
- pano13::graphics/libpano13 \
- IlmImf::graphics/openexr \
- png::graphics/png \
- tiff::graphics/tiff \
-
wx_base,wx_base_net,wx_base_xml,wx_gtk2_adv,wx_gtk2_core,wx_gtk2_gl,wx_gtk2_html,wx_gtk2_xrc::x11/wxWidgets
+LIB_DEPENDS = ::devel/boost \
+ :exiv2->=0.12:graphics/exiv2 \
+ ::graphics/glew \
+ ::graphics/freeglut \
+ ::graphics/ilmbase \
+ ::graphics/jpeg \
+ :libpano13->=2.9.17rc1:graphics/libpano13 \
+ ::graphics/openexr \
+ ::graphics/png \
+ ::graphics/tiff \
+ ::x11/wxWidgets
USE_X11= Yes
MODULES += devel/cmake
Index: hugin/distinfo
===================================================================
RCS file: /cvs/ports/graphics/hugin/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- hugin/distinfo 29 May 2010 01:23:55 -0000 1.8
+++ hugin/distinfo 5 Sep 2010 09:58:49 -0000
@@ -1,5 +1,5 @@
-MD5 (hugin-2010.0.0.tar.gz) = DNC3jg2GYCPjtmReUBCHbw==
-RMD160 (hugin-2010.0.0.tar.gz) = 4rA/4ApKAkKh88T9ZBz4o+MS1RY=
-SHA1 (hugin-2010.0.0.tar.gz) = QetyU6qxK5E6XJttmXXYZSOQ3LU=
-SHA256 (hugin-2010.0.0.tar.gz) = 7TDFAhcJuJcKQ/HkwilbXImbwPuH/7YxNaPA7N47tSM=
-SIZE (hugin-2010.0.0.tar.gz) = 12085453
+MD5 (hugin-2010.2.0_beta2.tar.gz) = sM0jYtDrJ6dDI9ml1X6z4Q==
+RMD160 (hugin-2010.2.0_beta2.tar.gz) = uZZlCTM8/BX8/5hdiiw7PHETvtg=
+SHA1 (hugin-2010.2.0_beta2.tar.gz) = QryIT7KtVyb/9MxInEB2+dstaLA=
+SHA256 (hugin-2010.2.0_beta2.tar.gz) =
LEGsIghR6Y2jMXDL5LELQne/Ilf1bpY4lMhBWNOLx48=
+SIZE (hugin-2010.2.0_beta2.tar.gz) = 12385774
Index: hugin/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/hugin/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-CMakeLists_txt
--- hugin/patches/patch-CMakeLists_txt 29 May 2010 01:23:55 -0000 1.5
+++ hugin/patches/patch-CMakeLists_txt 5 Sep 2010 09:58:49 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.5 2010/05/29 01:23:55 sthen Exp $
---- CMakeLists.txt.orig Tue Mar 2 23:17:21 2010
-+++ CMakeLists.txt Sat May 8 10:00:46 2010
-@@ -125,6 +125,7 @@ ENDIF(WIN32)
+--- CMakeLists.txt.orig Mon Aug 30 23:32:07 2010
++++ CMakeLists.txt Sat Sep 4 21:51:34 2010
+@@ -152,6 +152,7 @@ ENDIF(WIN32)
# finding the wxWidgets distributions of those packages (Win32 only).
SET(wxWidgets_USE_LIBS base core xrc html xml adv gl net)
Index: hugin/patches/patch-CMakeModules_FindGLEW_cmake
===================================================================
RCS file: /cvs/ports/graphics/hugin/patches/patch-CMakeModules_FindGLEW_cmake,v
retrieving revision 1.1
diff -u -p -r1.1 patch-CMakeModules_FindGLEW_cmake
--- hugin/patches/patch-CMakeModules_FindGLEW_cmake 29 May 2010 01:23:55
-0000 1.1
+++ hugin/patches/patch-CMakeModules_FindGLEW_cmake 5 Sep 2010 09:58:49
-0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeModules_FindGLEW_cmake,v 1.1 2010/05/29 01:23:55 sthen
Exp $
---- CMakeModules/FindGLEW.cmake.orig Sun Sep 6 12:20:05 2009
-+++ CMakeModules/FindGLEW.cmake Sun Sep 6 21:47:04 2009
-@@ -8,8 +8,8 @@ IF(WIN32)
- # for dynamic build, it's glew32.lib and the dll must be copied into
hugin's bin folder
+--- CMakeModules/FindGLEW.cmake.orig Sat Sep 4 21:51:34 2010
++++ CMakeModules/FindGLEW.cmake Sat Sep 4 21:51:34 2010
+@@ -12,8 +12,8 @@ IF(WIN32)
SET(GLEW_LIBRARIES ${SOURCE_BASE_DIR}/glew/lib/glew32s.lib)
+ ENDIF(${HUGIN_SHARED})
ELSE(WIN32)
- FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS /usr/include /usr/local/include)
- FIND_LIBRARY(GLEW_LIBRARIES GLEW PATHS /usr/lib /usr/local/lib)
Index: hugin/patches/patch-CMakeModules_FindPNG_cmake
===================================================================
RCS file: /cvs/ports/graphics/hugin/patches/patch-CMakeModules_FindPNG_cmake,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeModules_FindPNG_cmake
--- hugin/patches/patch-CMakeModules_FindPNG_cmake 29 May 2010 01:23:55
-0000 1.2
+++ hugin/patches/patch-CMakeModules_FindPNG_cmake 5 Sep 2010 09:58:49
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeModules_FindPNG_cmake,v 1.2 2010/05/29 01:23:55 sthen Exp
$
---- CMakeModules/FindPNG.cmake.orig Fri Sep 4 21:45:27 2009
-+++ CMakeModules/FindPNG.cmake Fri Sep 4 21:45:27 2009
+--- CMakeModules/FindPNG.cmake.orig Sat Sep 4 21:51:34 2010
++++ CMakeModules/FindPNG.cmake Sat Sep 4 21:51:35 2010
@@ -22,6 +22,7 @@ SET(PNG_FOUND "NO")
IF (ZLIB_FOUND)
@@ -8,4 +8,4 @@ $OpenBSD: patch-CMakeModules_FindPNG_cma
+ ${LOCALBASE}/include/libpng
/usr/local/include
/usr/include
- ${wxWidgets_ROOT_DIR}/src/png
+ ${SOURCE_BASE_DIR}/lpng142
Index: hugin/patches/patch-src_celeste_Utilities_cpp
===================================================================
RCS file: /cvs/ports/graphics/hugin/patches/patch-src_celeste_Utilities_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_celeste_Utilities_cpp
--- hugin/patches/patch-src_celeste_Utilities_cpp 3 Jun 2009 13:45:14
-0000 1.2
+++ hugin/patches/patch-src_celeste_Utilities_cpp 5 Sep 2010 09:58:49
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_celeste_Utilities_cpp,v 1.2 2009/06/03 13:45:14 sthen Exp $
---- src/celeste/Utilities.cpp.orig Mon Jun 1 21:56:10 2009
-+++ src/celeste/Utilities.cpp Wed Jun 3 02:22:10 2009
+--- src/celeste/Utilities.cpp.orig Mon Aug 30 23:32:08 2010
++++ src/celeste/Utilities.cpp Sat Sep 4 21:51:35 2010
@@ -26,6 +26,7 @@ Copyright (c) 2002-3 Adriaan Tijsseling
*/
@@ -8,4 +8,4 @@ $OpenBSD: patch-src_celeste_Utilities_cp
+#include <unistd.h>
#include <stdlib.h>
#include "Utilities.h"
- #include <Config.h>
+
Index: hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp
===================================================================
RCS file:
/cvs/ports/graphics/hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_hugin1_base_wx_RunStitchPanel_cpp
--- hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp 29 May 2010
01:23:55 -0000 1.1
+++ hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp 5 Sep 2010
09:58:49 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_hugin1_base_wx_RunStitchPanel_cpp,v 1.1 2010/05/29
01:23:55 sthen Exp $
---- src/hugin1/base_wx/RunStitchPanel.cpp.orig Sat May 29 01:08:31 2010
-+++ src/hugin1/base_wx/RunStitchPanel.cpp Sat May 29 01:08:39 2010
+--- src/hugin1/base_wx/RunStitchPanel.cpp.orig Mon Aug 30 23:32:08 2010
++++ src/hugin1/base_wx/RunStitchPanel.cpp Sat Sep 4 21:51:35 2010
@@ -252,7 +252,7 @@ bool RunStitchPanel::StitchProject(wxString scriptFile
cmd = wxT("make");
}
@@ -8,5 +8,5 @@ $OpenBSD: patch-src_hugin1_base_wx_RunSt
-#elif defined __FreeBSD__
+#elif defined __FreeBSD__ || defined __OpenBSD__
wxString cmd = wxT("gmake ") + args;
- #else
- wxString cmd = wxT("make ") + args;
+ #elif defined __WXMSW__
+ wxString cmdExe;
Index: hugin/patches/patch-src_hugin1_hugin_config_defaults_h
===================================================================
RCS file: hugin/patches/patch-src_hugin1_hugin_config_defaults_h
diff -N hugin/patches/patch-src_hugin1_hugin_config_defaults_h
--- hugin/patches/patch-src_hugin1_hugin_config_defaults_h 29 May 2010
01:23:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_hugin1_hugin_config_defaults_h,v 1.2 2010/05/29 01:23:55
sthen Exp $
---- src/hugin1/hugin/config_defaults.h.orig Tue Mar 2 23:17:13 2010
-+++ src/hugin1/hugin/config_defaults.h Sat May 8 10:00:46 2010
-@@ -133,7 +133,7 @@
-
- #endif
-
--#elif defined unix
-+#elif ((defined unix) || (defined __unix__))
-
- #define HUGIN_PT_SCRIPTFILE "PT_script.txt"
-
Index: hugin/pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/graphics/hugin/pkg/MESSAGE,v
retrieving revision 1.1
diff -u -p -r1.1 MESSAGE
--- hugin/pkg/MESSAGE 10 Jun 2010 08:24:49 -0000 1.1
+++ hugin/pkg/MESSAGE 5 Sep 2010 09:58:49 -0000
@@ -3,4 +3,4 @@ similar image features and generate cont
uses the SIFT algorithm, which is patented in the USA, this is not
automatically installed as a dependency.
-Either "pkg_add autopano-sift-c" or select these manually.
+Either "pkg_add autopano-sift-c" or select your control points manually.
Index: hugin/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/graphics/hugin/pkg/PFRAG.shared,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.shared
--- hugin/pkg/PFRAG.shared 15 Apr 2010 20:47:17 -0000 1.4
+++ hugin/pkg/PFRAG.shared 5 Sep 2010 09:58:49 -0000
@@ -2,4 +2,5 @@
@lib lib/libceleste.so.${LIBceleste_VERSION}
@lib lib/libhuginANN.so.${LIBhuginANN_VERSION}
@lib lib/libhuginbase.so.${LIBhuginbase_VERSION}
+...@lib lib/libhuginbasewx.so.${LIBhuginbasewx_VERSION}
@lib lib/libhuginvigraimpex.so.${LIBhuginvigraimpex_VERSION}
Index: hugin/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/hugin/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- hugin/pkg/PLIST 29 May 2010 01:23:55 -0000 1.5
+++ hugin/pkg/PLIST 5 Sep 2010 09:58:49 -0000
@@ -16,7 +16,10 @@ bin/autopano-noop.sh
@bin bin/matchpoint
@bin bin/nona
@bin bin/nona_gui
+...@bin bin/pano_modify
+...@bin bin/pano_trafo
@bin bin/pto2mk
+...@bin bin/pto_merge
@bin bin/tca_correct
@bin bin/vig_optimize
@man man/man1/PTBatcherGUI.1
@@ -32,7 +35,10 @@ bin/autopano-noop.sh
@man man/man1/hugin_stitch_project.1
@man man/man1/nona.1
@man man/man1/nona_gui.1
+...@man man/man1/pano_modify.1
+...@man man/man1/pano_trafo.1
@man man/man1/pto2mk.1
+...@man man/man1/pto_merge.1
@man man/man1/tca_correct.1
@man man/man1/vig_optimize.1
share/applications/PTBatcherGUI.desktop
@@ -107,6 +113,7 @@ share/hugin/xrc/data/help_en_EN/180px-Fa
share/hugin/xrc/data/help_en_EN/180px-Focal_length.gif
share/hugin/xrc/data/help_en_EN/180px-LagardePont-fish.jpg
share/hugin/xrc/data/help_en_EN/180px-Lamp_enfuse.jpg
+share/hugin/xrc/data/help_en_EN/197px-Field-of-view.svg.png
share/hugin/xrc/data/help_en_EN/1f09c25c5247c1eaf121df644ca42f8c.png
share/hugin/xrc/data/help_en_EN/200px-Ben_Architectural.jpg
share/hugin/xrc/data/help_en_EN/200px-Ben_Equirectangular_panini.jpg
@@ -141,6 +148,7 @@ share/hugin/xrc/data/help_en_EN/250px-TK
share/hugin/xrc/data/help_en_EN/29e2300eb2f198d830f04682f14872e2.png
share/hugin/xrc/data/help_en_EN/3016f25d3d1249eab1305b78b0b82d3d.png
share/hugin/xrc/data/help_en_EN/312418a7fcf9d47adc8e5683e89c58cd.png
+share/hugin/xrc/data/help_en_EN/360px-Pantheon-150x100-rect-panini.jpg
share/hugin/xrc/data/help_en_EN/38d368a092f7d5a4d2b42bdf4d0dd89c.png
share/hugin/xrc/data/help_en_EN/3d6de401d007ea0cffc99610ad623239.png
share/hugin/xrc/data/help_en_EN/400px-220x120deg-panini-grid.png
@@ -278,10 +286,14 @@ share/hugin/xrc/data/help_en_EN/Hugin_Fa
share/hugin/xrc/data/help_en_EN/Hugin_Images_tab.html
share/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html
share/hugin/xrc/data/help_en_EN/Hugin_Main_window.html
+share/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html
share/hugin/xrc/data/help_en_EN/Hugin_Optimizer_tab.html
+share/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html
share/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
share/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html
+share/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html
share/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html
+share/hugin/xrc/data/help_en_EN/Hugin_Trackers.html
share/hugin/xrc/data/help_en_EN/Hugin_add_project.png
share/hugin/xrc/data/help_en_EN/Hugin_cancel_batch.png
share/hugin/xrc/data/help_en_EN/Hugin_center_pano.png
@@ -344,6 +356,7 @@ share/hugin/xrc/data/help_en_EN/PTblende
share/hugin/xrc/data/help_en_EN/PTmender.html
share/hugin/xrc/data/help_en_EN/PTtiff2psd.html
share/hugin/xrc/data/help_en_EN/Pano12.html
+share/hugin/xrc/data/help_en_EN/Pano_modify.html
share/hugin/xrc/data/help_en_EN/Panoglview.html
share/hugin/xrc/data/help_en_EN/Panoinfo.html
share/hugin/xrc/data/help_en_EN/Panomatic.html
@@ -363,6 +376,7 @@ share/hugin/xrc/data/help_en_EN/Pitch.ht
share/hugin/xrc/data/help_en_EN/Portrait.html
share/hugin/xrc/data/help_en_EN/Projections.html
share/hugin/xrc/data/help_en_EN/Pto2mk.html
+share/hugin/xrc/data/help_en_EN/Pto_merge.html
share/hugin/xrc/data/help_en_EN/QTVR.html
share/hugin/xrc/data/help_en_EN/Qtvr2img.html
share/hugin/xrc/data/help_en_EN/RAW.html
@@ -559,6 +573,7 @@ share/hugin/xrc/data/optimize.png
share/hugin/xrc/data/pause.png
share/hugin/xrc/data/preview.png
share/hugin/xrc/data/preview_auto_update.png
+share/hugin/xrc/data/preview_layout_small.png
share/hugin/xrc/data/preview_num_transform.png
share/hugin/xrc/data/preview_show_all.png
share/hugin/xrc/data/preview_show_none.png
@@ -583,13 +598,13 @@ share/hugin/xrc/lens_panel.xrc
share/hugin/xrc/main_frame.xrc
share/hugin/xrc/main_menu.xrc
share/hugin/xrc/main_tool.xrc
+share/hugin/xrc/mask_editor_panel.xrc
share/hugin/xrc/optimize_panel.xrc
share/hugin/xrc/optimize_photo_panel.xrc
share/hugin/xrc/pano_panel.xrc
share/hugin/xrc/pref_dialog.xrc
share/hugin/xrc/preview_frame.xrc
share/hugin/xrc/reset_dialog.xrc
-share/hugin/xrc/vig_corr_dlg.xrc
share/icons/
share/icons/gnome/
share/icons/gnome/48x48/
