On 2011/03/12 17:07, Kirill Bychkov wrote:
> hugin builds and works fine under kde4.
btw, talking of hugin, here are diffs (both are needed) for
hugin 2011-2.0 beta2. the built-in control point generator is
considerably improved over 2010.4.0.
Index: libpano13/Makefile
===================================================================
RCS file: /cvs/ports/graphics/libpano13/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- libpano13/Makefile 17 Nov 2010 08:05:14 -0000 1.7
+++ libpano13/Makefile 12 Mar 2011 14:17:08 -0000
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.7 2010/11/17 08:05:14 espie Exp $
COMMENT = library for processing panoramic images
-DISTNAME = libpano13-2.9.17
+DISTNAME = libpano13-2.9.18_rc2
# the following are useful for rc/betas and don't hurt otherwise:
PKGNAME = ${DISTNAME:S/_//}
WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//}
-SHARED_LIBS += pano13 2.0
+SHARED_LIBS += pano13 2.1
CATEGORIES = graphics
HOMEPAGE = http://panotools.sourceforge.net/
Index: libpano13/distinfo
===================================================================
RCS file: /cvs/ports/graphics/libpano13/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- libpano13/distinfo 16 Sep 2010 07:52:54 -0000 1.4
+++ libpano13/distinfo 12 Mar 2011 14:17:08 -0000
@@ -1,5 +1,5 @@
-MD5 (libpano13-2.9.17.tar.gz) = VOx8UFzzhSHy+7birNLEMw==
-RMD160 (libpano13-2.9.17.tar.gz) = OlQpW/rbvTIAmoYoloxyPHAX8t8=
-SHA1 (libpano13-2.9.17.tar.gz) = QYaJmF6mIrwjTNTszsQhgMEoIbI=
-SHA256 (libpano13-2.9.17.tar.gz) = oiqwyS9Qqd4ThYqL1ODo3KknTEE5QUgrOCEE3gGfmf0=
-SIZE (libpano13-2.9.17.tar.gz) = 2735157
+MD5 (libpano13-2.9.18_rc2.tar.gz) = nDpPzotvHXnjlYls5dh3bg==
+RMD160 (libpano13-2.9.18_rc2.tar.gz) = IwncjZMqXqgMtLIr/6Pp05U5qlg=
+SHA1 (libpano13-2.9.18_rc2.tar.gz) = I4Sb29/JF2orU9FX5YvSSqDnJ24=
+SHA256 (libpano13-2.9.18_rc2.tar.gz) =
3l1OQ/FcNDDpXA+qHFDJUDUW4bVw0OwFIvYQpXjKoXI=
+SIZE (libpano13-2.9.18_rc2.tar.gz) = 2723032
Index: hugin/Makefile
===================================================================
RCS file: /cvs/ports/graphics/hugin/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- hugin/Makefile 2 Mar 2011 08:30:27 -0000 1.24
+++ hugin/Makefile 12 Mar 2011 14:17:08 -0000
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2011/03/02 08:30:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2010/11/17 08:05:14 espie Exp $
VMEM_WARNING = Yes
+SHARED_ONLY = Yes
COMMENT = panorama image stitcher
-DISTNAME = hugin-2010.4.0
+DISTNAME = hugin-2011.0.0_beta2
EXTRACT_SUFX = .tar.bz2
# not needed for releases, but makes RCs/betas easier to work with
@@ -35,9 +36,9 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB += GL GLEW GLU Half Iex Imath IlmImf IlmThread ICE SM X11
WANTLIB += Xext Xi Xmu boost_date_time-mt boost_filesystem-mt
WANTLIB += boost_iostreams-mt boost_regex-mt boost_signals-mt
-WANTLIB += boost_system-mt boost_thread-mt c
-WANTLIB += exiv2 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 += boost_system-mt boost_thread-mt c exiv2 glut>=4.1
+WANTLIB += jpeg m pano13>=2.0 png pthread stdc++ tiff wx_base
+WANTLIB += wx_base_net wx_base_xml wx_gtk2_adv wx_gtk2_aui
WANTLIB += wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_xrc z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/}
@@ -52,11 +53,11 @@ LIB_DEPENDS = devel/boost \
graphics/freeglut \
graphics/ilmbase \
graphics/jpeg \
- graphics/libpano13>=2.9.17rc1 \
+ graphics/libpano13>=2.9.18beta1 \
graphics/openexr \
graphics/png \
graphics/tiff \
- x11/wxWidgets
+ x11/wxWidgets>=2.7
USE_GROFF = Yes
MODULES += devel/cmake
Index: hugin/distinfo
===================================================================
RCS file: /cvs/ports/graphics/hugin/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- hugin/distinfo 2 Mar 2011 08:30:27 -0000 1.10
+++ hugin/distinfo 12 Mar 2011 14:17:08 -0000
@@ -1,5 +1,5 @@
-MD5 (hugin-2010.4.0.tar.bz2) = v9cWZVRhmHMSsvLwDJDcxQ==
-RMD160 (hugin-2010.4.0.tar.bz2) = +XuNN0cEQ+uBw+kV5fXvqRInsTU=
-SHA1 (hugin-2010.4.0.tar.bz2) = R/JcCouXwnEI5We80iIDyH8mjQc=
-SHA256 (hugin-2010.4.0.tar.bz2) = 1FzGXfa0JO9b8cXSzZmjYOz9pGaIeCx1823VNBy5w44=
-SIZE (hugin-2010.4.0.tar.bz2) = 11009978
+MD5 (hugin-2011.0.0_beta2.tar.bz2) = yO/x2G+gAuj6F+u9qCck4g==
+RMD160 (hugin-2011.0.0_beta2.tar.bz2) = 4VVrZB4Oov0tfkUBtaHbV9c7Xp4=
+SHA1 (hugin-2011.0.0_beta2.tar.bz2) = 1iWvgYzsDp+dvk0b/thFPFbdLYU=
+SHA256 (hugin-2011.0.0_beta2.tar.bz2) =
1fZ3nZfEA3EtY8GRRR52UK7kWo+RdowoAIuvGxrucKM=
+SIZE (hugin-2011.0.0_beta2.tar.bz2) = 11085738
Index: hugin/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/hugin/patches/patch-CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-CMakeLists_txt
--- hugin/patches/patch-CMakeLists_txt 20 Oct 2010 15:32:40 -0000 1.6
+++ hugin/patches/patch-CMakeLists_txt 12 Mar 2011 14:17:08 -0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-CMakeLists_txt,v 1.6 2010/10/20 15:32:40 sthen Exp $
---- 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)
+--- CMakeLists.txt.orig Sun Feb 27 23:42:41 2011
++++ CMakeLists.txt Mon Feb 28 08:23:05 2011
+@@ -151,6 +151,7 @@ ENDIF(WIN32)
+ # This must come before FINDs for tiff, jpeg, png, zlib to enable
# finding the wxWidgets distributions of those packages (Win32 only).
-
- SET(wxWidgets_USE_LIBS base core xrc html xml adv gl net)
+ SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net)
+SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
FIND_PACKAGE(wxWidgets REQUIRED)
Index: hugin/patches/patch-doc_CMakeLists_txt
===================================================================
RCS file: hugin/patches/patch-doc_CMakeLists_txt
diff -N hugin/patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ hugin/patches/patch-doc_CMakeLists_txt 12 Mar 2011 14:17:08 -0000
@@ -0,0 +1,40 @@
+$OpenBSD$
+--- doc/CMakeLists.txt.orig Mon Feb 28 13:30:22 2011
++++ doc/CMakeLists.txt Mon Feb 28 13:35:53 2011
+@@ -10,7 +10,6 @@ ELSE (WIN32)
+ # For all other systems, generate and install the man pages
+
+ FIND_PROGRAM(POD2MAN pod2man)
+-FIND_PROGRAM(GZIP gzip)
+
+ MACRO(install_man manfile section)
+ INSTALL(FILES ${manfile} DESTINATION ${MANDIR}/man${section})
+@@ -18,22 +17,21 @@ ENDMACRO(install_man)
+
+ MACRO(do_pod podfile manfile section)
+ IF(EXISTS "${CMAKE_SOURCE_DIR}/doc/${podfile}")
+- IF(POD2MAN AND GZIP)
++ IF(POD2MAN)
+ # Try to install compressed manual
+ SET(outfile "${manfile}.${section}")
+ # TODO: fix the unaesthetic double quotes in which the
HUGIN_PACKAGE_VERSION
+ # is displayed on the resulting man page
+ ADD_CUSTOM_COMMAND(
+- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${outfile}.gz"
++ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${outfile}"
+ COMMAND ${POD2MAN} --section="${section}" --release="Version:
${HUGIN_PACKAGE_VERSION}" --center=HUGIN "${CMAKE_SOURCE_DIR}/doc/${podfile}"
"${CMAKE_CURRENT_BINARY_DIR}/${outfile}"
+- COMMAND ${GZIP} "-f" "${CMAKE_CURRENT_BINARY_DIR}/${outfile}"
+ DEPENDS "${CMAKE_SOURCE_DIR}/doc/${podfile}"
+ VERBATIM
+ )
+- SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${outfile}.gz"
GENERATED)
+- install_man("${CMAKE_CURRENT_BINARY_DIR}/${outfile}.gz" ${section})
+- LIST(APPEND ManDeps "${CMAKE_CURRENT_BINARY_DIR}/${outfile}.gz")
+- ENDIF(POD2MAN AND GZIP)
++ SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${outfile}"
GENERATED)
++ install_man("${CMAKE_CURRENT_BINARY_DIR}/${outfile}" ${section})
++ LIST(APPEND ManDeps "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
++ ENDIF(POD2MAN)
+ ENDIF()
+ ENDMACRO(do_pod)
+
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.3
diff -u -p -r1.3 patch-src_hugin1_base_wx_RunStitchPanel_cpp
--- hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp 2 Mar 2011
08:30:27 -0000 1.3
+++ hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp 12 Mar 2011
14:17:08 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_hugin1_base_wx_RunStitchPanel_cpp,v 1.3 2011/03/02
08:30:27 sthen Exp $
+$OpenBSD: patch-src_hugin1_base_wx_RunStitchPanel_cpp,v 1.2 2010/10/20
15:32:40 sthen Exp $
--- src/hugin1/base_wx/RunStitchPanel.cpp.orig Tue Dec 28 12:57:50 2010
+++ src/hugin1/base_wx/RunStitchPanel.cpp Tue Feb 8 11:03:12 2011
@@ -112,7 +112,7 @@ wxString getGNUMakeCmd(const wxString &args)
Index: hugin/pkg/PFRAG.shared
===================================================================
RCS file: hugin/pkg/PFRAG.shared
diff -N hugin/pkg/PFRAG.shared
--- hugin/pkg/PFRAG.shared 2 Mar 2011 08:30:27 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2011/03/02 08:30:27 sthen Exp $
-@lib lib/hugin/libceleste.so.${LIBceleste_VERSION}
-@lib lib/hugin/libhuginANN.so.${LIBhuginANN_VERSION}
-@lib lib/hugin/libhuginbase.so.${LIBhuginbase_VERSION}
-@lib lib/hugin/libhuginbasewx.so.${LIBhuginbasewx_VERSION}
-@lib lib/hugin/libhuginvigraimpex.so.${LIBhuginvigraimpex_VERSION}
-@lib lib/hugin/libicpfindlib.so.${LIBicpfindlib_VERSION}
-@lib lib/hugin/liblocalfeatures.so.${LIBlocalfeatures_VERSION}
-@lib lib/hugin/libmakefilelib.so.${LIBmakefilelib_VERSION}
Index: hugin/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/hugin/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- hugin/pkg/PLIST 2 Mar 2011 08:30:27 -0000 1.7
+++ hugin/pkg/PLIST 12 Mar 2011 14:17:08 -0000
@@ -1,5 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.7 2011/03/02 08:30:27 sthen Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST,v 1.6 2010/10/20 15:32:40 sthen Exp $
+lib/hugin/
+@lib lib/hugin/libceleste.so.${LIBceleste_VERSION}
+lib/hugin/libflann_cpp.so
+@lib lib/hugin/libhuginANN.so.${LIBhuginANN_VERSION}
+@lib lib/hugin/libhuginbase.so.${LIBhuginbase_VERSION}
+@lib lib/hugin/libhuginbasewx.so.${LIBhuginbasewx_VERSION}
+@lib lib/hugin/libhuginvigraimpex.so.${LIBhuginvigraimpex_VERSION}
+@lib lib/hugin/libicpfindlib.so.${LIBicpfindlib_VERSION}
+@lib lib/hugin/liblocalfeatures.so.${LIBlocalfeatures_VERSION}
+@lib lib/hugin/libmakefilelib.so.${LIBmakefilelib_VERSION}
@bin bin/PTBatcher
@bin bin/PTBatcherGUI
@bin bin/align_image_stack
@@ -25,7 +34,6 @@ bin/autopano-noop.sh
@bin bin/pto_merge
@bin bin/tca_correct
@bin bin/vig_optimize
-lib/hugin/
@man man/man1/PTBatcherGUI.1
@man man/man1/align_image_stack.1
@man man/man1/autooptimiser.1
@@ -76,6 +84,7 @@ share/hugin/xrc/data/center_pano.png
share/hugin/xrc/data/crop_tool.png
share/hugin/xrc/data/crop_tool_small.png
share/hugin/xrc/data/dedication.htm
+share/hugin/xrc/data/dedication.png
share/hugin/xrc/data/drag_tool.png
share/hugin/xrc/data/drag_tool_small.png
share/hugin/xrc/data/druid.control.128.png
@@ -577,7 +586,6 @@ share/hugin/xrc/data/info.png
share/hugin/xrc/data/keyboard_pl.html
share/hugin/xrc/data/list.png
share/hugin/xrc/data/logo.png
-share/hugin/xrc/data/milko.png
share/hugin/xrc/data/nona_enblend.mk
share/hugin/xrc/data/nona_multilayer.mk
share/hugin/xrc/data/nona_smartblend.mk
@@ -592,6 +600,8 @@ share/hugin/xrc/data/preview_layout_smal
share/hugin/xrc/data/preview_num_transform.png
share/hugin/xrc/data/preview_show_all.png
share/hugin/xrc/data/preview_show_none.png
+share/hugin/xrc/data/preview_white_balance.png
+share/hugin/xrc/data/preview_white_balance_small.png
share/hugin/xrc/data/ptbatcher.ico
share/hugin/xrc/data/ptbatcher.png
share/hugin/xrc/data/ptmender_enblend.mk
@@ -650,6 +660,7 @@ share/locale/ko/LC_MESSAGES/hugin.mo
share/locale/nl/LC_MESSAGES/hugin.mo
share/locale/pl/LC_MESSAGES/hugin.mo
share/locale/pt_BR/LC_MESSAGES/hugin.mo
+share/locale/ro/LC_MESSAGES/hugin.mo
share/locale/ru/LC_MESSAGES/hugin.mo
share/locale/sk/LC_MESSAGES/hugin.mo
share/locale/sl/LC_MESSAGES/hugin.mo
