openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package openvdb (Revision 55e2df68f2a366ff7e5694c025d86603)

Currently displaying revision 55e2df68f2a366ff7e5694c025d86603 , Show latest

--- openvdb.changes.orig
+++ openvdb.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Fri Sep  9 21:11:41 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Enable nanovdb as build conditional
+
+-------------------------------------------------------------------
 Sun Nov 21 20:53:42 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
 - Update to version 9.0.0
@@ -121,6 +126,11 @@ Sun Nov 21 20:53:42 UTC 2021 - Ben Grein
 - Update constraints and limit memory for parallel build jobs
 
 -------------------------------------------------------------------
+Wed Aug 18 10:55:41 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Raise minimum c++ standard to 14
+
+-------------------------------------------------------------------
 Tue Aug 10 11:49:25 UTC 2021 - pgajdos@suse.com
 
 - do not depend on OpenEXR (do not build vdb_render) [bsc#1189344]
--- openvdb.spec.orig
+++ openvdb.spec
@@ -1,8 +1,8 @@
 #
 # spec file for package openvdb
 #
-# Copyright (c) 2021 SUSE LLC
-# Copyright (c) 2019-2020 LISA GmbH, Bingen, Germany.
+# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2019-2022 LISA GmbH, Bingen, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,8 @@
 #
 
 
+%bcond_without nanovdb
+
 %define libname libopenvdb9_0
 
 Name:           openvdb
@@ -42,7 +44,10 @@ BuildRequires:  pkgconfig
 BuildRequires:  tbb-devel
 BuildRequires:  xorg-x11-devel
 BuildRequires:  pkgconfig(blosc)
+BuildRequires:  pkgconfig(glfw3)
+BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(jemalloc)
+BuildRequires:  pkgconfig(libglvnd)
 
 %description
 OpenVDB is a C++ library comprising a hierarchical data structure and
@@ -79,15 +84,21 @@ library: vdb_lod, vdb_print, vdb_render,
 
 %prep
 %setup -q
+%autopatch -p1
 
 %build
 %limit_build -m 3072
 # -DCMAKE_NO_SYSTEM_FROM_IMPORTED:BOOL=TRUE is needed,
 # will bail out with: stdlib.h not found otherwise
 %cmake \
+    -DCMAKE_CXX_STANDARD=14 \
     -DCMAKE_C_FLAGS:STRING="$CFLAGS %{optflags} -fPIC " \
     -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS %{optflags} -fPIC " \
     -DCMAKE_NO_SYSTEM_FROM_IMPORTED:BOOL=TRUE \
+    -DOpenGL_GL_PREFERENCE=GLVND \
+%if %{with nanovdb}
+    -DUSE_NANOVDB=ON \
+%endif
     -DOPENVDB_BUILD_VDB_PRINT=ON \
     -DOPENVDB_BUILD_VDB_LOD=ON \
     -DOPENVDB_BUILD_VDB_VIEW=ON \
@@ -113,6 +124,10 @@ rm %{buildroot}%{_libdir}/libopenvdb.a
 %files devel
 %license LICENSE
 %{_includedir}/%{name}
+%if %{with nanovdb}
+%{_includedir}/nanovdb
+%{_includedir}/nanovdb/util
+%endif
 %{_libdir}/cmake/OpenVDB
 %{_libdir}/*.so
 
@@ -122,5 +137,9 @@ rm %{buildroot}%{_libdir}/libopenvdb.a
 %{_bindir}/vdb_print
 %{_bindir}/vdb_view
 %{_bindir}/vdb_render
+%if %{with nanovdb}
+%{_bindir}/nanovdb_print
+%{_bindir}/nanovdb_validate
+%endif
 
 %changelog

Places

File project.diff of Package openvdb (Revision 55e2df68f2a366ff7e5694c025d86603)

Places