X-Git-Url: http://git.pld-linux.org/?p=packages%2Fhugin.git;a=blobdiff_plain;f=hugin.spec;h=3e83b8f861eb8a13d5a2614ae17c8c7410227f39;hp=c0105f4ff5af6238e1eabf053ff0dd008f7f4166;hb=8e10e47d19a60d1f7ae99756d1d2438882a541b8;hpb=f52dd92419e9014728fba878060b71b2b469cc47

diff --git a/hugin.spec b/hugin.spec
index c0105f4..3e83b8f 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,48 +1,50 @@
-#
-# 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
-Release:	0.%{_beta}.2.1
+Version:	2019.0.0
+Release:	3
 License:	GPL v2+
-Group:		Applications/Graphics
-Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}_%{_beta}.tar.bz2
-# Source0-md5:	28b69d85ae06a22fe9514f7f77e6dddb
-Patch0:		%{name}-pl.po-update.patch
-Patch1:		%{name}-defaults.patch
-Patch2:		%{name}-asneeded.patch
+Group:		X11/Applications/Graphics
+Source0:	http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
+# Source0-md5:	4ca039f96bfc592c4adcebe27b98fee3
+Patch1:		%{name}-cppflags.patch
+Patch3:		python-install.patch
+Patch4:		exiv2-0.27.patch
 URL:		http://hugin.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
-BuildRequires:	boost-any-devel >= 1.31
-BuildRequires:	boost-bind-devel >= 1.31
-BuildRequires:	boost-graph-devel >= 1.31
-BuildRequires:	boost-ref-devel >= 1.31
-BuildRequires:	boost-test-devel >= 1.31
-BuildRequires:	boost-thread-devel >= 1.31
-BuildRequires:	boost-uBLAS-devel >= 1.31
-BuildRequires:	gettext-devel
+BuildRequires:	OpenEXR-devel
+BuildRequires:	OpenGL-glut-devel
+BuildRequires:	ZThread-devel
+BuildRequires:	boost-devel >= 1.41.0
+BuildRequires:	cmake >= 2.8
+BuildRequires:	exiv2-devel
+BuildRequires:	flann-devel
+BuildRequires:	gettext-tools
+BuildRequires:	glew-devel
 BuildRequires:	gtk+2-devel >= 1:2.0.3
+BuildRequires:	lensfun-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:	python-devel
+BuildRequires:	rpmbuild(macros) >= 1.471
 BuildRequires:	sed >= 4.0
-BuildRequires:	wxGTK2-unicode-devel >= 2.6.0
-BuildRequires:	zip
+BuildRequires:	swig-python >= 2.0.4
+BuildRequires:	tclap
+BuildRequires:	vigra-devel
+BuildRequires:	wxGTK2-unicode-devel >= 2.8.10
+BuildRequires:	wxGTK2-unicode-gl-devel >= 2.8.10
 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:	wxGTK2-unicode >= 2.8.10
+Requires:	wxGTK2-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
@@ -50,71 +52,151 @@ 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 -n %{name}-%{version}_%{_beta}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-sed -i -e 's,/lib",/%{_lib}",' m4/ax_boost.m4
-sed -i -e 's/ca_ES/ca/;s/cs_CZ/cs/;' src/hugin/po/LINGUAS
-mv -f src/hugin/po/{ca_ES,ca}.po
-mv -f src/hugin/po/{cs_CZ,cs}.po
-# missing in LINGUAS
-echo 'cs'>> src/nona_gui/po/LINGUAS
-mv -f src/nona_gui/po/{cs_CZ,cs}.po
+%setup -q
+%patch1 -p0
+%patch3 -p1
+%patch4 -p1
+
+mv -f src/translations/{cs_CZ,cs}.po
+
+%{__sed} -i -e '1s,#! \?/usr/bin/env python,#!/usr/bin/python,' \
+	src/hugin_script_interface/hpi.py \
+	src/hugin_script_interface/plugins/*.py \
+	src/hugin_script_interface/plugins-dev/*.py
 
 %build
-%{__gettextize}
-cp -f po/Makefile.in.in src/hugin/po
-cp -f po/Makefile.in.in src/nona_gui/po
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--with-wx-config=wx-gtk2-unicode-config
+install -d build
+cd build
+%cmake .. \
+	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:None} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DBUILD_HSI:BOOL=ON \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
+	-DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-gtk2-unicode-config
+
 %{__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
+
+# cmake is so great there is no way to pass proper path
+%{__mv} $RPM_BUILD_ROOT%{_iconsdir}/{gnome,hicolor}
+
+%{__rm} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/gnome/*x*/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
+
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ca_ES*
+
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_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) %{py_sitedir}/_hsi.so
+%{py_sitedir}/hpi.py*
+%{py_sitedir}/hsi.py*
 %{_datadir}/%{name}
+%{_datadir}/appdata/PTBatcherGUI.appdata.xml
+%{_datadir}/appdata/calibrate_lens_gui.appdata.xml
+%{_datadir}/appdata/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/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_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*