X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=hugin.spec;h=618c5a4e9afe726539edc2595564de9a45c0f544;hb=HEAD;hp=f2cc93175acb10ca7896604d6b6b6471839f118f;hpb=aa328ce5442242f87b8b6f471b225bf718a93743;p=packages%2Fhugin.git

diff --git a/hugin.spec b/hugin.spec
index f2cc931..04d8c74 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,42 +1,55 @@
-#
-# Conditional build:
-%bcond_with	pano13			# use libpano13 instead of libpano12
-#
-%define		_beta	beta4
 Summary:	Toolchain to create panoramic images
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:		hugin
-Version:	0.7.0
-Release:	0.rc5.0.1
+Version:	2022.0.0
+Release:	2
 License:	GPL v2+
-Group:		Applications/Graphics
-Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}_rc5.tar.gz
-# Source0-md5:	cd99ce8985aec47b93e300c2be695680
-Patch0:		%{name}-pl.po-update.patch
-Patch1:		%{name}-asneeded.patch
-Patch2:		%{name}-cppflags.patch
-URL:		http://hugin.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
-BuildRequires:	boost-devel >= 1.35.0
-BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 1:2.0.3
+Group:		X11/Applications/Graphics
+Source0:	https://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
+# Source0-md5:	76bbd3d0debc8c8483192d832b9377fd
+Patch0:		%{name}-cppflags.patch
+Patch1:		python-install.patch
+Patch2:		%{name}-exiv2.patch
+URL:		https://hugin.sourceforge.io/
+BuildRequires:	OpenEXR-devel
+BuildRequires:	OpenGL-glut-devel
+BuildRequires:	ZThread-devel
+BuildRequires:	boost-devel >= 1.47.0
+BuildRequires:	cmake >= 3.8
+BuildRequires:	exiv2-devel
+BuildRequires:	fftw3-devel >= 3
+BuildRequires:	flann-devel >= 1.9.2-4
+BuildRequires:	gettext-tools
+BuildRequires:	glew-devel
+BuildRequires:	gtk+3-devel
+BuildRequires:	lcms2-devel >= 2
+BuildRequires:	lensfun-devel
+BuildRequires:	libgomp-devel
 BuildRequires:	libjpeg-devel
-%{!?with_pano13:BuildRequires:	libpano12-devel >= 2.8.1}
-%{?with_pano13:BuildRequires:	libpano13-devel}
+BuildRequires:	libpano13-devel >= 2.9.19
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	libtool >= 2:1.5
+BuildRequires:	perl-Image-ExifTool
+BuildRequires:	perl-tools-pod
+BuildRequires:	pkgconfig
+BuildRequires:	python3-devel >= 1:3.0
+BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRequires:	sed >= 4.0
-BuildRequires:	wxGTK2-unicode-devel >= 2.6.0
-BuildRequires:	zip
+BuildRequires:	sqlite3-devel >= 3
+BuildRequires:	swig-python >= 2.0.4
+BuildRequires:	tclap
+BuildRequires:	vigra-devel >= 1.11.1-14
+BuildRequires:	wxGTK3-unicode-devel >= 2.8.10
+BuildRequires:	wxGTK3-unicode-gl-devel >= 2.8.10
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	zlib-devel
-%{!?with_pano13:BuildConflicts:	libpano13-devel}
-%{!?with_pano13:Requires:	libpano12 >= 2.8.1}
-%{?with_pano13:Requires:	libpano13}
-Suggests:	autopano-sift
-Suggests:	enblend >= 2.4
+Requires:	libpano13 >= 2.9.19
+Requires:	wxGTK3-unicode >= 2.8.10
+Requires:	wxGTK3-unicode-gl >= 2.8.10
+Suggests:	enblend-enfuse >= 3.1
+# exiftool program
+Suggests:	perl-Image-ExifTool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,68 +57,155 @@ With hugin you can assemble a mosaic of photographs into a complete
 immensive panorama, stitch any series of overlapping pictures and much
 more.
 
-Note: Hugin can use autopano-sift package to match images and enblend
-package for soft blending, so you'll probably want to install them
-too.
+Note: Hugin can use enblend and enfuse for soft blending/fusing, so
+you'll probably to install enblend-enfuse package too.
 
 %description -l pl.UTF-8
 Przy użyciu hugina można połączyć wiele fotografii w kompletną, dużą
 panoramę, skleić dowolny ciąg nakładających się zdjęć i wiele więcej.
 
-Hugin może używać pakietu autopano-sift do dopasowania zdjęć oraz
-pakiet enblend do wygładzenia krawędzi po łączeniu - więc warto te
-pakiety także zainstalować.
+Hugin może używać programów enblend i enfuse do wygładzania krawędzi i
+ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 
 %prep
-%setup -q 
-# %%patch0 -p1
+%setup -q
+%patch0 -p1
 %patch1 -p1
-%patch2
+%patch2 -p1
 
-#sed -i -e 's/ca_ES/ca/;s/cs_CZ/cs/;' src/hugin/po/LINGUAS
-mv -f src/translations/{ca_ES,ca}.po
-mv -f src/translations/{cs_CZ,cs}.po
-# missing in LINGUAS
-# echo 'cs'>> src/nona_gui/po/LINGUAS
+# Old, broken duplicate of the system cmake one
+%{__rm} CMakeModules/FindZLIB.cmake
+
+%{__mv} src/translations/{cs_CZ,cs}.po
+
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
+	src/hugin_script_interface/hpi.py \
+	src/hugin_script_interface/plugins/top_five.py \
+	src/hugin_script_interface/plugins/woa.py \
+	src/hugin_script_interface/plugins-dev/dual_use.py \
+	src/hugin_script_interface/plugins-dev/plugin_skeleton.py
 
 %build
 install -d build
 cd build
+%cmake .. \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DBUILD_HSI:BOOL=ON \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
+	-DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-gtk3-unicode-config
 
-export CPPFLAGS="%{rpmcppflags}"  
-%cmake \
-	-DCMAKE_BUILD_TYPE:STRING="None" \
-	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-gtk2-ansi-config \
-	..
-%{__make} VERBOSE=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	gnomemimeicondir=%{_iconsdir}/hicolor/48x48/mimetypes
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ca_ES,ca}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ca_ES@valencia,ca@valencia}
+
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
 
-# "hugin" and "nona_gui" domains
-%find_lang %{name} --all-name
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog LICENCE_JHEAD LICENCE_VIGRA NEWS README TODO
+%doc AUTHORS Changes.txt README TODO src/celeste/LICENCE_{GABOR,LIBSVM}
+%attr(755,root,root) %{_bindir}/PTBatcherGUI
+%attr(755,root,root) %{_bindir}/align_image_stack
 %attr(755,root,root) %{_bindir}/autooptimiser
-%attr(755,root,root) %{_bindir}/color_correct_tiff
+%attr(755,root,root) %{_bindir}/calibrate_lens_gui
+%attr(755,root,root) %{_bindir}/celeste_standalone
+%attr(755,root,root) %{_bindir}/checkpto
+%attr(755,root,root) %{_bindir}/cpclean
+%attr(755,root,root) %{_bindir}/cpfind
+%attr(755,root,root) %{_bindir}/deghosting_mask
 %attr(755,root,root) %{_bindir}/fulla
+%attr(755,root,root) %{_bindir}/geocpset
 %attr(755,root,root) %{_bindir}/hugin
+%attr(755,root,root) %{_bindir}/hugin_executor
+%attr(755,root,root) %{_bindir}/hugin_hdrmerge
+%attr(755,root,root) %{_bindir}/hugin_lensdb
+%attr(755,root,root) %{_bindir}/hugin_stacker
+%attr(755,root,root) %{_bindir}/hugin_stitch_project
+%attr(755,root,root) %{_bindir}/icpfind
+%attr(755,root,root) %{_bindir}/linefind
 %attr(755,root,root) %{_bindir}/nona
-%attr(755,root,root) %{_bindir}/nona_gui
-%attr(755,root,root) %{_bindir}/zhang_undistort
+%attr(755,root,root) %{_bindir}/pano_modify
+%attr(755,root,root) %{_bindir}/pano_trafo
+%attr(755,root,root) %{_bindir}/pto_gen
+%attr(755,root,root) %{_bindir}/pto_lensstack
+%attr(755,root,root) %{_bindir}/pto_mask
+%attr(755,root,root) %{_bindir}/pto_merge
+%attr(755,root,root) %{_bindir}/pto_move
+%attr(755,root,root) %{_bindir}/pto_template
+%attr(755,root,root) %{_bindir}/pto_var
+%attr(755,root,root) %{_bindir}/tca_correct
+%attr(755,root,root) %{_bindir}/verdandi
+%attr(755,root,root) %{_bindir}/vig_optimize
+%dir %{_libdir}/hugin
+%attr(755,root,root) %{_libdir}/hugin/libceleste.so.*.*
+%attr(755,root,root) %{_libdir}/hugin/libhuginbase.so.*.*
+%attr(755,root,root) %{_libdir}/hugin/libhuginbasewx.so.*.*
+%attr(755,root,root) %{_libdir}/hugin/libicpfindlib.so.*.*
+%attr(755,root,root) %{_libdir}/hugin/liblocalfeatures.so.*.*
+%attr(755,root,root) %{_libdir}/hugin/libhugin_python_interface.so.*.*
+%attr(755,root,root) %{py3_sitedir}/_hsi.so
+%{py3_sitedir}/hpi.py*
+%{py3_sitedir}/hsi.py*
+%{py3_sitedir}/__pycache__/hpi.cpython-*.py[co]
+%{py3_sitedir}/__pycache__/hsi.cpython-*.py[co]
 %{_datadir}/%{name}
+%{_datadir}/metainfo/PTBatcherGUI.appdata.xml
+%{_datadir}/metainfo/calibrate_lens_gui.appdata.xml
+%{_datadir}/metainfo/hugin.appdata.xml
 %{_datadir}/mime/packages/hugin.xml
 %{_desktopdir}/hugin.desktop
-%{_iconsdir}/hicolor/*/mimetypes/*.png
-%{_pixmapsdir}/hugin.png
+%{_desktopdir}/pto_gen.desktop
+%{_desktopdir}/PTBatcherGUI.desktop
+%{_desktopdir}/calibrate_lens_gui.desktop
+%{_iconsdir}/hicolor/*x*/apps/hugin.png
+%{_iconsdir}/hicolor/*x*/apps/ptbatcher.png
+%{_iconsdir}/hicolor/*x*/mimetypes/application-x-ptoptimizer-script.png
+%{_iconsdir}/hicolor/scalable/apps/hugin.svg
+%{_iconsdir}/hicolor/scalable/apps/ptbatcher.svg
+%{_mandir}/man1/PTBatcherGUI.1*
+%{_mandir}/man1/align_image_stack.1*
+%{_mandir}/man1/autooptimiser.1*
+%{_mandir}/man1/calibrate_lens_gui.1*
+%{_mandir}/man1/celeste_standalone.1*
+%{_mandir}/man1/checkpto.1*
+%{_mandir}/man1/cpclean.1*
+%{_mandir}/man1/cpfind.1*
+%{_mandir}/man1/deghosting_mask.1*
 %{_mandir}/man1/fulla.1*
+%{_mandir}/man1/geocpset.1*
+%{_mandir}/man1/hugin.1*
+%{_mandir}/man1/hugin_executor.1*
+%{_mandir}/man1/hugin_hdrmerge.1*
+%{_mandir}/man1/hugin_lensdb.1*
+%{_mandir}/man1/hugin_stacker.1*
+%{_mandir}/man1/hugin_stitch_project.1*
+%{_mandir}/man1/icpfind.1*
+%{_mandir}/man1/linefind.1*
+%{_mandir}/man1/nona.1*
+%{_mandir}/man1/pano_modify.1*
+%{_mandir}/man1/pano_trafo.1*
+%{_mandir}/man1/pto_gen.1*
+%{_mandir}/man1/pto_lensstack.1*
+%{_mandir}/man1/pto_merge.1*
+%{_mandir}/man1/pto_mask.1*
+%{_mandir}/man1/pto_move.1*
+%{_mandir}/man1/pto_template.1*
+%{_mandir}/man1/pto_var.1*
+%{_mandir}/man1/tca_correct.1*
+%{_mandir}/man1/vig_optimize.1*
+%{_mandir}/man1/verdandi.1*