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

Accepting request 110019 from graphics

Browse Source 
- added patch to fix gcc 4.7 failure (gcc47.diff)
- added fdupes (forwarded request 109983 from ealin) (forwarded request 109984 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/110019
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=34
This commit is contained in:
Stephan Kulow 2012-03-20 10:27:30 +00:00 committed by Git OBS Bridge
commit 13a1bc3f53
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gcc47.diff Normal file
View File

@ -0,0 +1,33 @@
diff -r 658ded2153f2 src/celeste/Utilities.h
--- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100
+++ b/src/celeste/Utilities.h SunSat Jan 07 19:38:25 2012 +0000
@@ -33,6 +33,8 @@
#include <stdio.h>
#ifdef _WINDOWS
#include "direct.h"
+#else
+#include <unistd.h>
#endif
using namespace std;
diff -r 658ded2153f2 src/foreign/zthread/include/zthread/Guard.h
--- a/src/foreign/zthread/include/zthread/Guard.h SunSatSun Jan 01 13:23:39 2012 +0100
+++ b/src/foreign/zthread/include/zthread/Guard.h SunSatSunSat Jan 07 19:38:25 2012 +0000
@@ -428,7 +428,7 @@
template <class U, class V>
Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
- LockingPolicy::shareScope(*this, extract(g));
+ LockingPolicy::shareScope(*this, this->extract(g));
}
@@ -458,7 +458,7 @@
template <class U, class V>
Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
- LockingPolicy::transferScope(*this, extract(g));
+ LockingPolicy::transferScope(*this, this->extract(g));
}

6
hugin.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 19 17:30:17 UTC 2012 - alinm.elena@gmail.com
- added patch to fix gcc 4.7 failure (gcc47.diff)
- added fdupes
-------------------------------------------------------------------
Tue Jan 10 16:55:03 UTC 2012 - crrodriguez@opensuse.org

9
hugin.spec
View File

@ -16,7 +16,6 @@
#
Name: hugin
BuildRequires: Mesa-devel
BuildRequires: OpenEXR-devel
@ -24,21 +23,22 @@ BuildRequires: SDL-devel
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: fdupes
BuildRequires: fftw3-devel
BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: glew-devel
BuildRequires: lapack
BuildRequires: libexiv2-devel
BuildRequires: libjpeg-devel
BuildRequires: liblapack3
BuildRequires: libpano-devel >= 2.9.18
BuildRequires: libtiff-devel
BuildRequires: libxml2
BuildRequires: tclap
BuildRequires: update-desktop-files
BuildRequires: vigra
BuildRequires: zip
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
%if 0%{?suse_version} > 1130
BuildRequires: python-wxWidgets >= 2.7.0
BuildRequires: wxWidgets-devel
@ -58,6 +58,7 @@ Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}
# svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin
#Source: %%{name}-svn2008xxxx.tar.bz2
Source1: %{name}-svn-dummy
Patch0: gcc47.diff
Requires: enblend-enfuse >= 3.2
Recommends: autopano-sift
Recommends: exiftool
@ -96,6 +97,7 @@ rm README_JP.new
#mkdir bin
#cp %%{SOURCE1} bin/svn
#chmod +x bin/svn
%patch0 -p1
%build
export PATH=$PWD/bin:$PATH
@ -119,6 +121,7 @@ mv %{buildroot}%{_datadir}/icons/gnome %{buildroot}%{_datadir}/icons/hicolor
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -a AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO %{buildroot}%{_docdir}/%{name}/
chmod -x %{buildroot}%{_docdir}/%{name}/*
%fdupes %{buildroot}
%post
%if 0%{?suse_version} > 1130