rpm/hugin
SHA256
1
0
Fork 0
forked from pool/hugin
Code Pull Requests Activity

Accepting request 80042 from graphics

Browse Source 
new version

OBS-URL: https://build.opensuse.org/request/show/80042
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=29
This commit is contained in:
Sascha Peilicke 2011-08-29 14:47:58 +00:00 committed by Git OBS Bridge
commit 76f54f6014
6 changed files with 80 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hugin-2010.0.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cb6a7733199c6d627c1dea27d686ceb692b8956361f7b97698d780c9cbf2534
size 10437425

3
hugin-2011.0.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc
size 11439430

20
hugin-fix-gcc46.patch
View File

@ -1,20 +0,0 @@
# HG changeset patch
# User Bruno Postle <bruno@postle.net>
# 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 <sys/types.h>
+#include <stddef.h>
#include "tinyvector.hxx"
#include "iteratortags.hxx"

15
hugin-libpng14.patch
View File

@ -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;
}

60
hugin.changes
View File

@ -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 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. changed.
* etc. see ChangeLog. * 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 Wed Aug 5 18:35:32 CEST 2009 - sbrabec@suse.cz

45
hugin.spec
View File

@ -19,11 +19,11 @@
Name: hugin 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 %if %suse_version > 1130
BuildRequires: python-wxWidgets wxWidgets-devel BuildRequires: python-wxWidgets >= 2.7.0 wxWidgets-devel
%else %else
BuildRequires: python-wxGTK wxGTK-devel BuildRequires: python-wxGTK >= 2.7.0 wxGTK-devel
%endif %endif
%if %suse_version > 1020 %if %suse_version > 1020
BuildRequires: fdupes BuildRequires: fdupes
@ -31,16 +31,13 @@ BuildRequires: fdupes
License: GPLv2+ License: GPLv2+
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
Summary: Toolchain for Stitching of Images and Creating Panoramas Summary: Toolchain for Stitching of Images and Creating Panoramas
Version: 2010.0.0 Version: 2011.0.0
Release: 11 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: # For SVN snapshot:
# svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin
#Source: %{name}-svn2008xxxx.tar.bz2 #Source: %{name}-svn2008xxxx.tar.bz2
Source1: %{name}-svn-dummy 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/ Url: http://hugin.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: make 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 chromatic abberation, create HDR images, provide automatic feature
detection and extraction of key points. detection and extraction of key points.
Authors: Authors:
-------- --------
Pablo d'Angelo <pablo.dangelo@web.de> Pablo d'Angelo <pablo.dangelo@web.de>
@ -80,8 +75,6 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0
%patch1 -p1
# For SVN snapshot: # For SVN snapshot:
#setup -q -n %{name} #setup -q -n %{name}
# Rename Catalan in Spain to Catalan. # Rename Catalan in Spain to Catalan.
@ -104,7 +97,7 @@ rm README_JP.new
export PATH=$PWD/bin:$PATH export PATH=$PWD/bin:$PATH
LIB_SUFFIX=%{_lib} LIB_SUFFIX=%{_lib}
LIB_SUFFIX=${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} make %{?jobs:-j%jobs}
%install %install
@ -115,36 +108,32 @@ make %{?jobs:-j%jobs}
%{find_lang} %{name} %{find_lang} %{name}
# Use better place for MIME icons. # Use better place for MIME icons.
mv $RPM_BUILD_ROOT%{_datadir}/icons/gnome $RPM_BUILD_ROOT%{_datadir}/icons/hicolor 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} %fdupes $RPM_BUILD_ROOT%{_datadir}
%endif
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig %icon_theme_cache_post
if test -x usr/bin/update-mime-database ; then %mime_database_post
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%postun %postun
/sbin/ldconfig %icon_theme_cache_postun
if test -x usr/bin/update-mime-database ; then %mime_database_postun
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO %doc %{_docdir}/%{name}
%{_bindir}/* %{_bindir}/*
%{_datadir}/hugin %{_datadir}/hugin
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/48x48/mimetypes/*.png %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
%{_datadir}/mime/packages/*.xml %{_datadir}/mime/packages/*.xml
%{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/*.png
%{_libdir}/*.so %dir %{_libdir}/hugin
%{_libdir}/*.so.* %{_libdir}/hugin/*.so.*
%doc %{_mandir}/man?/* %doc %{_mandir}/man?/*.*
%changelog %changelog