From b46fcb83ccd1a908cbad3bd6fa5f4e726762cf21 Mon Sep 17 00:00:00 2001 From: bpostle Date: Wed, 23 Jan 2008 00:17:39 +0000 Subject: [PATCH] 0.7.0 beta SVN snapshot, extensive changes as 0.6.1 release was 17 months ago --- .cvsignore | 2 +- hugin-0.6.1-CVE-2007-5200.patch | 53 ----- hugin.spec | 329 +++++++++----------------------- sources | 2 +- 4 files changed, 91 insertions(+), 295 deletions(-) delete mode 100644 hugin-0.6.1-CVE-2007-5200.patch diff --git a/.cvsignore b/.cvsignore index e7bd35a..18ef49f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -hugin-0.6.1.tar.bz2 +hugin-0.7.0.tar.gz diff --git a/hugin-0.6.1-CVE-2007-5200.patch b/hugin-0.6.1-CVE-2007-5200.patch deleted file mode 100644 index 1432343..0000000 --- a/hugin-0.6.1-CVE-2007-5200.patch +++ /dev/null @@ -1,53 +0,0 @@ -Modified: hugin/branches/stable/src/Panorama/PTOptimise.cpp -=================================================================== ---- hugin/tags/hugin-0-6-1/src/Panorama/PTOptimise.cpp 2007-10-24 19:30:32 UTC (rev 2491) -+++ hugin/branches/stable/src/Panorama/PTOptimise.cpp 2007-10-24 19:42:36 UTC (rev 2492) -@@ -36,9 +36,6 @@ - #include - #include - --#define DEBUG_WRITE_OPTIM_OUTPUT --#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt" -- - using namespace std; - using namespace PT; - using namespace PTools; -@@ -132,13 +129,6 @@ - RunLMOptimizer( &opt ); - ainf.data = opt.message; - // get results from align info. --#ifdef DEBUG_WRITE_OPTIM_OUTPUT -- fullPath path; -- StringtoFullPath(&path, DEBUG_WRITE_OPTIM_OUTPUT_FILE ); -- -- ainf.data = opt.message; -- WriteResults( script, &path, &ainf, distSquared, 0); --#endif - pano.updateVariables(GetAlignInfoVariables(ainf) ); - pano.updateCtrlPointErrors( GetAlignInfoCtrlPoints(ainf) ); - } - -Modified: hugin/branches/stable/src/hugin/AutoCtrlPointCreator.cpp -=================================================================== ---- hugin/tags/hugin-0-6-1/src/hugin/AutoCtrlPointCreator.cpp 2007-10-24 19:30:32 UTC (rev 2491) -+++ hugin/branches/stable/src/hugin/AutoCtrlPointCreator.cpp 2007-10-24 19:42:36 UTC (rev 2492) -@@ -225,7 +225,7 @@ - } - #endif - -- wxString ptofile(wxT("autopano_result_tempfile.pto")); -+ wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res")); - autopanoArgs.Replace(wxT("%o"), ptofile); - wxString tmp; - tmp.Printf(wxT("%d"), nFeatures); -@@ -415,7 +415,7 @@ - imgNr++; - } - -- wxString ptofile(wxT("autopano_result_tempfile")); -+ wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res")); - autopanoArgs.Replace(wxT("%o"), ptofile); - wxString tmp; - tmp.Printf(wxT("%d"), nFeatures); - - diff --git a/hugin.spec b/hugin.spec index ba4c794..6f55117 100644 --- a/hugin.spec +++ b/hugin.spec @@ -1,18 +1,22 @@ -Summary: Frontend for Panorama Tools, similar to PTAssembler, PTGui or Open for Windows +Summary: Panoramic photo stitcher, similar to PTGui for Windows Name: hugin -Version: 0.6.1 -Release: 11%{?dist} +Version: 0.7.0 +Release: 0.2.20080121svn%{?dist} License: GPLv2+ Group: Applications/Multimedia -Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2 +# The source for this package was pulled from upstream's vcs. Use the +# following commands to generate the tarball: +# svn export -r 2684 https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin.svn +# cd hugin.svn +# cmake . && make package_source +Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.gz URL: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libpano12 >= 2.8.6 wxGTK >= 2.6.0 boost enblend Requires: shared-mime-info -BuildRequires: libpano12-devel >= 2.8.6 zlib-devel libtiff-devel libjpeg-devel +Requires: %{name}-base = %{version}-%{release} +BuildRequires: libpano13-devel zlib-devel libtiff-devel libjpeg-devel BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.6.0 boost-devel -BuildRequires: desktop-file-utils -Patch0: hugin-0.6.1-CVE-2007-5200.patch +BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel %description hugin can be used to stitch multiple images together. The resulting image can @@ -20,33 +24,47 @@ span 360 degrees. Another common use is the creation of very high resolution pictures by combining multiple images. It uses the Panorama Tools as backend to create high quality images +%package base +Summary: Command-line tools and libraries required by hugin +Group: Applications/Multimedia +Requires: make enblend >= 3.1 libpano13-tools >= 2.9.12 perl-Image-ExifTool + +%description base +Command-line tools used to generate panoramic images, install this package +separately from hugin if you want to batch-process hugin projects on a machine +without a GUI environment. + %prep %setup -q -%patch0 -p3 -# autopanog.exe is a mono app -sed -i 's/"autopanog.exe"/"mono `which autopanog.exe`"/' \ - src/include/hugin/config_defaults.h - -rm -rf src/hugin/xrc/data/help_fr_FR/CVS -rm -rf src/hugin/xrc/data/help_en_EN/CVS -rm -f src/hugin/xrc/data/help_fr_FR/.cvsignore -rm -f src/hugin/xrc/data/help_en_EN/.cvsignore - -chmod -x src/include/*/*.h +# replace autopano-sift default with info message +sed -i 's/"autopano-complete.sh"/"autopano-noop.sh"/' \ + src/hugin1/hugin/config_defaults.h +# don't try to align images on loading as there is no autopano +sed -i 's/HUGIN_ASS_AUTO_ALIGN *1l/HUGIN_ASS_AUTO_ALIGN 0l/' \ + src/hugin1/hugin/config_defaults.h %build -%configure -make %{?_smp_mflags} +%cmake . +make VERBOSE=1 %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +install -m 0755 utils/autopano-noop.sh %{buildroot}/%{_bindir}/ + +# unused symlinks +rm %{buildroot}/%{_libdir}/libhuginbase.so +rm %{buildroot}/%{_libdir}/libhuginANN.so +rm %{buildroot}/%{_libdir}/libhuginvigraimpex.so +rm %{buildroot}/%{_libdir}/libhuginjhead.so + desktop-file-install --vendor="fedora" --delete-original \ --dir=%{buildroot}/%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/%{name}.desktop +desktop-file-install --vendor="fedora" --delete-original \ + --dir=%{buildroot}/%{_datadir}/applications \ + %{buildroot}/%{_datadir}/applications/hugin_stitch_project.desktop %find_lang %{name} -%find_lang nona_gui -cat nona_gui.lang >> %{name}.lang %clean rm -rf %{buildroot} @@ -63,42 +81,72 @@ update-mime-database %{_datadir}/mime &> /dev/null || : touch --no-create %{_datadir}/icons/gnome || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || : +%post base -p /sbin/ldconfig + +%postun base -p /sbin/ldconfig + %files -f %{name}.lang %defattr(-, root, root,-) -%{_bindir}/* +%{_bindir}/hugin +%{_bindir}/hugin_stitch_project +%{_bindir}/nona_gui %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-hugin_stitch_project.desktop %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/gnome/48x48/mimetypes/* %{_datadir}/mime/packages/%{name}.xml + +%doc AUTHORS COPYING INSTALL_cmake LICENCE README README_JP TODO LICENCE_JHEAD LICENCE_VIGRA doc/nona.txt doc/fulla.html src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual + +%files base +%defattr(-, root, root,-) +%{_bindir}/align_image_stack +%{_bindir}/autooptimiser +%{_bindir}/autopano-noop.sh +%{_bindir}/fulla +%{_bindir}/hugin_hdrmerge +%{_bindir}/nona +%{_bindir}/vig_optimize +%{_libdir}/libhugin* %{_mandir}/man1/* -%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING INSTALL LICENCE NEWS README TODO src/hugin/xrc/data/*.htm src/hugin/xrc/data/*.html src/hugin/xrc/data/help_en_EN src/hugin/xrc/data/help_fr_FR HACKING LICENCE_JHEAD LICENCE_VIGRA doc/nona.txt - %changelog -* Mon Nov 05 2007 Bruno Postle 0.6.1-11 -- fix for CVE-2007-5200 hugin unsafe temporary file usage -- bug #332401; bug #362851; bug #362861; bug #362871 +* Tue Jan 22 2008 Bruno Postle 0.7.0-0.2.20080121svn +- SVN snapshot, 0.7 beta. move cli dependencies to hugin-base package -* Wed Aug 22 2007 Bruno Postle 0.6.1-9 -- bumping for rebuild against new libpano12-2.8.6 abi -- fix Source tag +* Mon Jan 21 2008 Bruno Postle 0.7.0-0.1.20080121svn +- SVN snapshot, add LICENCE.manual -* Tue Aug 21 2007 Bruno Postle 0.6.1-8 -- bumping for Jesse -- update license GPL -> GPLv2+ +* Sat Jan 19 2008 Bruno Postle 0.7.0-0.1.20080119svn +- SVN snapshot, split to hugin and hugin-base packages -* Mon Aug 13 2007 Bruno Postle 0.6.1-7 -- rebuild for boost soname change -- add enblend dependency as enblend is now in fedora +* Wed Jan 16 2008 Bruno Postle 0.7.0-0.1.20080116svn +- remove autopano-sift-C dependency, use autopano-noop.sh instead +- delete devel .so symlinks -* Tue Mar 20 2007 Bruno Postle 0.6.1-6 -- bump release due to extras make tag brokenness +* Mon Jan 14 2008 Bruno Postle 0.7.0-0.1.20080112svn +- SVN snapshot, switch to fedora naming scheme, add exiftool dependency -* Thu Mar 15 2007 Bruno Postle 0.6.1-5 +* Sat Oct 27 2007 Bruno Postle 0.7.0-0svn20071029 +- revert to trunk +- ldconfig as we are installing libs +- libpano13-tools & make dependency + +* Wed Oct 24 2007 Bruno Postle 0.7.0-0svn20071024 +- lib64 issue should be fixed, lots of .so.0 files now, release has decremented + +* Mon Oct 22 2007 Bruno Postle 0.7.1-0svn20071022 +- ippei branch, switch to cmake + +* Mon Apr 16 2007 Bruno Postle 0.7.0_beta5-0cvs20070416 +- CVS snapshot - add shared-mime-info, desktop-file-utils dependencies - use desktop-file-install for .desktop file +* Mon Jan 29 2007 Bruno Postle 0.7.0_beta3-2cvs20070129 +- CVS snapshot of 0.7 beta, switch to libpano13 + * Sun Sep 17 2006 Bruno Postle 0.6.1-4 - Fix spec typos and cruft, use find_lang, post and postun fixes @@ -114,40 +162,14 @@ touch --no-create %{_datadir}/icons/gnome || : * Mon Jul 24 2006 Bruno Postle 0.6-3 - 0.6 release -* Thu Jul 20 2006 Bruno postle 0.6-2cvs20060720 -- CVS snapshot - -* Mon Jul 17 2006 Bruno postle 0.6-2cvs20060717 -- CVS snapshot - * Mon Jun 19 2006 Bruno postle 0.6-2cvs20060611 - Recompile to link to libpano12-2.8.4. use find_lang macro. remove repo tag. use dist tag -* Sun Jun 11 2006 Bruno postle 0.6-1cvs20060611.fc5.bp -- CVS snapshot - -* Wed Jun 07 2006 Bruno postle 0.6-1cvs20060607.fc5.bp -- CVS snapshot - -* Sun May 21 2006 Bruno postle 0.6-1cvs20060521.fc5.bp -- CVS snapshot, requires current libpano12 CVS - -* Mon May 15 2006 Bruno postle 0.6-1cvs20060515.fc5.bp - -* Thu Apr 27 2006 Bruno Postle 0.6-1cvs20060427.fc5.bp -- 0.6 CVS snapshot. - -* Fri Apr 21 2006 Bruno Postle -- 0.6 CVS snapshot. new projections - * Wed Apr 19 2006 Bruno Postle - 0.6 CVS snapshot + gcc 4.1 hack. - batch processing for fulla. - requires latest pano12 > 2.8.0 for direct access to optimiser -* Sat Mar 25 2006 Bruno Postle -- rebuild for fc5 - * Thu Mar 09 2006 Bruno Postle - 0.6 CVS snapshot + hack to fix charset of cs_CZ translation @@ -157,105 +179,39 @@ touch --no-create %{_datadir}/icons/gnome || : * Tue Mar 07 2006 Bruno Postle - 0.6 CVS snapshot, add missing docs -* Mon Mar 06 2006 Bruno Postle -- 0.6 CVS snapshot - -* Wed Feb 22 2006 Bruno Postle -- 0.6 CVS snapshot + boost hack - -* Mon Feb 13 2006 Bruno Postle -- 0.6 CVS snapshot + quick hack to get it to build with boost-1.32. - -* Fri Feb 10 2006 Bruno Postle -- 0.6 CVS snapshot + quick hack to get it to build with boost-1.32. - -* Sat Jan 14 2006 Bruno Postle -- 0.6 CVS snapshot. - * Thu Jan 12 2006 Bruno Postle - 0.6 CVS snapshot. Philippe Thomins color correction tool. fix for ptoptimizer * Mon Jan 09 2006 Bruno Postle - 0.6 CVS snapshot. nona vignetting correction -* Thu Dec 01 2005 Bruno Postle -- rebuild on different machine due to '/usr/lib/libstdc++.so.6: version `GLIBCXX_3.4.6' not found error. - -* Wed Nov 30 2005 Bruno Postle -- new build from CVS. now requires freshrpms wxGTK > 2.6.0 - * Mon Nov 14 2005 Bruno Postle - new build from CVS. included ca_ES catalan translation * Thu Nov 10 2005 Bruno Postle - new build from CVS. included hu hungarian translation -* Tue Nov 01 2005 Bruno Postle -- new build from CVS. - * Fri Sep 16 2005 Bruno Postle - new build from CVS. includes zh_CN Chinese translation * Fri Sep 16 2005 Bruno Postle - new build from CVS. includes nl dutch translation -* Sat Sep 03 2005 Bruno Postle -- new build from CVS. - * Wed Aug 17 2005 Bruno Postle - new build from CVS. - Remove patch that turns off enblend compression, as compression is now disabled by default. -* Mon Jul 19 2005 Bruno Postle -- new build from CVS. switched from fc2 to fc4 - -* Mon Jun 13 2005 Bruno Postle -- new build from CVS. - -* Thu Jun 02 2005 Bruno Postle -- new build from CVS. - -* Sat May 14 2005 Bruno Postle -- new build from CVS. - -* Thu May 12 2005 Bruno Postle -- new build from CVS. - -* Tue Apr 26 2005 Bruno Postle -- new build from CVS. - -* Thu Apr 17 2005 Bruno Postle -- new build from CVS. - * Thu Mar 10 2005 Bruno Postle - new build from CVS. This is approximately hugin 0.5 beta3 * Mon Feb 28 2005 Bruno Postle - new build from CVS. Removed fftw dependency -* Thu Feb 03 2005 Bruno Postle -- new build from CVS. - -* Thu Jan 20 2005 Bruno Postle -- new build from CVS. - -* Sat Jan 15 2005 Bruno Postle -- new build from CVS. - * Mon Nov 22 2004 Bruno Postle - new build from cvs. patch to call enblend without compression. patch to call autopanog.exe via mono. -* Wed Nov 17 2004 Bruno Postle -- new build from cvs. - -* Sat Nov 13 2004 Bruno Postle -- new build from cvs. - -* Sat Nov 06 2004 Bruno Postle -- new build from cvs. - * Thu Oct 21 2004 Bruno Postle - new build from cvs. Should fix bug where fov can't be optimised @@ -263,23 +219,11 @@ touch --no-create %{_datadir}/icons/gnome || : - new build from cvs. Updated French translation. add enblend dependency. -* Mon Oct 18 2004 Bruno Postle -- new build from cvs. - * Thu Oct 14 2004 Bruno Postle - New build for fedora fc2. Now uses automake/autoconf Switch dependency from panorama-tools to libpano12 & libpano12-devel -* Tue Sep 21 2004 Bruno Postle -- new build from cvs. - -* Fri Sep 17 2004 Bruno Postle -- new build from cvs. - -* Thu Sep 16 2004 Bruno Postle -- new build from cvs. - * Thu Sep 09 2004 Bruno Postle - new build from cvs. point picker can do rotation matching, various bugfixes. panoviewer doesn't get built anymore. @@ -287,9 +231,6 @@ touch --no-create %{_datadir}/icons/gnome || : * Tue Aug 31 2004 Bruno Postle - new build from cvs. Should fix bug where enblend isn't executed from the gui. -* Wed Aug 18 2004 Bruno Postle -- new build from cvs. - * Fri Jul 23 2004 Bruno Postle - new build from cvs, removed vigra dependency. @@ -302,9 +243,6 @@ touch --no-create %{_datadir}/icons/gnome || : - install various (nonworking?) tools automatch autooptimiser panosifter autopano_old -* Fri Jun 18 2004 Bruno Postle -- new build from cvs - * Tue Jun 15 2004 Bruno Postle - new build from cvs, requires a vigra with 16bit unsigned tiff support remove: autopano_old, automatch, autooptimiser, panosifter @@ -315,27 +253,12 @@ touch --no-create %{_datadir}/icons/gnome || : delete control points between selected images reset positions of all selected images -* Thu Mar 18 2004 Bruno Postle -- new build from cvs - * Sun Mar 14 2004 Bruno Postle - new build from cvs, this is post 0.4b release with nona_gui -* Fri Feb 20 2004 Bruno Postle -- new build from cvs - -* Tue Feb 10 2004 Bruno Postle -- new build from cvs - -* Sun Feb 08 2004 Bruno Postle -- new build from cvs. forgot sift_keypoints - * Sun Feb 08 2004 Bruno Postle - new build from cvs. Now doesn't depend on vigra -* Fri Feb 06 2004 Bruno Postle -- new build from cvs. - * Wed Feb 04 2004 Bruno Postle - new build from cvs. Now depends on vigra @@ -345,27 +268,12 @@ touch --no-create %{_datadir}/icons/gnome || : * Wed Jan 15 2004 Bruno Postle - new build from cvs. now includes automatch -* Wed Jan 07 2004 Bruno Postle -- new build from cvs. - * Thu Jan 03 2004 Bruno Postle - new build from cvs. This is the 0.4pre release * Thu Jan 01 2004 Bruno Postle - new build from cvs. autopano now requires fftw. -* Sat Dec 20 2003 Bruno Postle -- new build from cvs. - -* Mon Dec 15 2003 Bruno Postle -- new build from cvs. - -* Sat Dec 13 2003 Bruno Postle -- new build from cvs. - -* Wed Dec 03 2003 Bruno Postle -- new build from cvs - * Sun Nov 30 2003 Bruno Postle - The vigra library when compiled with shared libraries isn't actually necessary to run nona, so it's now only a build requirement. The @@ -375,77 +283,27 @@ touch --no-create %{_datadir}/icons/gnome || : * Sat Nov 29 2003 Bruno Postle - new build from cvs; stitcher is now called nona -* Tue Nov 25 2003 Bruno Postle -- new build from cvs; - * Mon Nov 24 2003 Bruno Postle - new build from cvs; add vigra dependency for stitcher -* Sat Nov 22 2003 Bruno Postle -- new build from cvs; don't bother with gtk2 since freshrpms dropped it :-( - * Sun Nov 16 2003 Bruno Postle - new build from cvs; patch to build with gtk2 * Sun Nov 09 2003 Bruno Postle - new build from cvs; first build with fedora1 -* Fri Nov 07 2003 Bruno Postle -- new build from cvs - -* Tue Nov 04 2003 Bruno Postle -- new build from cvs - -* Wed Oct 30 2003 Bruno Postle -- new build from cvs - * Mon Oct 27 2003 Bruno Postle - new build from cvs, added manual.html to doc and [de] translation to .desktop -* Tue Oct 14 2003 Bruno Postle -- new build from cvs - * Mon Oct 13 2003 Bruno Postle - build of hugin-0-3-beta release, sorry no time to fix numbering. -* Sun Oct 12 2003 Bruno Postle - -* Sun Oct 12 2003 Bruno Postle -- new build from cvs, added hugin.png desktop icon - -* Sat Oct 11 2003 Bruno Postle -- new build from cvs - -* Wed Oct 08 2003 Bruno Postle -- new build from cvs - * Sat Oct 04 2003 Bruno Postle - new build from cvs, patch0 adds a shortcut to gnome/kde menu -* Wed Oct 01 2003 Bruno Postle -- new build from cvs. - -* Sun Sep 28 2003 Bruno Postle -- new build from cvs. - * Thu Sep 25 2003 Bruno Postle - build now requires panorama tools include headers. -* Sun Sep 21 2003 Bruno Postle -- new build from cvs. - -* Tue Sep 16 2003 Bruno Postle -- new build from cvs. - -* Thu Sep 04 2003 Bruno Postle -- new build from cvs. - -* Tue Aug 21 2003 Bruno Postle -- new build from cvs. - -* Tue Aug 12 2003 Bruno Postle -- new build from cvs. - * Wed Aug 06 2003 Bruno Postle - new build from cvs. po/mo files still not getting built @@ -453,18 +311,9 @@ touch --no-create %{_datadir}/icons/gnome || : - new build from cvs, panoviewer now gets built by default. removed useless .po installation. -* Sun Jul 27 2003 Bruno Postle -- new build from cvs - * Sat Jul 26 2003 Bruno Postle - new build from cvs, panoviewer built as well -* Sat Jul 19 2003 Bruno Postle -- new build - -* Sat May 31 2003 Bruno Postle -- new build - * Sat May 24 2003 Bruno Postle - build of wxGTK version diff --git a/sources b/sources index b065ceb..695695f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46bc3136d42acbabab837128ff471507 hugin-0.6.1.tar.bz2 +a3dea707fd9d6816285bb0497c508c0f hugin-0.7.0.tar.gz