diff --git a/hugin-2010.0.0.tar.bz2 b/hugin-2010.0.0.tar.bz2 deleted file mode 100644 index 4f838ad..0000000 --- a/hugin-2010.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cb6a7733199c6d627c1dea27d686ceb692b8956361f7b97698d780c9cbf2534 -size 10437425 diff --git a/hugin-2011.0.0.tar.bz2 b/hugin-2011.0.0.tar.bz2 new file mode 100644 index 0000000..232aa1a --- /dev/null +++ b/hugin-2011.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc +size 11439430 diff --git a/hugin-fix-gcc46.patch b/hugin-fix-gcc46.patch deleted file mode 100644 index 97f3752..0000000 --- a/hugin-fix-gcc46.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# HG changeset patch -# User Bruno Postle -# Date 1295990053 0 -# Node ID 1fc6ad6e7c7ae679e3b8f96b6f4c36920f228138 -# Parent 9e1d0816a1edd95a985ad6fd62da9c8b7342efb5 -Fix for compilation with gcc-4.6.0 - -diff -r 9e1d0816a1ed -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx ---- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jan 24 21:37:53 2011 +0100 -+++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 -@@ -41,6 +41,7 @@ - #define VIGRA_MULTI_ITERATOR_HXX - - #include -+#include - #include "tinyvector.hxx" - #include "iteratortags.hxx" - - diff --git a/hugin-libpng14.patch b/hugin-libpng14.patch deleted file mode 100644 index a89535d..0000000 --- a/hugin-libpng14.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: src/foreign/vigra/vigra_impex/png.cxx -=================================================================== ---- src/foreign/vigra/vigra_impex.orig/png.cxx -+++ src/foreign/vigra/vigra_impex/png.cxx -@@ -271,8 +271,8 @@ namespace vigra { - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) -- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); -- png_set_gray_1_2_4_to_8(png); -+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); -+ png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; - } - diff --git a/hugin.changes b/hugin.changes index a383fe3..782f79b 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue May 31 16:34:47 CEST 2011 - sbrabec@suse.cz + +- Updated to version 2011.0.0: + * Improved Built-in Control Points Generator. + * CPFind's detection ability has been significantly improved. + * Improved Fast Preview. + * Overview pane has been added to the Fast Preview window. + * It is now possible to drag individual images or arbitrary + groups of images on the panosphere in the fast preview. + * A new gray point picker for visual white balance correction. + * Additional functionality for the registration of stereo images. + * New Thoby projection modeling 10.5mm Nikkor fisheye lens. + * Improved support for some keyboard shortcuts. + * New Preferences: output file format (LDR only). + * Bugfixes and adds minor features. + * Many translations updated. + +------------------------------------------------------------------- +Tue Apr 26 19:34:14 CEST 2011 - sbrabec@suse.cz + +- Updated to version 2010.4.0: + * Built-in points generator - no third party software for control + points needed. + * Improved Unattended Operation. + * Improved Interaction and Functionality. + * New Command-Line Tools. + * New Visuals. + * Updated translations. + * Other improvements. + ------------------------------------------------------------------- Mon Mar 22 08:12:00 UTC 2011 - idoenmez@novell.com @@ -36,6 +67,35 @@ Thu Apr 8 11:46:35 CEST 2010 - pgajdos@suse.cz changed. * etc. see ChangeLog. +------------------------------------------------------------------- +Mon Feb 15 22:05:25 UTC 2010 - Nico.Laus.2001@gmx.de + +- removed LAPACK compile option (caused SIGSEVs - may be different + for newer libraries) + +------------------------------------------------------------------- +Mon Jan 11 08:10:38 UTC 2010 - Nico.Laus.2001@gmx.de + +- added liblapack3 and lapack dependencies + +------------------------------------------------------------------- +Sun Jan 10 13:13:08 UTC 2010 - Nico.Laus.2001@gmx.de + +- updated to 2009.4.0: + (from http://hugin.sourceforge.net/releases/2009.4.0/) + * Automatic lens calibration + * Control point cleaning + * Translation updates (20 languages) + * other improvements + changes between 0.8.0 and 2009.2.0: + (from http://hugin.sourceforge.net/releases/2009.2.0/) + * GPU accelerated stitching + * Improved Preferences panel (Control Point Detectors) + * Improved control of stitching process (Stitcher tab) + * Fast Preview shows control points connected with lines + * lots of bugfixes, lots of new bugs +- split off -devel sub-package + ------------------------------------------------------------------- Wed Aug 5 18:35:32 CEST 2009 - sbrabec@suse.cz diff --git a/hugin.spec b/hugin.spec index 9a3af02..88aa117 100644 --- a/hugin.spec +++ b/hugin.spec @@ -19,11 +19,11 @@ Name: hugin -BuildRequires: OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel libexiv2-devel libpano-devel libxml2 update-desktop-files vigra zip +BuildRequires: Mesa-devel OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel lapack libexiv2-devel liblapack3 libpano-devel >= 2.9.18 libxml2 update-desktop-files vigra zip %if %suse_version > 1130 -BuildRequires: python-wxWidgets wxWidgets-devel +BuildRequires: python-wxWidgets >= 2.7.0 wxWidgets-devel %else -BuildRequires: python-wxGTK wxGTK-devel +BuildRequires: python-wxGTK >= 2.7.0 wxGTK-devel %endif %if %suse_version > 1020 BuildRequires: fdupes @@ -31,16 +31,13 @@ BuildRequires: fdupes License: GPLv2+ Group: Productivity/Graphics/Other Summary: Toolchain for Stitching of Images and Creating Panoramas -Version: 2010.0.0 -Release: 11 -Source: %{name}-%{version}.tar.bz2 +Version: 2011.0.0 +Release: 0 +Source: http://sourceforge.net/projects/%{name}/files/%{name}/%{name}-2011.0/%{name}-%{version}.tar.bz2 # For SVN snapshot: # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin #Source: %{name}-svn2008xxxx.tar.bz2 Source1: %{name}-svn-dummy -Patch0: hugin-libpng14.patch -# PATCH-FIX-UPSTREAM hugin-fix-gcc46.patch idoenmez@suse.de -- Fix compilation with gcc 4.6 -Patch1: hugin-fix-gcc46.patch Url: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: make @@ -62,8 +59,6 @@ Other tools in this package can correct lens distortion, vignetting and chromatic abberation, create HDR images, provide automatic feature detection and extraction of key points. - - Authors: -------- Pablo d'Angelo @@ -80,8 +75,6 @@ Authors: %prep %setup -q -%patch0 -%patch1 -p1 # For SVN snapshot: #setup -q -n %{name} # Rename Catalan in Spain to Catalan. @@ -104,7 +97,7 @@ rm README_JP.new export PATH=$PWD/bin:$PATH LIB_SUFFIX=%{_lib} LIB_SUFFIX=${LIB_SUFFIX#lib} -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX . +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX -DENABLE_LAPACK=ON . make %{?jobs:-j%jobs} %install @@ -115,36 +108,32 @@ make %{?jobs:-j%jobs} %{find_lang} %{name} # Use better place for MIME icons. mv $RPM_BUILD_ROOT%{_datadir}/icons/gnome $RPM_BUILD_ROOT%{_datadir}/icons/hicolor -%if %suse_version > 1020 +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} +cp -a AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/ %fdupes $RPM_BUILD_ROOT%{_datadir} -%endif %clean rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database usr/share/mime >/dev/null -fi +%icon_theme_cache_post +%mime_database_post %postun -/sbin/ldconfig -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database usr/share/mime >/dev/null -fi +%icon_theme_cache_postun +%mime_database_postun %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO +%doc %{_docdir}/%{name} %{_bindir}/* %{_datadir}/hugin %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/48x48/mimetypes/*.png %{_datadir}/mime/packages/*.xml %{_datadir}/pixmaps/*.png -%{_libdir}/*.so -%{_libdir}/*.so.* -%doc %{_mandir}/man?/* +%dir %{_libdir}/hugin +%{_libdir}/hugin/*.so.* +%doc %{_mandir}/man?/*.* %changelog