Compare commits
3 Commits
| Author | SHA1 | Date |
|---|---|---|
Fedora Release Engineering
|
49b72c01f7 | |
Bill Nottingham
|
2936d440f8 | |
Jesse Keating
|
2d6a5afacc |
|
|
@ -1,10 +1 @@
|
|||
vigra-1.7.0-src.tar.gz
|
||||
/vigra-1.7.1-src.tar.gz
|
||||
/vigra-1.8.0-src.tar.gz
|
||||
/vigra-1.9.0-src.tar.gz
|
||||
/vigra-config.sh
|
||||
/vigra-1.10.0-src.tar.gz
|
||||
/vigra-1.10.0-src-clean.tar.gz
|
||||
/vigra-1.11.0-src-clean.tar.gz
|
||||
/vigra-1.11.1-src.tar.gz
|
||||
/vigra-1.11.1-src-clean.tar.gz
|
||||
vigra1.5.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,139 +0,0 @@
|
|||
From 81958d302494e137f98a8b1d7869841532f90388 Mon Sep 17 00:00:00 2001
|
||||
From: JaimeIvanCervantes <jimmycc80@hotmail.com>
|
||||
Date: Fri, 16 Jun 2017 13:21:45 -0700
|
||||
Subject: [PATCH] multi_convolution: Fix for incorrect template parameter type
|
||||
when using unsigned int N for TinyVector SIZE. (Fixes #414)
|
||||
|
||||
---
|
||||
include/vigra/multi_convolution.hxx | 28 ++++++++++++++--------------
|
||||
1 file changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/include/vigra/multi_convolution.hxx b/include/vigra/multi_convolution.hxx
|
||||
index 1b5efa740..ec89bcf58 100644
|
||||
--- a/include/vigra/multi_convolution.hxx
|
||||
+++ b/include/vigra/multi_convolution.hxx
|
||||
@@ -1426,7 +1426,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
class T2, class S2>
|
||||
void
|
||||
gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
|
||||
+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
|
||||
double sigma,
|
||||
ConvolutionOptions<N> opt = ConvolutionOptions<N>());
|
||||
|
||||
@@ -1435,7 +1435,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
class T2, class S2>
|
||||
void
|
||||
gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
|
||||
+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
|
||||
ConvolutionOptions<N> opt);
|
||||
|
||||
// likewise, but execute algorithm in parallel
|
||||
@@ -1443,7 +1443,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
class T2, class S2>
|
||||
void
|
||||
gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
|
||||
+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
|
||||
BlockwiseConvolutionOptions<N> opt);
|
||||
}
|
||||
\endcode
|
||||
@@ -1590,7 +1590,7 @@ template <unsigned int N, class T1, class S1,
|
||||
class T2, class S2>
|
||||
inline void
|
||||
gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
|
||||
+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
|
||||
ConvolutionOptions<N> opt )
|
||||
{
|
||||
if(opt.to_point != typename MultiArrayShape<N>::type())
|
||||
@@ -1614,7 +1614,7 @@ template <unsigned int N, class T1, class S1,
|
||||
class T2, class S2>
|
||||
inline void
|
||||
gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
|
||||
+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
|
||||
double sigma,
|
||||
ConvolutionOptions<N> opt = ConvolutionOptions<N>())
|
||||
{
|
||||
@@ -1653,7 +1653,7 @@ gaussianGradientMagnitudeImpl(MultiArrayView<N+1, T1, S1> const & src,
|
||||
dest.init(0.0);
|
||||
|
||||
typedef typename NumericTraits<T1>::RealPromote TmpType;
|
||||
- MultiArray<N, TinyVector<TmpType, N> > grad(dest.shape());
|
||||
+ MultiArray<N, TinyVector<TmpType, int(N)> > grad(dest.shape());
|
||||
|
||||
using namespace multi_math;
|
||||
|
||||
@@ -1771,7 +1771,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
|
||||
class T2, class S2>
|
||||
void
|
||||
symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
|
||||
+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
|
||||
ConvolutionOptions<N> opt = ConvolutionOptions<N>());
|
||||
|
||||
// execute algorithm in parallel
|
||||
@@ -1779,7 +1779,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
|
||||
class T2, class S2>
|
||||
void
|
||||
symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
|
||||
+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
|
||||
BlockwiseConvolutionOptions<N> opt);
|
||||
}
|
||||
\endcode
|
||||
@@ -1895,7 +1895,7 @@ template <unsigned int N, class T1, class S1,
|
||||
class T2, class S2>
|
||||
inline void
|
||||
symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
|
||||
+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
|
||||
ConvolutionOptions<N> opt = ConvolutionOptions<N>())
|
||||
{
|
||||
if(opt.to_point != typename MultiArrayShape<N>::type())
|
||||
@@ -2214,14 +2214,14 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
template <unsigned int N, class T1, class S1,
|
||||
class T2, class S2>
|
||||
void
|
||||
- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
|
||||
+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
|
||||
MultiArrayView<N, T2, S2> divergence,
|
||||
ConvolutionOptions<N> const & opt);
|
||||
|
||||
template <unsigned int N, class T1, class S1,
|
||||
class T2, class S2>
|
||||
void
|
||||
- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
|
||||
+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
|
||||
MultiArrayView<N, T2, S2> divergence,
|
||||
double sigma,
|
||||
ConvolutionOptions<N> opt = ConvolutionOptions<N>());
|
||||
@@ -2231,7 +2231,7 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
|
||||
template <unsigned int N, class T1, class S1,
|
||||
class T2, class S2>
|
||||
void
|
||||
- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
|
||||
+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
|
||||
MultiArrayView<N, T2, S2> divergence,
|
||||
BlockwiseConvolutionOptions<N> const & opt);
|
||||
}
|
||||
@@ -2324,7 +2324,7 @@ gaussianDivergenceMultiArray(Iterator vectorField, Iterator vectorFieldEnd,
|
||||
template <unsigned int N, class T1, class S1,
|
||||
class T2, class S2>
|
||||
inline void
|
||||
-gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
|
||||
+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
|
||||
MultiArrayView<N, T2, S2> divergence,
|
||||
ConvolutionOptions<N> const & opt)
|
||||
{
|
||||
@@ -2338,7 +2338,7 @@ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & ve
|
||||
template <unsigned int N, class T1, class S1,
|
||||
class T2, class S2>
|
||||
inline void
|
||||
-gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
|
||||
+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
|
||||
MultiArrayView<N, T2, S2> divergence,
|
||||
double sigma,
|
||||
ConvolutionOptions<N> opt = ConvolutionOptions<N>())
|
||||
3
sources
3
sources
|
|
@ -1,2 +1 @@
|
|||
SHA512 (vigra-1.11.1-src-clean.tar.gz) = 38c500dacf7a8b8bba22bd3aabaacd061589f76331f9ccf17c52096fa82ff510e531f2120326970789e0f22c4584c35fcb7bfc0eaffce80bea28e2f545a0e12f
|
||||
SHA512 (vigra-config.sh) = 03201ad578ff332cb1186bfa9d4871ada509a8322fb07bd38f00e9254b8c7766920621bb617fdebd927714539fe1ca2a56e7a1a8ce91f02bc2e92d3572d47cb9
|
||||
5713de4ebfe29e1b5fa9689af76b8a90 vigra1.5.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
diff -up vigra-1.10.0/test/convolution/CMakeLists.txt.no-lenna vigra-1.10.0/test/convolution/CMakeLists.txt
|
||||
--- vigra-1.10.0/test/convolution/CMakeLists.txt.no-lenna 2013-11-18 11:48:16.000000000 -0500
|
||||
+++ vigra-1.10.0/test/convolution/CMakeLists.txt 2016-02-02 16:14:12.717684303 -0500
|
||||
@@ -1,3 +1 @@
|
||||
VIGRA_ADD_TEST(test_convolution test.cxx LIBRARIES vigraimpex)
|
||||
-
|
||||
-VIGRA_COPY_TEST_DATA(lenna128.xv lenna_simple_sharpening_orig.xv lenna_gaussian_sharpening_orig.xv lenna128sepgrad.xv lennahessxx.xv lennastxx.xv lenna128recgrad.xv lenna128nonlinear.xv resampling.xv lennahessyy.xv lennastyy.xv lennahessxy.xv lennastxy.xv lenna128rgb.xv lenna128rgbsepgrad.xv lenna_level-2.xv lenna_level-1.xv lenna_level1.xv lenna_level2.xv lenna_levellap0.xv lenna_levellap1.xv lenna_levellap2.xv lennargbst.xv)
|
||||
diff -up vigra-1.10.0/test/image/CMakeLists.txt.no-lenna vigra-1.10.0/test/image/CMakeLists.txt
|
||||
--- vigra-1.10.0/test/image/CMakeLists.txt.no-lenna 2013-11-18 11:48:16.000000000 -0500
|
||||
+++ vigra-1.10.0/test/image/CMakeLists.txt 2016-02-02 16:14:12.717684303 -0500
|
||||
@@ -1,3 +1,2 @@
|
||||
VIGRA_ADD_TEST(test_image test.cxx LIBRARIES vigraimpex)
|
||||
|
||||
-VIGRA_COPY_TEST_DATA(lenna.xv)
|
||||
diff -up vigra-1.10.0/test/imgproc/CMakeLists.txt.no-lenna vigra-1.10.0/test/imgproc/CMakeLists.txt
|
||||
--- vigra-1.10.0/test/imgproc/CMakeLists.txt.no-lenna 2016-02-02 16:15:28.441127606 -0500
|
||||
+++ vigra-1.10.0/test/imgproc/CMakeLists.txt 2016-02-02 16:15:35.169078143 -0500
|
||||
@@ -1,3 +1 @@
|
||||
VIGRA_ADD_TEST(test_imgproc test.cxx LIBRARIES vigraimpex)
|
||||
-
|
||||
-VIGRA_COPY_TEST_DATA(lenna128.xv lenna128rgb.xv splineimageview2.xv splineimageview3.xv splineimageview5.xv lenna42lin.xv lenna288neu.xv lenna42neu.xv lenna288rgbneu.xv lenna42rgbneu.xv lenna367FIR.xv lenna42FIR.xv lenna367IIR.xv lenna42IIR.xv lenna42linrgb.xv lennargb42FIR.xv lennargb42IIR.xv lenna_rotate.xv)
|
||||
diff -up vigra-1.10.0/test/impex/CMakeLists.txt.no-lenna vigra-1.10.0/test/impex/CMakeLists.txt
|
||||
--- vigra-1.10.0/test/impex/CMakeLists.txt.no-lenna 2016-02-02 16:15:50.345966568 -0500
|
||||
+++ vigra-1.10.0/test/impex/CMakeLists.txt 2016-02-02 16:15:59.993895639 -0500
|
||||
@@ -17,5 +17,3 @@ ENDIF(OPENEXR_FOUND)
|
||||
|
||||
VIGRA_ADD_TEST(test_impex test.cxx LIBRARIES vigraimpex)
|
||||
|
||||
-VIGRA_COPY_TEST_DATA(lenna.xv lenna_gifref.xv lennafloat.xv lennafloatrgb.xv lennargb.xv no-image.txt lenna_0.tif lenna_1.tif lenna_2.tif lenna_masked_color.tif lenna_masked_gray.tif bilevel.tiff)
|
||||
-
|
||||
diff -up vigra-1.10.0/test/simpleanalysis/CMakeLists.txt.no-lenna vigra-1.10.0/test/simpleanalysis/CMakeLists.txt
|
||||
--- vigra-1.10.0/test/simpleanalysis/CMakeLists.txt.no-lenna 2016-02-02 16:15:04.689302222 -0500
|
||||
+++ vigra-1.10.0/test/simpleanalysis/CMakeLists.txt 2016-02-02 16:15:14.169232529 -0500
|
||||
@@ -7,4 +7,4 @@ else()
|
||||
VIGRA_ADD_TEST(test_simpleanalysis test.cxx LIBRARIES vigraimpex)
|
||||
endif()
|
||||
|
||||
-VIGRA_COPY_TEST_DATA(noiseNormalizationTest.xv slantedEdgeMTF.xv lenna128.xv)
|
||||
+VIGRA_COPY_TEST_DATA(noiseNormalizationTest.xv slantedEdgeMTF.xv)
|
||||
diff -up vigra-1.10.0/test/slic2d/CMakeLists.txt.no-lenna vigra-1.10.0/test/slic2d/CMakeLists.txt
|
||||
--- vigra-1.10.0/test/slic2d/CMakeLists.txt.no-lenna 2013-11-18 11:48:16.000000000 -0500
|
||||
+++ vigra-1.10.0/test/slic2d/CMakeLists.txt 2016-02-02 16:14:12.717684303 -0500
|
||||
@@ -1,3 +1,3 @@
|
||||
|
||||
-VIGRA_COPY_TEST_DATA(lenna.xv slic.xv)
|
||||
-VIGRA_ADD_TEST(test_slic2d test.cxx LIBRARIES vigraimpex)
|
||||
\ No newline at end of file
|
||||
+VIGRA_COPY_TEST_DATA(slic.xv)
|
||||
+VIGRA_ADD_TEST(test_slic2d test.cxx LIBRARIES vigraimpex)
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
--- vigra-1.11.1/config/vigra-config.in 2017-12-16 14:34:37.544633998 -0600
|
||||
+++ vigra-1.11.1/config/vigra-config.in 2017-12-16 14:38:16.297616754 -0600
|
||||
@@ -93,4 +93,4 @@ if op.include_path: # was: --include_pat
|
||||
print('@CMAKE_INSTALL_PREFIX@/include')
|
||||
|
||||
if op.docdir:
|
||||
- print('@DOCDIR@')
|
||||
+ print('@CMAKE_INSTALL_PREFIX@/@DOCINSTALL@')
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -ur vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx vigra-1.11.1.new/vigranumpy/src/core/vigranumpycore.cxx
|
||||
--- vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx 2017-05-19 16:01:08.000000000 +0100
|
||||
+++ vigra-1.11.1.new/vigranumpy/src/core/vigranumpycore.cxx 2018-08-23 00:08:42.980416247 +0100
|
||||
@@ -61,7 +61,7 @@
|
||||
return checksum(data, size);
|
||||
#else
|
||||
Py_ssize_t size = 0;
|
||||
- char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
|
||||
+ const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
|
||||
return checksum(data, size);
|
||||
#endif
|
||||
}
|
||||
427
vigra.spec
427
vigra.spec
|
|
@ -1,44 +1,13 @@
|
|||
Summary: Generic Programming for Computer Vision
|
||||
Name: vigra
|
||||
Version: 1.11.1
|
||||
Release: 16%{?dist}
|
||||
License: MIT
|
||||
# The "Lenna" files are non-free, we need to remove them from the source tarball.
|
||||
# wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz
|
||||
# tar xf vigra-1.11.1-src.tar.gz
|
||||
# find vigra-1.11.1/ -name "lenna*" -delete
|
||||
# tar zcf vigra-1.11.1-src-clean.tar.gz vigra-1.11.1/
|
||||
Source0: %{name}-%{version}-src-clean.tar.gz
|
||||
Source1: vigra-config.sh
|
||||
# Backported from upstream master, fixes a build failure:
|
||||
# https://github.com/ukoethe/vigra/issues/414
|
||||
Patch0: https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch
|
||||
# Avoid attempt to install non-free 'lenna' files
|
||||
Patch1: vigra-1.10.0-no-lenna.patch
|
||||
Patch2: vigra-1.11.1.docdir.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1597394
|
||||
Patch3: vigra-1.11.1.py37.patch
|
||||
URL: http://ukoethe.github.io/vigra/
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: fftw-devel >= 3
|
||||
BuildRequires: cmake
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: doxygen
|
||||
%if ! 0%{?rhel}
|
||||
Requires: python3
|
||||
BuildRequires: hdf5-devel
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: OpenEXR-devel
|
||||
BuildRequires: python3-numpy-f2py
|
||||
BuildRequires: boost-python3
|
||||
BuildRequires: boost-python3-devel
|
||||
%else
|
||||
Requires: python
|
||||
%endif
|
||||
Summary: Generic Programming for Computer Vision
|
||||
Name: vigra
|
||||
Version: 1.5.0
|
||||
Release: 4%{?dist}
|
||||
License: MIT
|
||||
Group: Development/Libraries
|
||||
Source: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/%{name}%{version}.tar.gz
|
||||
URL: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: zlib-devel, libjpeg-devel, libpng-devel, libtiff-devel, fftw-devel >= 3
|
||||
|
||||
%description
|
||||
VIGRA stands for "Vision with Generic Algorithms". It's a novel computer vision
|
||||
|
|
@ -47,346 +16,60 @@ structures. By using template techniques similar to those in the C++ Standard
|
|||
Template Library, you can easily adapt any VIGRA component to the needs of your
|
||||
application without thereby giving up execution speed.
|
||||
|
||||
#'
|
||||
|
||||
%package devel
|
||||
Summary: Development tools for programs which will use the vigra library
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: libjpeg-devel libtiff-devel libpng-devel zlib-devel fftw-devel >= 3
|
||||
Requires: boost-devel
|
||||
%if ! 0%{?rhel}
|
||||
Requires: hdf5-devel
|
||||
Requires: OpenEXR-devel
|
||||
Requires: python3-numpy-f2py boost-python3 boost-python3-devel
|
||||
%endif
|
||||
Group: Development/Libraries
|
||||
Requires: vigra = %{version}-%{release}
|
||||
Requires: libjpeg-devel, libtiff-devel, libpng-devel, zlib-devel, fftw-devel >= 3
|
||||
|
||||
%description devel
|
||||
The vigra-devel package includes the header files necessary for developing
|
||||
programs that use the vigra library.
|
||||
|
||||
%if ! 0%{?rhel}
|
||||
%package -n python3-vigra
|
||||
%{?python_provide:%python_provide python3-vigra}
|
||||
Summary: Python 3 interface for the vigra computer vision library
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: python3-numpy python3-numpy-f2py
|
||||
|
||||
%description -n python3-vigra
|
||||
The python3-vigra package provides python 3 bindings for vigra
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q -n %{name}%{version}
|
||||
chmod 644 %{_builddir}/%{name}%{version}/doc/vigra/documents/*.ps
|
||||
rm -f %{_builddir}/%{name}%{version}/doc/vigra/.cvsignore
|
||||
|
||||
%build
|
||||
# Will need to set LEMON_DIR to /usr/share/coin-or-lemon/cmake to compile WITH_LEMON
|
||||
# once the coin-or-lemon package's installed cmake is fixed for x86_64 arch.
|
||||
%if ! 0%{?rhel}
|
||||
sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python3}=' \
|
||||
config/vigra-config.in
|
||||
sed -i 's=SET(BOOST_PYTHON_NAMES=& boost_python%{python3_version_nodots}=' \
|
||||
config/FindVIGRANUMPY_DEPENDENCIES.cmake
|
||||
|
||||
mkdir buildpy3
|
||||
pushd buildpy3
|
||||
%cmake .. -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VALGRIND=0 -DWITH_LEMON=0 \
|
||||
-DWITH_VIGRANUMPY=1 -DPYTHON_VERSION=%{python3_version}
|
||||
make VERBOSE=1 %{?_smp_mflags}
|
||||
popd
|
||||
%else
|
||||
sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python}=' \
|
||||
config/vigra-config.in
|
||||
|
||||
%cmake . -DWITH_OPENEXR=0 -DWITH_HDF5=0 -DWITH_VIGRANUMPY=0 -DWITH_VALGRIND=0 -DWITH_LEMON=0
|
||||
make VERBOSE=1 %{?_smp_mflags}
|
||||
%endif
|
||||
|
||||
# cleanup
|
||||
rm -f doc/vigranumpy/.buildinfo
|
||||
rm -f doc/vigra/lenna*
|
||||
rm -f doc/vigranumpy/vigra/lenna*
|
||||
find ./doc/ -type f | xargs chmod -x
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--with-tiff \
|
||||
--with-jpeg \
|
||||
--with-png \
|
||||
--with-zlib \
|
||||
--with-fftw \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--libdir=%{_libdir}
|
||||
make
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%if ! 0%{?rhel}
|
||||
make -C buildpy3 install DESTDIR=%{buildroot}
|
||||
mv %{buildroot}/%{_libdir}/vigranumpy/VigranumpyConfig.cmake \
|
||||
%{buildroot}/%{_libdir}/vigranumpy/Vigranumpy3Config.cmake
|
||||
|
||||
%else
|
||||
make install DESTDIR=%{buildroot}
|
||||
%endif
|
||||
|
||||
%makeinstall
|
||||
rm -f %{buildroot}/%{_libdir}/libvigraimpex.la
|
||||
rm -rf %{buildroot}/usr/doc
|
||||
(
|
||||
cd $RPM_BUILD_ROOT%{_bindir}
|
||||
mv vigra-config vigra-config-%{__isa_bits}
|
||||
)
|
||||
install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config
|
||||
|
||||
#fixme: this fails,
|
||||
#%check
|
||||
#make VERBOSE=1 check
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%ldconfig_scriptlets
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%doc LICENSE.txt
|
||||
%defattr(-, root, root,-)
|
||||
%doc LICENSE.txt README.txt
|
||||
%{_libdir}/libvigraimpex.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-, root, root,-)
|
||||
%{_bindir}/vigra-config
|
||||
%{_includedir}/vigra
|
||||
%{_bindir}/vigra-config*
|
||||
%{_libdir}/libvigraimpex.so
|
||||
%{_libdir}/vigra
|
||||
%doc doc/vigra doc/vigranumpy
|
||||
|
||||
%if ! 0%{?rhel}
|
||||
%files -n python3-vigra
|
||||
%{python3_sitearch}/vigra
|
||||
%{_libdir}/vigranumpy
|
||||
%endif
|
||||
%doc doc/vigra/*
|
||||
|
||||
%changelog
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Apr 11 2019 Richard Shaw <hobbes1069@gmail.com> - 1.11.1-15
|
||||
- Rebuild for OpenEXR 2.3.0.
|
||||
|
||||
* Sat Mar 16 2019 Orion Poplawski <orion@nwra.com> - 1.11.1-14
|
||||
- Rebuild for hdf5 1.10.5
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Jan 30 2019 Jonathan Wakely <jwakely@redhat.com> - 1.11.1-12
|
||||
- Rebuilt for Boost 1.69
|
||||
|
||||
* Tue Jan 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.11.1-11
|
||||
- Subpackage python2-vigra has been removed
|
||||
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
|
||||
|
||||
* Wed Aug 22 2018 Bruno Postle <bruno@postle.net> - 1.11.1-10
|
||||
- Patched for python 3.7
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1.11.1-8
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Tue May 01 2018 Jonathan Wakely <jwakely@redhat.com> - 1.11.1-7
|
||||
- Require boost-python2-devel to fix build with boost-1.66.0-7.fc29
|
||||
|
||||
* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.11.1-6
|
||||
- Rebuild to fix GCC 8 mis-compilation
|
||||
See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
|
||||
- Clean tarball of non-free image files (bump to 1.11.1 omitted this)
|
||||
- Backport patch from upstream to fix build
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Dec 15 2017 Troy Curtis, Jr <troycurtisjr@gmail.com> - 1.11.1-4
|
||||
- Add python3 subpackage
|
||||
- Disable compiling with LEMON
|
||||
- Move python shebang fix into spec file.
|
||||
|
||||
* Wed Dec 13 2017 Bruno Postle <bruno@postle.net> - 1.11.1-3
|
||||
- fix -devel dependency on boost-python2
|
||||
|
||||
* Mon Dec 11 2017 Bruno Postle <bruno@postle.net> - 1.11.1-2
|
||||
- Remove 'lenna' images
|
||||
|
||||
* Sun Dec 10 2017 Bruno Postle <bruno@postle.net> - 1.11.1-1
|
||||
- Upstream stable release
|
||||
|
||||
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.11.0-11
|
||||
- Add Provides for the old name without %%_isa
|
||||
|
||||
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.11.0-10
|
||||
- Python 2 binary package renamed to python2-vigra
|
||||
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2017 Jonathan Wakely <jwakely@redhat.com> - 1.11.0-7
|
||||
- Rebuilt for s390x binutils bug
|
||||
|
||||
* Tue Jul 04 2017 Jonathan Wakely <jwakely@redhat.com> - 1.11.0-6
|
||||
- Rebuilt for Boost 1.64
|
||||
|
||||
* Fri Feb 17 2017 Jonathan Wakely <jwakely@redhat.com> - 1.11.0-5
|
||||
- Fix build failure with GCC 7
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Dec 06 2016 Orion Poplawski <orion@cora.nwra.com> - 1.11.0-4
|
||||
- Rebuild for hdf5 1.8.18
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11.0-3
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Wed Jun 29 2016 Orion Poplawski <orion@cora.nwra.com> - 1.11.0-2
|
||||
- Rebuild for hdf5 1.8.17
|
||||
|
||||
* Wed Apr 13 2016 Bruno Postle <bruno@postle.net> - 1.11.0-1
|
||||
- Upstream stable release
|
||||
|
||||
* Tue Feb 2 2016 Tom Callaway <spot@fedoraproject.org> - 1.10.0-18
|
||||
- remove lenna files (non-free)
|
||||
|
||||
* Thu Jan 21 2016 Orion Poplawski <orion@cora.nwra.com> - 1.10.0-17
|
||||
- Rebuild for hdf5 1.8.16
|
||||
|
||||
* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 1.10.0-16
|
||||
- Rebuilt for Boost 1.60
|
||||
|
||||
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.10.0-15
|
||||
- Rebuilt for Boost 1.59
|
||||
|
||||
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.0-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||
|
||||
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.10.0-13
|
||||
- rebuild for Boost 1.58
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.0-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sun May 17 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.0-11
|
||||
- Rebuild for hdf5 1.8.15
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.10.0-10
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Wed Feb 04 2015 Petr Machata <pmachata@redhat.com> - 1.10.0-9
|
||||
- Bump for rebuild.
|
||||
|
||||
* Mon Feb 02 2015 Bruno Postle <bruno@postle.net> - 1.10.0-8
|
||||
- Fix for transparent alpha bug in 16bit and EXR output
|
||||
|
||||
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.10.0-7
|
||||
- Rebuild for boost 1.57.0
|
||||
|
||||
* Wed Jan 07 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.0-6
|
||||
- Rebuild for hdf5 1.8.14
|
||||
|
||||
* Wed Nov 26 2014 Rex Dieter <rdieter@fedoraproject.org> 1.10.0-5
|
||||
- rebuild (openexr), tighten subpkg deps (via %%{?_isa})
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 1.10.0-2
|
||||
- Rebuild for boost 1.55.0
|
||||
|
||||
* Fri Dec 13 2013 Bruno Postle <bruno@postle.net> - 1.10.0-1
|
||||
- upstream release
|
||||
|
||||
* Wed Nov 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.9.0-14
|
||||
- rebuild (openexr)
|
||||
|
||||
* Sat Sep 21 2013 David Tardon <dtardon@redhat.com> - 1.9.0-13
|
||||
- rebuild for atlas 3.10
|
||||
|
||||
* Thu Sep 12 2013 Caolán McNamara <caolanm@redhat.com> - 1.9.0-12
|
||||
- bump n-v-r
|
||||
|
||||
* Thu Aug 29 2013 Caolán McNamara <caolanm@redhat.com> - 1.9.0-11
|
||||
- Resolves: rhbz#884207 multi-lib vigra-config
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2013 pmachata@redhat.com - 1.9.0-9
|
||||
- Rebuild for boost 1.54.0
|
||||
|
||||
* Wed Jul 24 2013 Caolán McNamara <caolanm@redhat.com> - 1.9.0-8
|
||||
- Resolves: rhbz#987048 explicit python path in shebang
|
||||
|
||||
* Tue Jun 04 2013 Caolán McNamara <caolanm@redhat.com> - 1.9.0-7
|
||||
- Resolves: rhbz#970561 no hdf5-devel in RHEL-7
|
||||
|
||||
* Thu May 16 2013 Orion Poplawski <orion@cora.nwra.com> - 1.9.0-6
|
||||
- Rebuild for hdf5 1.8.11
|
||||
|
||||
* Sun Mar 10 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.9.0-5
|
||||
- rebuild (OpenEXR)
|
||||
|
||||
* Thu Feb 14 2013 Caolán McNamara <caolanm@redhat.com> - 1.9.0-4
|
||||
- no hdf5-devel in RHEL-7
|
||||
|
||||
* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.9.0-3
|
||||
- Rebuild for Boost-1.53.0
|
||||
|
||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.9.0-2
|
||||
- rebuild due to "jpeg8-ABI" feature drop
|
||||
|
||||
* Tue Nov 06 2012 Bruno Postle <bruno@postle.net> 1.9.0-1
|
||||
- upstream release, support impex OpenEXR
|
||||
|
||||
* Tue Nov 06 2012 Caolán McNamara <caolanm@redhat.com> - 1.8.0-7
|
||||
- document that there is a test suite, but it fails
|
||||
|
||||
* Wed Oct 31 2012 Tom Callaway <spot@fedoraproject.org> - 1.8.0-6
|
||||
- rebuild
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* 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
|
||||
|
||||
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.8.0-2
|
||||
- Rebuild for new libpng
|
||||
|
||||
* Sat Sep 24 2011 Bruno Postle <bruno@postle.net> 1.8.0-1
|
||||
- upstream release
|
||||
|
||||
* Fri Aug 26 2011 Tom Callaway <spot@fedoraproject.org> - 1.7.1-4
|
||||
- rebuild against boost
|
||||
|
||||
* Tue May 17 2011 Orion Poplawski <orion@cora.nwra.com> - 1.7.1-3
|
||||
- Rebuild for hdf5 1.8.7
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Sun Jan 23 2011 Bruno Postle <bruno@postle.net> 1.7.1-1
|
||||
- upstream release
|
||||
|
||||
* Fri Jul 30 2010 Toshio Kuratomi <toshio@fedoraproject.org> 1.7.0-2
|
||||
- Rebuild for new python release
|
||||
|
||||
* Tue Apr 20 2010 Bruno Postle <bruno@postle.net> 1.7.0-1
|
||||
- new upstream with cmake replacing autotools.
|
||||
- patch for x86_64 systems.
|
||||
- add vigra-python sub-package.
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Mon Jun 08 2009 Bruno Postle - 1.6.0-1
|
||||
- Update to latest release
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.5.0-4
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
|
|
@ -397,7 +80,37 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config
|
|||
- update to 1.5.0 release
|
||||
- fix bug 228926: vigra: $RPM_OPT_FLAGS not used
|
||||
|
||||
* Tue Sep 12 2006 Bruno Postle <bruno@postle.net> 1.4.0-4
|
||||
- remove gcc-c++ dependency
|
||||
|
||||
* Fri Sep 08 2006 Bruno Postle <bruno@postle.net> 1.4.0-3
|
||||
- change defattr
|
||||
- require fftw >= 3, gcc-c++
|
||||
|
||||
* Tue Sep 05 2006 Bruno Postle <bruno@postle.net> 1.4.0-2
|
||||
- update with review feedback
|
||||
|
||||
* Mon Aug 28 2006 Bruno Postle <bruno@postle.net> 1.4.0-1
|
||||
- revive, update to 1.4 with new license, remove patches,
|
||||
- split to devel package
|
||||
|
||||
* Fri Jul 02 2004 Bruno Postle <bruno@postle.net>
|
||||
- add pablo's vigra_typetraits_extension.diff patch and shorten
|
||||
the impex patch so it doesn't conflict
|
||||
|
||||
* Wed May 05 2004 Bruno Postle <bruno@postle.net>
|
||||
- new build with patches for 16bit tiff and viff bug
|
||||
|
||||
* Sun Feb 08 2004 Bruno Postle <bruno@postle.net>
|
||||
- new build with shared libraries
|
||||
|
||||
* Wed Jan 04 2004 Bruno Postle <bruno@postle.net>
|
||||
- new build without shared libraries
|
||||
|
||||
* Tue Nov 25 2003 Bruno Postle <bruno@postle.net>
|
||||
- new build with shared libraries
|
||||
|
||||
* Sun Nov 23 2003 Bruno Postle <bruno@postle.net>
|
||||
- initial package
|
||||
- make a horrible mess
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue