Attachment #238921 for bug #268465

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

Lines 1-6 Link Here

(-)b/graphics/hugin/Makefile (-3 / +4 lines)
1	PORTNAME= hugin	1	PORTNAME= hugin
2	DISTVERSION= 2021.0.0	2	DISTVERSION= 2022.0.0
3	PORTREVISION= 2
4	CATEGORIES= graphics	3	CATEGORIES= graphics
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}	4	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
6		5
Lines 19-25 LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ Link Here
19	libpano13.so:graphics/libpano13 \	18	libpano13.so:graphics/libpano13 \
20	libvigraimpex.so:graphics/vigra \	19	libvigraimpex.so:graphics/vigra \
21	libpng.so:graphics/png \	20	libpng.so:graphics/png \
22	libtiff.so:graphics/tiff	21	libtiff.so:graphics/tiff \
		22	libflann.so:math/flann \
		23	liblz4.so:archivers/liblz4
23	# gmake is really needed at _runtime_. Do not remove it from this list.	24	# gmake is really needed at _runtime_. Do not remove it from this list.
24	RUN_DEPENDS= enblend>=4.1.4:graphics/enblend \	25	RUN_DEPENDS= enblend>=4.1.4:graphics/enblend \
25	exiftool:graphics/p5-Image-ExifTool \	26	exiftool:graphics/p5-Image-ExifTool \

Lines 1-3 Link Here

(-)b/graphics/hugin/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1640875897	1	TIMESTAMP = 1671372561
2	SHA256 (hugin-2021.0.0.tar.bz2) = 047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9	2	SHA256 (hugin-2022.0.0.tar.bz2) = 97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7
3	SIZE (hugin-2021.0.0.tar.bz2) = 10333565	3	SIZE (hugin-2022.0.0.tar.bz2) = 10374360




--- 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}
       ${SYSTEM_LIB_DIRS}
@@ -45,7 +45,7 @@ ENDIF (NOT WIN32 OR MINGW)
 
   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}
       ${SYSTEM_LIB_DIRS}




share/applications/calibrate_lens_gui.desktop
share/applications/hugin.desktop
share/applications/pto_gen.desktop
%%DATADIR%%/data/assistant/duallens.assistant
%%DATADIR%%/data/assistant/multirow.assistant
%%DATADIR%%/data/assistant/normal.assistant
%%DATADIR%%/data/assistant/scanned.assistant
%%DATADIR%%/data/assistant/scanned2.assistant
%%DATADIR%%/data/assistant/stacked.assistant
%%DATADIR%%/data/celeste.model
%%DATADIR%%/data/default.setting
%%DATADIR%%/data/duallens.assistant
%%DATADIR%%/data/expressions.ini
%%DATADIR%%/data/focus_stack.executor
%%DATADIR%%/data/fused_layers.executor
%%DATADIR%%/data/hdr_pano.executor
%%DATADIR%%/data/hugin_exiftool_copy.arg
%%DATADIR%%/data/hugin_exiftool_final_example.arg
%%DATADIR%%/data/hugin_rt.pp3
%%DATADIR%%/data/output/blended_stacks.executor
%%DATADIR%%/data/output/focus_stack.executor
%%DATADIR%%/data/output/fused_layers.executor
%%DATADIR%%/data/output/hdr_pano.executor
%%DATADIR%%/data/output/median_stack.executor
%%DATADIR%%/data/output/normal_enblend.executor
%%DATADIR%%/data/output/normal_enblend_cubic.executor
%%DATADIR%%/data/output/normal_layered_tiff.executor
%%DATADIR%%/data/output/normal_smartblend.executor
%%DATADIR%%/data/output/zeronoise.executor
%%DATADIR%%/data/plugins-templates/dual_use.py
%%DATADIR%%/data/plugins-templates/plugin_skeleton.py
%%DATADIR%%/data/plugins/README_woa.txt
%%DATADIR%%/data/plugins/top_five.py
%%DATADIR%%/data/plugins/woa.py
%%DATADIR%%/data/scanned.assistant
%%DATADIR%%/data/scanned2.assistant
%%DATADIR%%/data/stacked.assistant
%%DATADIR%%/data/zeronoise.executor
%%DATADIR%%/xrc/about.xrc
%%DATADIR%%/xrc/batch_frame.xrc
%%DATADIR%%/xrc/batch_menu.xrc

%%DATADIR%%/xrc/data/keyboard_pl.html
%%DATADIR%%/xrc/data/list.png
%%DATADIR%%/xrc/data/logo.png
%%DATADIR%%/xrc/data/number1.png
%%DATADIR%%/xrc/data/number2.png
%%DATADIR%%/xrc/data/number3.png
%%DATADIR%%/xrc/data/optimize.png
%%DATADIR%%/xrc/data/output_blended_fused.png
%%DATADIR%%/xrc/data/output_fused_blended.png
- 

Return to bug 268465

Removed Link Here

(-)a/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake (-47 lines)
1	--- CMakeModules/FindOpenEXR.cmake.orig 2021-09-07 14:16:50 UTC
2	+++ CMakeModules/FindOpenEXR.cmake
3	@@ -35,7 +35,7 @@ ENDIF (NOT WIN32 OR MINGW)
4	include(FindLibraryWithDebug)
5	find_library_with_debug(OPENEXR_HALF_LIBRARY
6	WIN32_DEBUG_POSTFIX d
7	- NAMES Half-2_5 Half-2_4 Half-2_3 Half
8	+ NAMES Imath
9	PATHS
10	${_OPENEXRLinkDir}
11	${SYSTEM_LIB_DIRS}
12	@@ -45,7 +45,7 @@ ENDIF (NOT WIN32 OR MINGW)
13
14	find_library_with_debug(OPENEXR_IEX_LIBRARY
15	WIN32_DEBUG_POSTFIX d
16	- NAMES Iex-2_5 Iex-2_4 Iex-2_3 Iex-2_2 Iex
17	+ NAMES Iex
18	PATHS
19	${_OPENEXRLinkDir}
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}
39	@@ -76,7 +76,7 @@ ENDIF (NOT WIN32 OR MINGW)
40
41	find_library_with_debug(OPENEXR_ILMIMF_LIBRARY
42	WIN32_DEBUG_POSTFIX d
43	- NAMES IlmImf-2_5 IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf
44	+ NAMES OpenEXR
45	PATHS
46	${_OPENEXRLinkDir}
47	${SYSTEM_LIB_DIRS}

Lines 75-107 share/applications/PTBatcherGUI.desktop Link Here

(-)b/graphics/hugin/pkg-plist (-17 / +19 lines)
75	share/applications/calibrate_lens_gui.desktop	75	share/applications/calibrate_lens_gui.desktop
76	share/applications/hugin.desktop	76	share/applications/hugin.desktop
77	share/applications/pto_gen.desktop	77	share/applications/pto_gen.desktop
78	%%DATADIR%%/data/blended_stacks.executor	78	%%DATADIR%%/data/assistant/duallens.assistant
		79	%%DATADIR%%/data/assistant/multirow.assistant
		80	%%DATADIR%%/data/assistant/normal.assistant
		81	%%DATADIR%%/data/assistant/scanned.assistant
		82	%%DATADIR%%/data/assistant/scanned2.assistant
		83	%%DATADIR%%/data/assistant/stacked.assistant
79	%%DATADIR%%/data/celeste.model	84	%%DATADIR%%/data/celeste.model
80	%%DATADIR%%/data/default.setting	85	%%DATADIR%%/data/default.setting
81	%%DATADIR%%/data/duallens.assistant
82	%%DATADIR%%/data/expressions.ini	86	%%DATADIR%%/data/expressions.ini
83	%%DATADIR%%/data/focus_stack.executor
84	%%DATADIR%%/data/fused_layers.executor
85	%%DATADIR%%/data/hdr_pano.executor
86	%%DATADIR%%/data/hugin_exiftool_copy.arg	87	%%DATADIR%%/data/hugin_exiftool_copy.arg
87	%%DATADIR%%/data/hugin_exiftool_final_example.arg	88	%%DATADIR%%/data/hugin_exiftool_final_example.arg
88	%%DATADIR%%/data/hugin_rt.pp3	89	%%DATADIR%%/data/hugin_rt.pp3
89	%%DATADIR%%/data/median_stack.executor	90	%%DATADIR%%/data/output/blended_stacks.executor
90	%%DATADIR%%/data/multirow.assistant	91	%%DATADIR%%/data/output/focus_stack.executor
91	%%DATADIR%%/data/normal.assistant	92	%%DATADIR%%/data/output/fused_layers.executor
92	%%DATADIR%%/data/normal_enblend.executor	93	%%DATADIR%%/data/output/hdr_pano.executor
93	%%DATADIR%%/data/normal_enblend_cubic.executor	94	%%DATADIR%%/data/output/median_stack.executor
94	%%DATADIR%%/data/normal_layered_tiff.executor	95	%%DATADIR%%/data/output/normal_enblend.executor
95	%%DATADIR%%/data/normal_smartblend.executor	96	%%DATADIR%%/data/output/normal_enblend_cubic.executor
		97	%%DATADIR%%/data/output/normal_layered_tiff.executor
		98	%%DATADIR%%/data/output/normal_smartblend.executor
		99	%%DATADIR%%/data/output/zeronoise.executor
96	%%DATADIR%%/data/plugins-templates/dual_use.py	100	%%DATADIR%%/data/plugins-templates/dual_use.py
97	%%DATADIR%%/data/plugins-templates/plugin_skeleton.py	101	%%DATADIR%%/data/plugins-templates/plugin_skeleton.py
98	%%DATADIR%%/data/plugins/README_woa.txt	102	%%DATADIR%%/data/plugins/README_woa.txt
99	%%DATADIR%%/data/plugins/top_five.py	103	%%DATADIR%%/data/plugins/top_five.py
100	%%DATADIR%%/data/plugins/woa.py	104	%%DATADIR%%/data/plugins/woa.py
101	%%DATADIR%%/data/scanned.assistant
102	%%DATADIR%%/data/scanned2.assistant
103	%%DATADIR%%/data/stacked.assistant
104	%%DATADIR%%/data/zeronoise.executor
105	%%DATADIR%%/xrc/about.xrc	105	%%DATADIR%%/xrc/about.xrc
106	%%DATADIR%%/xrc/batch_frame.xrc	106	%%DATADIR%%/xrc/batch_frame.xrc
107	%%DATADIR%%/xrc/batch_menu.xrc	107	%%DATADIR%%/xrc/batch_menu.xrc
Lines 507-512 share/applications/pto_gen.desktop Link Here
507	%%DATADIR%%/xrc/data/keyboard_pl.html	507	%%DATADIR%%/xrc/data/keyboard_pl.html
508	%%DATADIR%%/xrc/data/list.png	508	%%DATADIR%%/xrc/data/list.png
509	%%DATADIR%%/xrc/data/logo.png	509	%%DATADIR%%/xrc/data/logo.png
		510	%%DATADIR%%/xrc/data/number1.png
		511	%%DATADIR%%/xrc/data/number2.png
		512	%%DATADIR%%/xrc/data/number3.png
510	%%DATADIR%%/xrc/data/optimize.png	513	%%DATADIR%%/xrc/data/optimize.png
511	%%DATADIR%%/xrc/data/output_blended_fused.png	514	%%DATADIR%%/xrc/data/output_blended_fused.png
512	%%DATADIR%%/xrc/data/output_fused_blended.png	515	%%DATADIR%%/xrc/data/output_fused_blended.png
513	-