From 2d19ad2046d2f4fa30e9f3ad940a50c7888f313d Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Aug 02 2019 05:49:29 +0000 Subject: Update to 6.1.0 Fix cmake build --- diff --git a/.gitignore b/.gitignore index a490769..03803bd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /openvdb-5.2.0.tar.gz /openvdb-6.0.0.tar.gz /boost-1.67.patch +/openvdb-6.1.0.tar.gz diff --git a/openvdb.spec b/openvdb.spec index bc604cb..146f40d 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -5,8 +5,8 @@ %global with_tests 0 Name: openvdb -Version: 6.0.0 -Release: 3%{?dist} +Version: 6.1.0 +Release: 1%{?dist} Summary: C++ library for sparse volumetric data discretized on three-dimensional grids License: MPLv2.0 URL: http://www.openvdb.org/ @@ -14,7 +14,7 @@ URL: http://www.openvdb.org/ Source0: https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: blosc-devel >= 1.5.0 -BuildRequires: boost-devel >= 1.57.0 +BuildRequires: boost-devel >= 1.61 BuildRequires: boost-python3-devel BuildRequires: cmake >= 2.8 BuildRequires: cppunit-devel >= 1.10 @@ -27,15 +27,15 @@ BuildRequires: ilmbase-devel BuildRequires: jemalloc-devel BuildRequires: libXi-devel BuildRequires: log4cplus-devel >= 1.0 -BuildRequires: OpenEXR-devel +BuildRequires: OpenEXR-devel >= 2.2 Requires: python3 BuildRequires: python3-numpy BuildRequires: python3-devel BuildRequires: tbb-devel >= 3.0 -BuildRequires: zlib-devel +BuildRequires: zlib-devel > 1.2.7 # Borrowed from Arch linux -Patch: boost-1.67.patch +# Patch: boost-1.67.patch %description @@ -103,7 +103,10 @@ sed -i \ # does not build docs yet cp %{name}/Makefile %{name}/Makefile.docbuild +mkdir build + %build +pushd build export CXXFLAGS="%{optflags} -Wl,--as-needed" %cmake \ -DBLOSC_LOCATION=%{_prefix} \ @@ -111,18 +114,18 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed" -DCPPUNIT_LOCATION=%{_prefix} \ -DGLEW_LOCATION=%{_prefix} \ -DGLFW3_LOCATION=%{_prefix} \ - -DILMBASE_NAMESPACE_VERSIONING=OFF \ + -DILMBASE_NAMESPACE_VERSIONING=ON \ -DILMBASE_LOCATION=%{_prefix} \ -DOPENEXR_LOCATION=%{_prefix} \ - -DOPENEXR_NAMESPACE_VERSIONING=OFF \ + -DOPENEXR_NAMESPACE_VERSIONING=ON \ -DOPENVDB_ENABLE_RPATH=OFF \ - -DOPENVDB_ABI_VERSION_NUMBER=3 \ -DOPENVDB_BUILD_UNITTESTS=OFF \ -DPYTHON_VERSION=%{python_version} \ -DPY_OPENVDB_USE_NUMPY=True \ -DTBB_LOCATION=%{_prefix} \ - -DUSE_GLFW3=True - + -DUSE_GLFW3=True \ + .. +popd %make_build # Build docs with previously saved Makefile @@ -138,7 +141,9 @@ popd %endif %install +pushd build %make_install +popd # Remove CMakeFiles from includes rm -fr %{buildroot}/%{_includedir}/%{name}/CMakeFiles @@ -171,6 +176,10 @@ find %{buildroot} -name '*.a' -delete %doc %{name}/doc/html %changelog +* Thu Aug 01 2019 Luya Tshimbalanga - 6.1.0-1 +- Update to 6.1.0 +- Fix cmake build + * Thu Jul 25 2019 Fedora Release Engineering - 6.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 001df43..5253309 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (openvdb-6.0.0.tar.gz) = 6b9e267fff46647b39e1e6faa12059442196c1858df1fda1515cfc375e25bc3033e2828c80e63a652509cfba386376e022cebf81ec85aaccece421b0c721529b -SHA512 (boost-1.67.patch) = 48075304517a9e0f52d5c22c575a22fb7904c743262652d4abe1028bfc540d4f5a8a97bd754acbb3959a7c148d12c7e55a71bd630e59bf4fe51433ac9dca4372 +SHA512 (openvdb-6.1.0.tar.gz) = 99ebbb50104ef87792ab73989e8714c4f283fb02d04c3033126b5f0d927ff7bbdebe35c8214ded841692941d8ed8ae551fd6d1bf90ad7dc07bedc3b38b9c4b38