Patch to build with gcc-4.7.0
This commit is contained in:
parent
0994214714
commit
2ffc5c5e5a
12
vigra-1.8.0.gcc47.patch
Normal file
12
vigra-1.8.0.gcc47.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ru vigra-1.8.0/include/vigra/numpy_array.hxx vigra-1.8.0.new/include/vigra/numpy_array.hxx
|
||||
--- vigra-1.8.0/include/vigra/numpy_array.hxx 2011-09-20 19:38:36.000000000 +0100
|
||||
+++ vigra-1.8.0.new/include/vigra/numpy_array.hxx 2012-02-27 21:03:54.000000000 +0000
|
||||
@@ -1074,7 +1074,7 @@
|
||||
|
||||
this->m_stride /= sizeof(value_type);
|
||||
this->m_ptr = reinterpret_cast<pointer>(pyArray()->data);
|
||||
- vigra_precondition(checkInnerStride(Stride()),
|
||||
+ vigra_precondition(this->checkInnerStride(Stride()),
|
||||
"NumpyArray<..., UnstridedArrayTag>::setupArrayView(): First dimension of given array is not unstrided (should never happen).");
|
||||
|
||||
}
|
@ -2,11 +2,12 @@
|
||||
Summary: Generic Programming for Computer Vision
|
||||
Name: vigra
|
||||
Version: 1.8.0
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: MIT
|
||||
Group: Development/Libraries
|
||||
Source: http://hci.iwr.uni-heidelberg.de/%{name}/%{name}-%{version}-src.tar.gz
|
||||
Patch1: vigra-1.8.0.lib_suffix.patch
|
||||
Patch2: vigra-1.8.0.gcc47.patch
|
||||
URL: http://hci.iwr.uni-heidelberg.de/vigra/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: zlib-devel libjpeg-devel libpng-devel libtiff-devel fftw-devel >= 3
|
||||
@ -42,6 +43,7 @@ The vigra-python package provides python bindings for vigra
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%cmake .
|
||||
@ -79,6 +81,9 @@ rm -rf %{buildroot}
|
||||
%{python_sitearch}/vigra
|
||||
|
||||
%changelog
|
||||
* Mon Feb 27 2012 Bruno Postle <bruno@postle.net> 1.8.0-4
|
||||
- patch to build with gcc-4.7.0
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user