diff --git a/ompl-1.0.0-cxx11.patch b/ompl-1.0.0-cxx11.patch new file mode 100644 index 0000000..db2e3aa --- /dev/null +++ b/ompl-1.0.0-cxx11.patch @@ -0,0 +1,17 @@ +--- ompl-1.0.0-Source/src/ompl/control/planners/syclop/Syclop.h.orig 2016-02-02 18:20:36.686126236 +0000 ++++ ompl-1.0.0-Source/src/ompl/control/planners/syclop/Syclop.h 2016-02-02 18:43:04.578724650 +0000 +@@ -283,6 +283,14 @@ + virtual ~Region() + { + } ++ ++#if __cplusplus >= 201103L ++ Region(const Region&) = default; ++ Region& operator=(const Region&) = default; ++ Region(Region&&) = default; ++ Region& operator=(Region&&) = default; ++#endif ++ + /** \brief Clears motions and coverage information from this region. */ + void clear() + { diff --git a/ompl.spec b/ompl.spec index 9d79f25..93a3aef 100644 --- a/ompl.spec +++ b/ompl.spec @@ -1,12 +1,14 @@ Name: ompl Version: 1.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: The Open Motion Planning Library Group: System Environment/Libraries License: BSD URL: http://ompl.kavrakilab.org/ Source0: https://bitbucket.org/%{name}/%{name}/downloads/%{name}-%{version}-Source.tar.gz +# https://bitbucket.org/ompl/ompl/issues/206/cannot-compile-as-c-11 +Patch0: ompl-1.0.0-cxx11.patch BuildRequires: boost-devel >= 1.42.0 BuildRequires: cmake >= 2.8.2 BuildRequires: doxygen @@ -36,6 +38,7 @@ developing applications that use %{name}. %prep %setup -q -n %{name}-%{version}-Source +%patch0 -p1 # Get rid of bundled odeint rm -rf src/external/omplext_odeint/ @@ -90,6 +93,9 @@ make -C build test || exit 0 %{_datadir}/cmake/Modules/FindOMPL.cmake %changelog +* Tue Feb 02 2016 Jonathan Wakely 1.0.0-9 +- Patched for C++11 compatibility + * Fri Jan 15 2016 Jonathan Wakely - 1.0.0-8 - Rebuilt for Boost 1.60