Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at 2012-03-20 11:27:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hugin (Old) and /work/SRC/openSUSE:Factory/.hugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hugin", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/hugin/hugin.changes 2012-01-11 15:37:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hugin.new/hugin.changes 2012-03-20 11:27:32.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 19 17:30:17 UTC 2012 - [email protected] + +- added patch to fix gcc 4.7 failure (gcc47.diff) +- added fdupes + +------------------------------------------------------------------- New: ---- gcc47.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.MzFgyC/_old 2012-03-20 11:27:33.000000000 +0100 +++ /var/tmp/diff_new_pack.MzFgyC/_new 2012-03-20 11:27:33.000000000 +0100 @@ -16,7 +16,6 @@ # - Name: hugin BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel @@ -24,21 +23,22 @@ 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 @@ # 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 @@ #mkdir bin #cp %%{SOURCE1} bin/svn #chmod +x bin/svn +%patch0 -p1 %build export PATH=$PWD/bin:$PATH @@ -119,6 +121,7 @@ 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 ++++++ gcc47.diff ++++++ 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)); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
