Hello community, here is the log from the commit of package CSXCAD for openSUSE:Factory checked in at 2019-01-15 09:15:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/CSXCAD (Old) and /work/SRC/openSUSE:Factory/.CSXCAD.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "CSXCAD" Tue Jan 15 09:15:32 2019 rev:8 rq:658527 version:0.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/CSXCAD/CSXCAD.changes 2018-04-30 22:54:12.254826274 +0200 +++ /work/SRC/openSUSE:Factory/.CSXCAD.new.28833/CSXCAD.changes 2019-01-15 09:15:35.750279003 +0100 @@ -1,0 +2,8 @@ +Sat Dec 15 11:29:36 UTC 2018 - Stefan Brüns <[email protected]> + +- Update to version 0.6.2 + * Various bug fixes and enhancements, no changelog available. +- Use split boost dependencies +- Rebase CSXCAD-hdf5.patch + +------------------------------------------------------------------- Old: ---- CSXCAD-0.6.1.tar.gz New: ---- CSXCAD-0.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.0nOWFv/_old 2019-01-15 09:15:36.378278420 +0100 +++ /var/tmp/diff_new_pack.0nOWFv/_new 2019-01-15 09:15:36.382278416 +0100 @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: CSXCAD %define octpkg csxcad -Version: 0.6.1 +Version: 0.6.2 Release: 0 %define so_ver 0 %define libname lib%{name}%{so_ver} @@ -37,7 +37,16 @@ Patch4: CSXCAD-readme-octave-package.patch # PATCH-FIX-UPSTREAM CSXCAD-HDF5.patch Patch5: CSXCAD-hdf5.patch +%if 0%{?suse_version} >= 1500 +BuildRequires: libboost_chrono-devel +BuildRequires: libboost_date_time-devel +BuildRequires: libboost_headers-devel +BuildRequires: libboost_serialization-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_thread-devel +%else BuildRequires: boost-devel +%endif BuildRequires: cgal-devel BuildRequires: cmake BuildRequires: fparser-devel @@ -156,21 +165,18 @@ %octave --eval "pkg rebuild" %files -n %{libname} -%defattr(-,root,root,-) -%doc COPYING NEWS README +%license COPYING +%doc NEWS README %{_libdir}/lib%{name}.so.* %files devel -%defattr(-,root,root,-) %{_libdir}/lib%{name}.so %{_includedir}/%{name}/ %files -n octave-%{name} -%defattr(-,root,root,-) %{octpackages_dir}/%{octpkg}-%{version} %files -n %{name}-matlab -%defattr(-,root,root,-) %dir %{_datadir}/%{name} %{_datadir}/%{name}/matlab/ ++++++ CSXCAD-0.6.1.tar.gz -> CSXCAD-0.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.1/CMakeLists.txt new/CSXCAD-0.6.2/CMakeLists.txt --- old/CSXCAD-0.6.1/CMakeLists.txt 2016-05-12 21:08:27.000000000 +0200 +++ new/CSXCAD-0.6.2/CMakeLists.txt 2017-02-18 15:18:31.000000000 +0100 @@ -6,14 +6,14 @@ SET( CMAKE_BUILD_TYPE Release CACHE STRING "Set to either \"Release\" or \"Debug\"" ) ENDIF() -PROJECT(CSXCAD CXX) +PROJECT(CSXCAD CXX C) cmake_minimum_required(VERSION 2.8) # default set(LIB_VERSION_MAJOR 0) set(LIB_VERSION_MINOR 6) -set(LIB_VERSION_PATCH 1) +set(LIB_VERSION_PATCH 2) set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}) set(VERSION "v${LIB_VERSION_STRING}") @@ -91,7 +91,7 @@ ADD_DEFINITIONS( -DTIXML_USE_STL ) find_package(HDF5 1.8 COMPONENTS C HL REQUIRED) -INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR}) +INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS}) link_directories(${HDF5_LIBRARY_DIRS}) # hdf5 compat ADD_DEFINITIONS( -DH5_USE_16_API ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.1/src/CMakeLists.txt new/CSXCAD-0.6.2/src/CMakeLists.txt --- old/CSXCAD-0.6.1/src/CMakeLists.txt 2016-05-12 21:08:27.000000000 +0200 +++ new/CSXCAD-0.6.2/src/CMakeLists.txt 2017-02-18 15:18:31.000000000 +0100 @@ -89,6 +89,7 @@ ${fparser_LIBRARIES} ${TinyXML_LIBRARIES} ${HDF5_LIBRARIES} + ${HDF5_HL_LIBRARIES} CGAL ${Boost_LIBRARIES} ${vtk_LIBS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.1/src/CSPrimBox.cpp new/CSXCAD-0.6.2/src/CSPrimBox.cpp --- old/CSXCAD-0.6.1/src/CSPrimBox.cpp 2016-05-12 21:08:27.000000000 +0200 +++ new/CSXCAD-0.6.2/src/CSPrimBox.cpp 2017-02-18 15:18:31.000000000 +0100 @@ -56,9 +56,6 @@ bool CSPrimBox::GetBoundBox(double dBoundBox[6], bool PreserveOrientation) { -// if ( (m_MeshType!=m_PrimCoordSystem) && (m_PrimCoordSystem!=UNDEFINED_CS)) -// std::cerr << "GetBoundBox::GetBoundBox: Warning: The bounding box for this object is not calculated properly... " << std::endl; - const double* start = m_Coords[0].GetCoords(m_MeshType); const double* stop = m_Coords[1].GetCoords(m_MeshType); @@ -81,6 +78,9 @@ dBoundBox[2*i]=dBoundBox[2*i+1]; dBoundBox[2*i+1]=help; } + if ( (m_MeshType!=m_PrimCoordSystem) && (m_PrimCoordSystem!=UNDEFINED_CS)) + // if the box is defined in a coordinate system other than the expected one, this BB is invalid + return false; return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.1/src/CSPrimPolyhedron.cpp new/CSXCAD-0.6.2/src/CSPrimPolyhedron.cpp --- old/CSXCAD-0.6.1/src/CSPrimPolyhedron.cpp 2016-05-12 21:08:27.000000000 +0200 +++ new/CSXCAD-0.6.2/src/CSPrimPolyhedron.cpp 2017-02-18 15:18:31.000000000 +0100 @@ -193,7 +193,11 @@ //build tree delete d_ptr->m_PolyhedronTree; - d_ptr->m_PolyhedronTree = new CGAL::AABB_tree< Traits >(faces(d_ptr->m_Polyhedron).first,faces(d_ptr->m_Polyhedron).second,d_ptr->m_Polyhedron); +#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,6,0) + d_ptr->m_PolyhedronTree = new CGAL::AABB_tree< Traits >(faces(d_ptr->m_Polyhedron).first,faces(d_ptr->m_Polyhedron).second,d_ptr->m_Polyhedron); +#else + d_ptr->m_PolyhedronTree = new CGAL::AABB_tree< Traits >(d_ptr->m_Polyhedron.facets_begin(),d_ptr->m_Polyhedron.facets_end()); +#endif //update local bounding box GetBoundBox(m_BoundBox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.1/src/CSPrimPolyhedron_p.h new/CSXCAD-0.6.2/src/CSPrimPolyhedron_p.h --- old/CSXCAD-0.6.1/src/CSPrimPolyhedron_p.h 2016-05-12 21:08:27.000000000 +0200 +++ new/CSXCAD-0.6.2/src/CSPrimPolyhedron_p.h 2017-02-18 15:18:31.000000000 +0100 @@ -6,8 +6,12 @@ #include <CGAL/Polyhedron_3.h> #include <CGAL/AABB_tree.h> #include <CGAL/AABB_traits.h> -#include <CGAL/AABB_face_graph_triangle_primitive.h> - +#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,6,0) + #include <CGAL/AABB_face_graph_triangle_primitive.h> +#else + #include <CGAL/AABB_polyhedron_triangle_primitive.h> + #include <CGAL/AABB_polyhedron_segment_primitive.h> +#endif typedef CGAL::Simple_cartesian<double> Kernel; typedef CGAL::Polyhedron_3<Kernel> Polyhedron; @@ -24,7 +28,11 @@ }; typedef Kernel::Point_3 Point; +#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,6,0) typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive; +#else +typedef CGAL::AABB_polyhedron_triangle_primitive<Kernel,Polyhedron> Primitive; +#endif typedef CGAL::AABB_traits<Kernel, Primitive> Traits; typedef CGAL::Simple_cartesian<double>::Ray_3 Ray; typedef Kernel::Segment_3 Segment; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.1/src/CSPrimitives.cpp new/CSXCAD-0.6.2/src/CSPrimitives.cpp --- old/CSXCAD-0.6.1/src/CSPrimitives.cpp 2016-05-12 21:08:27.000000000 +0200 +++ new/CSXCAD-0.6.2/src/CSPrimitives.cpp 2017-02-18 15:18:31.000000000 +0100 @@ -123,6 +123,13 @@ m_BoundBoxValid = false; } +CSTransform* CSPrimitives::GetTransform() +{ + if (m_Transform==NULL) + m_Transform = new CSTransform(clParaSet); + return m_Transform; +} + void CSPrimitives::SetProperty(CSProperties *prop) { if ((clProperty!=NULL) && (clProperty!=prop)) @@ -146,8 +153,9 @@ return 0; // unable to decide with an invalid bounding box if ((this->GetBoundBoxCoordSystem()!=UNDEFINED_CS) && (this->GetBoundBoxCoordSystem()!=this->GetCoordInputType())) return 0; // unable to decide if coordinate system do not match - if (this->GetTransform()!=NULL) - return 0; // unable to decide if a transformation is used + if (m_Transform!=NULL) + if (m_Transform->HasTransform()) + return 0; // unable to decide if a transformation is used for (int i=0;i<3;++i) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.1/src/CSPrimitives.h new/CSXCAD-0.6.2/src/CSPrimitives.h --- old/CSXCAD-0.6.1/src/CSPrimitives.h 2016-05-12 21:08:27.000000000 +0200 +++ new/CSXCAD-0.6.2/src/CSPrimitives.h 2017-02-18 15:18:31.000000000 +0100 @@ -177,7 +177,8 @@ //! Read the coordinate system for this primitive (may be different to the input mesh type) \sa GetCoordInputType CoordinateSystem GetCoordinateSystem() const {return m_PrimCoordSystem;} - CSTransform* GetTransform() const {return m_Transform;} + //! Get the CSTransform if it exists already or create a new one + CSTransform* GetTransform(); //! Show status of this primitve virtual void ShowPrimitiveStatus(std::ostream& stream); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.1/src/CSTransform.cpp new/CSXCAD-0.6.2/src/CSTransform.cpp --- old/CSXCAD-0.6.1/src/CSTransform.cpp 2016-05-12 21:08:27.000000000 +0200 +++ new/CSXCAD-0.6.2/src/CSTransform.cpp 2017-02-18 15:18:31.000000000 +0100 @@ -73,6 +73,11 @@ MakeUnitMatrix(m_Inv_TMatrix); } +bool CSTransform::HasTransform() +{ + return (m_TransformList.size()>0); +} + void CSTransform::Invert() { //make sure the inverse matrix is up to date... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.1/src/CSTransform.h new/CSXCAD-0.6.2/src/CSTransform.h --- old/CSXCAD-0.6.1/src/CSTransform.h 2016-05-12 21:08:27.000000000 +0200 +++ new/CSXCAD-0.6.2/src/CSTransform.h 2017-02-18 15:18:31.000000000 +0100 @@ -85,6 +85,9 @@ void Reset(); + //! Check if this CSTransform has any transformations + bool HasTransform(); + //! All subsequent operations will be occur before the previous operations (not the default). void SetPreMultiply() {m_PostMultiply=false;} //! All subsequent operations will be after the previous operations (default). ++++++ CSXCAD-hdf5.patch ++++++ --- /var/tmp/diff_new_pack.0nOWFv/_old 2019-01-15 09:15:36.470278334 +0100 +++ /var/tmp/diff_new_pack.0nOWFv/_new 2019-01-15 09:15:36.470278334 +0100 @@ -8,6 +8,6 @@ -find_package(HDF5 1.8 COMPONENTS C HL REQUIRED) +find_package(HDF5 1.8 COMPONENTS CXX HL REQUIRED) - INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR}) + INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS}) link_directories(${HDF5_LIBRARY_DIRS}) # hdf5 compat
