From 34d00547ee41d2a7e6c2b41bb547f562c13a07d3b4be4b9bda4fdb47b40a70e0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 22 Mar 2011 16:42:45 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/hugin revision 28.0 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=7c7a65703a8fb2da6831459a444e96d5 --- hugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugin.spec b/hugin.spec index 2296014..9a3af02 100644 --- a/hugin.spec +++ b/hugin.spec @@ -32,7 +32,7 @@ License: GPLv2+ Group: Productivity/Graphics/Other Summary: Toolchain for Stitching of Images and Creating Panoramas Version: 2010.0.0 -Release: 6 +Release: 11 Source: %{name}-%{version}.tar.bz2 # For SVN snapshot: # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin From 4fbd3417b5baf2ac17b2dd863f9ec96c4cbe26c9c1d63b2cbee62b41b7ccc324 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 Apr 2011 17:40:30 +0000 Subject: [PATCH 2/5] - 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. Integrated multimedia:graphics changes?: - removed LAPACK compile option (caused SIGSEVs - may be different for newer libraries) - added liblapack3 and lapack dependencies - 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 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=17 --- hugin-2010.0.0.tar.bz2 | 3 --- hugin-2010.4.0.tar.bz2 | 3 +++ hugin-libpng14.patch | 15 --------------- hugin.changes | 42 ++++++++++++++++++++++++++++++++++++++++++ hugin.spec | 40 ++++++++++++++++------------------------ 5 files changed, 61 insertions(+), 42 deletions(-) delete mode 100644 hugin-2010.0.0.tar.bz2 create mode 100644 hugin-2010.4.0.tar.bz2 delete mode 100644 hugin-libpng14.patch 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-2010.4.0.tar.bz2 b/hugin-2010.4.0.tar.bz2 new file mode 100644 index 0000000..42fbc09 --- /dev/null +++ b/hugin-2010.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d45cc65df6b424ef5bf1c5d2cd99a360ecfda46688782c75f36dd5341cb9c38e +size 11009978 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..27749b2 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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 +49,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..a79c663 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: OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel libexiv2-devel libpano-devel >= 2.9.17 libxml2 update-desktop-files vigra zip freeglut-devel Mesa-devel liblapack3 lapack %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,14 +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 +Version: 2010.4.0 +Release: 0 Source: %{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/ @@ -62,8 +61,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,7 +77,6 @@ Authors: %prep %setup -q -%patch0 %patch1 -p1 # For SVN snapshot: #setup -q -n %{name} @@ -104,7 +100,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=YES . make %{?jobs:-j%jobs} %install @@ -115,36 +111,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 From eada78b1971cc38c9ee8516624ae6caef3436803ec1a7372f05f917858299b85 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 Apr 2011 18:14:24 +0000 Subject: [PATCH 3/5] Fixed ENABLE_LAPACK argument. OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=18 --- hugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugin.spec b/hugin.spec index a79c663..4561efd 100644 --- a/hugin.spec +++ b/hugin.spec @@ -100,7 +100,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 -DENABLE_LAPACK=YES . +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX -DENABLE_LAPACK=ON . make %{?jobs:-j%jobs} %install From 232dac730fdc107909d03f216d244d1d34cb3fa5667e72b863daaca9b577fc96 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 31 May 2011 15:00:18 +0000 Subject: [PATCH 4/5] Accepting request 72318 from home:sbrabec:branches:graphics - 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. OBS-URL: https://build.opensuse.org/request/show/72318 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=19 --- hugin-2010.4.0.tar.bz2 | 3 --- hugin-2011.0.0.tar.bz2 | 3 +++ hugin-fix-gcc46.patch | 20 -------------------- hugin.changes | 18 ++++++++++++++++++ hugin.spec | 7 ++----- 5 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 hugin-2010.4.0.tar.bz2 create mode 100644 hugin-2011.0.0.tar.bz2 delete mode 100644 hugin-fix-gcc46.patch diff --git a/hugin-2010.4.0.tar.bz2 b/hugin-2010.4.0.tar.bz2 deleted file mode 100644 index 42fbc09..0000000 --- a/hugin-2010.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d45cc65df6b424ef5bf1c5d2cd99a360ecfda46688782c75f36dd5341cb9c38e -size 11009978 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.changes b/hugin.changes index 27749b2..782f79b 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +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 diff --git a/hugin.spec b/hugin.spec index 4561efd..ec5bd0b 100644 --- a/hugin.spec +++ b/hugin.spec @@ -19,7 +19,7 @@ Name: hugin -BuildRequires: OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel libexiv2-devel libpano-devel >= 2.9.17 libxml2 update-desktop-files vigra zip freeglut-devel Mesa-devel liblapack3 lapack +BuildRequires: OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel libexiv2-devel libpano-devel >= 2.9.18 libxml2 update-desktop-files vigra zip freeglut-devel Mesa-devel liblapack3 lapack %if %suse_version > 1130 BuildRequires: python-wxWidgets >= 2.7.0 wxWidgets-devel %else @@ -31,15 +31,13 @@ BuildRequires: fdupes License: GPLv2+ Group: Productivity/Graphics/Other Summary: Toolchain for Stitching of Images and Creating Panoramas -Version: 2010.4.0 +Version: 2011.0.0 Release: 0 Source: %{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 -# 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 @@ -77,7 +75,6 @@ Authors: %prep %setup -q -%patch1 -p1 # For SVN snapshot: #setup -q -n %{name} # Rename Catalan in Spain to Catalan. From 7b9ee71dd184b7b1d7f5e8b98ce41f5b20749501e3ac7107a2d4f91d9d146e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 24 Aug 2011 09:12:23 +0000 Subject: [PATCH 5/5] ups, commit file anyway OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=21 --- hugin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hugin.spec b/hugin.spec index ec5bd0b..88aa117 100644 --- a/hugin.spec +++ b/hugin.spec @@ -19,7 +19,7 @@ Name: hugin -BuildRequires: OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel libexiv2-devel libpano-devel >= 2.9.18 libxml2 update-desktop-files vigra zip freeglut-devel Mesa-devel liblapack3 lapack +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 >= 2.7.0 wxWidgets-devel %else @@ -33,7 +33,7 @@ Group: Productivity/Graphics/Other Summary: Toolchain for Stitching of Images and Creating Panoramas Version: 2011.0.0 Release: 0 -Source: %{name}-%{version}.tar.bz2 +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