Attachment #227750 for bug #258355

View | Details | Raw Unified | Return to bug 258355
Collapse All | Expand All




# Created by: Carlos Eduardo G. Carvalho <cartola@openit.com.br>

PORTNAME=	hugin
PORTVERSION=	2020.0.0
PORTREVISION=	14
CATEGORIES=	graphics
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}

MAINTAINER=	fuz@fuz.su
COMMENT=	GUI for Panorama Tools, to stitch panoramic images

LICENSE=	GPLv2

LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
		libImath.so:math/Imath \
		libboost_thread.so:devel/boost-libs \

		exiftool:graphics/p5-Image-ExifTool \
		gmake:devel/gmake

LICENSE=	GPLv2

CFLAGS+=	-I${LOCALBASE}/include/Imath

BROKEN_i386=	Fails to build: ld: error: src/hugin_base/libhuginbase.so.0.0: undefined reference to __atomic_load

USES=		cmake compiler:c++11-lib desktop-file-utils gettext gl gnome \
	jpeg pkgconfig shared-mime-info shebangfix sqlite tar:bzip2 xorg
CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}
USE_GL=		gl glew glu glut
INSTALLS_ICONS=	yes
USE_WX=		3.0+
USE_XORG=	x11

INSTALLS_ICONS=	yes

SHEBANG_FILES=	src/hugin_script_interface/hpi.py \
		src/hugin_script_interface/plugins/*.py \
		src/hugin_script_interface/plugins-dev/*.py

CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}
CFLAGS+=	-I${LOCALBASE}/include/Imath

OPTIONS_DEFINE=		PANOMATIC AUTOPANOSIFTC PYTHON
OPTIONS_DEFAULT=	PANOMATIC PYTHON
OPTIONS_SUB=		yes

AUTOPANOSIFTC_RUN_DEPENDS=	autopano:graphics/autopano-sift-c

PYTHON_DESC=		Python Scripting Interface
PYTHON_USES=		python
PYTHON_BUILD_DEPENDS=	swig:devel/swig
PYTHON_USES=		python
PYTHON_CMAKE_ON=	-DBUILD_HSI=ON
PYTHON_CMAKE_OFF=	-DBUILD_HSI=OFF


Lines 1-3 Link Here

(-)b/graphics/hugin/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1578804282	1	TIMESTAMP = 1631023500
2	SHA256 (hugin-2019.2.0.tar.bz2) = 8ba6bdfea246313f142f17f42e066c6888f51b72e4f8814b5e1c84ff56a95a3e	2	SHA256 (hugin-2020.0.0.tar.bz2) = 283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb
3	SIZE (hugin-2019.2.0.tar.bz2) = 10335030	3	SIZE (hugin-2020.0.0.tar.bz2) = 10371301




--- CMakeModules/FindOpenEXR.cmake.orig	2021-09-07 14:16:50 UTC
+++ CMakeModules/FindOpenEXR.cmake
@@ -35,7 +35,7 @@ ENDIF (NOT WIN32 OR MINGW)
   include(FindLibraryWithDebug)
   find_library_with_debug(OPENEXR_HALF_LIBRARY 
     WIN32_DEBUG_POSTFIX d
-    NAMES Half-2_5 Half-2_4 Half-2_3 Half
+    NAMES Imath
     PATHS
       ${_OPENEXRLinkDir}

 
   find_library_with_debug(OPENEXR_IEX_LIBRARY
     WIN32_DEBUG_POSTFIX d
-    NAMES Iex-2_5 Iex-2_4 Iex-2_3 Iex-2_2 Iex
+    NAMES Iex
     PATHS
       ${_OPENEXRLinkDir}
       ${SYSTEM_LIB_DIRS}
@@ -55,7 +55,7 @@ ENDIF (NOT WIN32 OR MINGW)
 
   find_library_with_debug(OPENEXR_ILMTHREAD_LIBRARY 
     WIN32_DEBUG_POSTFIX d
-    NAMES IlmThread-2_5 IlmThread-2_4 IlmThread-2_3 IlmThread-2_2 IlmThread
+    NAMES IlmThread
     PATHS
       ${_OPENEXRLinkDir}
       ${SYSTEM_LIB_DIRS}
@@ -65,7 +65,7 @@ ENDIF (NOT WIN32 OR MINGW)
   
   find_library_with_debug(OPENEXR_IMATH_LIBRARY 
     WIN32_DEBUG_POSTFIX d
-    NAMES Imath-2_5 Imath-2_4 Imath-2_3 Imath-2_2 Imath
+    NAMES Imath
     PATHS
       ${_OPENEXRLinkDir}
       ${SYSTEM_LIB_DIRS}
@@ -76,7 +76,7 @@ ENDIF (NOT WIN32 OR MINGW)
   
   find_library_with_debug(OPENEXR_ILMIMF_LIBRARY 
     WIN32_DEBUG_POSTFIX d
-    NAMES IlmImf-2_5 IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf 
+    NAMES OpenEXR
     PATHS
       ${_OPENEXRLinkDir}




man/man1/hugin_executor.1.gz
man/man1/hugin_hdrmerge.1.gz
man/man1/hugin_lensdb.1.gz
man/man1/hugin_stacker.1.gz
man/man1/hugin_stitch_project.1.gz
man/man1/icpfind.1.gz
man/man1/linefind.1.gz

man/man1/tca_correct.1.gz
man/man1/verdandi.1.gz
man/man1/vig_optimize.1.gz
share/appdata/PTBatcherGUI.appdata.xml
share/appdata/calibrate_lens_gui.appdata.xml
share/appdata/hugin.appdata.xml
share/applications/PTBatcherGUI.desktop
share/applications/calibrate_lens_gui.desktop
share/applications/hugin.desktop

%%DATADIR%%/xrc/pref_dialog.xrc
%%DATADIR%%/xrc/preview_frame.xrc
%%DATADIR%%/xrc/reset_dialog.xrc
share/icons/gnome/48x48/mimetypes/application-x-ptoptimizer-script.png
share/icons/hicolor/128x128/apps/hugin.png
share/icons/hicolor/128x128/apps/ptbatcher.png
share/icons/hicolor/16x16/apps/hugin.png

share/locale/sv/LC_MESSAGES/hugin.mo
share/locale/zh_CN/LC_MESSAGES/hugin.mo
share/locale/zh_TW/LC_MESSAGES/hugin.mo
share/metainfo/PTBatcherGUI.appdata.xml
share/metainfo/calibrate_lens_gui.appdata.xml
share/metainfo/hugin.appdata.xml
share/mime/packages/hugin.xml
- 

Return to bug 258355

Lines 1-14 Link Here

(-)b/graphics/hugin/Makefile (-11 / +9 lines)
1	# Created by: Carlos Eduardo G. Carvalho <cartola@openit.com.br>	1	# Created by: Carlos Eduardo G. Carvalho <cartola@openit.com.br>
2		2
3	PORTNAME= hugin	3	PORTNAME= hugin
4	PORTVERSION= 2019.2.0	4	PORTVERSION= 2020.0.0
5	PORTREVISION= 14
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}	6	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= fuz@fuz.su
10	COMMENT= GUI for Panorama Tools, to stitch panoramic images	9	COMMENT= GUI for Panorama Tools, to stitch panoramic images
11		10
		11	LICENSE= GPLv2
		12
12	LIB_DEPENDS= libOpenEXR.so:graphics/openexr \	13	LIB_DEPENDS= libOpenEXR.so:graphics/openexr \
13	libImath.so:math/Imath \	14	libImath.so:math/Imath \
14	libboost_thread.so:devel/boost-libs \	15	libboost_thread.so:devel/boost-libs \
Lines 24-48 RUN_DEPENDS= enblend>=4.1.4:graphics/enblend \ Link Here
24	exiftool:graphics/p5-Image-ExifTool \	25	exiftool:graphics/p5-Image-ExifTool \
25	gmake:devel/gmake	26	gmake:devel/gmake
26		27
27	LICENSE= GPLv2
28
29	CFLAGS+= -I${LOCALBASE}/include/Imath
30
31	BROKEN_i386= Fails to build: ld: error: src/hugin_base/libhuginbase.so.0.0: undefined reference to __atomic_load
32		28
33	USES= cmake compiler:c++11-lib desktop-file-utils gettext gl gnome \	29	USES= cmake compiler:c++11-lib desktop-file-utils gettext gl gnome \
34	jpeg pkgconfig shared-mime-info shebangfix sqlite tar:bzip2 xorg	30	jpeg pkgconfig shared-mime-info shebangfix sqlite tar:bzip2 xorg
35	CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}
36	USE_GL= gl glew glu glut	31	USE_GL= gl glew glu glut
		32	INSTALLS_ICONS= yes
37	USE_WX= 3.0+	33	USE_WX= 3.0+
38	USE_XORG= x11	34	USE_XORG= x11
39		35
40	INSTALLS_ICONS= yes
41		36
42	SHEBANG_FILES= src/hugin_script_interface/hpi.py \	37	SHEBANG_FILES= src/hugin_script_interface/hpi.py \
43	src/hugin_script_interface/plugins/*.py \	38	src/hugin_script_interface/plugins/*.py \
44	src/hugin_script_interface/plugins-dev/*.py	39	src/hugin_script_interface/plugins-dev/*.py
45		40
		41	CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}
		42	CFLAGS+= -I${LOCALBASE}/include/Imath
		43
46	OPTIONS_DEFINE= PANOMATIC AUTOPANOSIFTC PYTHON	44	OPTIONS_DEFINE= PANOMATIC AUTOPANOSIFTC PYTHON
47	OPTIONS_DEFAULT= PANOMATIC PYTHON	45	OPTIONS_DEFAULT= PANOMATIC PYTHON
48	OPTIONS_SUB= yes	46	OPTIONS_SUB= yes
Lines 54-61 AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c Link Here
54	AUTOPANOSIFTC_RUN_DEPENDS= autopano:graphics/autopano-sift-c	52	AUTOPANOSIFTC_RUN_DEPENDS= autopano:graphics/autopano-sift-c
55		53
56	PYTHON_DESC= Python Scripting Interface	54	PYTHON_DESC= Python Scripting Interface
57	PYTHON_USES= python
58	PYTHON_BUILD_DEPENDS= swig:devel/swig	55	PYTHON_BUILD_DEPENDS= swig:devel/swig
		56	PYTHON_USES= python
59	PYTHON_CMAKE_ON= -DBUILD_HSI=ON	57	PYTHON_CMAKE_ON= -DBUILD_HSI=ON
60	PYTHON_CMAKE_OFF= -DBUILD_HSI=OFF	58	PYTHON_CMAKE_OFF= -DBUILD_HSI=OFF
61		59

Lines 1-10 Link Here

(-)b/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake (-4 / +22 lines)
1	--- CMakeModules/FindOpenEXR.cmake.orig 2019-12-07 08:35:27 UTC	1	--- CMakeModules/FindOpenEXR.cmake.orig 2021-09-07 14:16:50 UTC
2	+++ CMakeModules/FindOpenEXR.cmake	2	+++ CMakeModules/FindOpenEXR.cmake
3	@@ -35,7 +35,7 @@ ENDIF (NOT WIN32 OR MINGW)	3	@@ -35,7 +35,7 @@ ENDIF (NOT WIN32 OR MINGW)
4	include(FindLibraryWithDebug)	4	include(FindLibraryWithDebug)
5	find_library_with_debug(OPENEXR_HALF_LIBRARY	5	find_library_with_debug(OPENEXR_HALF_LIBRARY
6	WIN32_DEBUG_POSTFIX d	6	WIN32_DEBUG_POSTFIX d
7	- NAMES Half-2_3 Half	7	- NAMES Half-2_5 Half-2_4 Half-2_3 Half
8	+ NAMES Imath	8	+ NAMES Imath
9	PATHS	9	PATHS
10	${_OPENEXRLinkDir}	10	${_OPENEXRLinkDir}
Lines 13-28 Link Here
13		13
14	find_library_with_debug(OPENEXR_IEX_LIBRARY	14	find_library_with_debug(OPENEXR_IEX_LIBRARY
15	WIN32_DEBUG_POSTFIX d	15	WIN32_DEBUG_POSTFIX d
16	- NAMES Iex-2_3 Iex-2_2 Iex	16	- NAMES Iex-2_5 Iex-2_4 Iex-2_3 Iex-2_2 Iex
17	+ NAMES Iex	17	+ NAMES Iex
18	PATHS	18	PATHS
19	${_OPENEXRLinkDir}	19	${_OPENEXRLinkDir}
20	${SYSTEM_LIB_DIRS}	20	${SYSTEM_LIB_DIRS}
		21	@@ -55,7 +55,7 @@ ENDIF (NOT WIN32 OR MINGW)
		22
		23	find_library_with_debug(OPENEXR_ILMTHREAD_LIBRARY
		24	WIN32_DEBUG_POSTFIX d
		25	- NAMES IlmThread-2_5 IlmThread-2_4 IlmThread-2_3 IlmThread-2_2 IlmThread
		26	+ NAMES IlmThread
		27	PATHS
		28	${_OPENEXRLinkDir}
		29	${SYSTEM_LIB_DIRS}
		30	@@ -65,7 +65,7 @@ ENDIF (NOT WIN32 OR MINGW)
		31
		32	find_library_with_debug(OPENEXR_IMATH_LIBRARY
		33	WIN32_DEBUG_POSTFIX d
		34	- NAMES Imath-2_5 Imath-2_4 Imath-2_3 Imath-2_2 Imath
		35	+ NAMES Imath
		36	PATHS
		37	${_OPENEXRLinkDir}
		38	${SYSTEM_LIB_DIRS}
21	@@ -76,7 +76,7 @@ ENDIF (NOT WIN32 OR MINGW)	39	@@ -76,7 +76,7 @@ ENDIF (NOT WIN32 OR MINGW)
22		40
23	find_library_with_debug(OPENEXR_ILMIMF_LIBRARY	41	find_library_with_debug(OPENEXR_ILMIMF_LIBRARY
24	WIN32_DEBUG_POSTFIX d	42	WIN32_DEBUG_POSTFIX d
25	- NAMES IlmImf-2_3 IlmImf-2_2 IlmImf	43	- NAMES IlmImf-2_5 IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf
26	+ NAMES OpenEXR	44	+ NAMES OpenEXR
27	PATHS	45	PATHS
28	${_OPENEXRLinkDir}	46	${_OPENEXRLinkDir}

Lines 54-59 man/man1/hugin.1.gz Link Here

(-)b/graphics/hugin/pkg-plist (-5 / +5 lines)
54	man/man1/hugin_executor.1.gz	54	man/man1/hugin_executor.1.gz
55	man/man1/hugin_hdrmerge.1.gz	55	man/man1/hugin_hdrmerge.1.gz
56	man/man1/hugin_lensdb.1.gz	56	man/man1/hugin_lensdb.1.gz
		57	man/man1/hugin_stacker.1.gz
57	man/man1/hugin_stitch_project.1.gz	58	man/man1/hugin_stitch_project.1.gz
58	man/man1/icpfind.1.gz	59	man/man1/icpfind.1.gz
59	man/man1/linefind.1.gz	60	man/man1/linefind.1.gz
Lines 70-78 man/man1/pto_var.1.gz Link Here
70	man/man1/tca_correct.1.gz	71	man/man1/tca_correct.1.gz
71	man/man1/verdandi.1.gz	72	man/man1/verdandi.1.gz
72	man/man1/vig_optimize.1.gz	73	man/man1/vig_optimize.1.gz
73	share/appdata/PTBatcherGUI.appdata.xml
74	share/appdata/calibrate_lens_gui.appdata.xml
75	share/appdata/hugin.appdata.xml
76	share/applications/PTBatcherGUI.desktop	74	share/applications/PTBatcherGUI.desktop
77	share/applications/calibrate_lens_gui.desktop	75	share/applications/calibrate_lens_gui.desktop
78	share/applications/hugin.desktop	76	share/applications/hugin.desktop
Lines 564-570 share/applications/pto_gen.desktop Link Here
564	%%DATADIR%%/xrc/pref_dialog.xrc	562	%%DATADIR%%/xrc/pref_dialog.xrc
565	%%DATADIR%%/xrc/preview_frame.xrc	563	%%DATADIR%%/xrc/preview_frame.xrc
566	%%DATADIR%%/xrc/reset_dialog.xrc	564	%%DATADIR%%/xrc/reset_dialog.xrc
567	share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png	565	share/icons/gnome/48x48/mimetypes/application-x-ptoptimizer-script.png
568	share/icons/hicolor/128x128/apps/hugin.png	566	share/icons/hicolor/128x128/apps/hugin.png
569	share/icons/hicolor/128x128/apps/ptbatcher.png	567	share/icons/hicolor/128x128/apps/ptbatcher.png
570	share/icons/hicolor/16x16/apps/hugin.png	568	share/icons/hicolor/16x16/apps/hugin.png
Lines 599-602 share/locale/sk/LC_MESSAGES/hugin.mo Link Here
599	share/locale/sv/LC_MESSAGES/hugin.mo	597	share/locale/sv/LC_MESSAGES/hugin.mo
600	share/locale/zh_CN/LC_MESSAGES/hugin.mo	598	share/locale/zh_CN/LC_MESSAGES/hugin.mo
601	share/locale/zh_TW/LC_MESSAGES/hugin.mo	599	share/locale/zh_TW/LC_MESSAGES/hugin.mo
		600	share/metainfo/PTBatcherGUI.appdata.xml
		601	share/metainfo/calibrate_lens_gui.appdata.xml
		602	share/metainfo/hugin.appdata.xml
602	share/mime/packages/hugin.xml	603	share/mime/packages/hugin.xml
603	-