Summary: | cad/meshlab : fix build with GCC 4.7, unbreak | ||
---|---|---|---|
Product: | Ports & Packages | Reporter: | Christoph Moench-Tegeder <cmt> |
Component: | Individual Port(s) | Assignee: | Pietro Cerutti <gahr> |
Status: | Closed FIXED | ||
Severity: | Affects Only Me | ||
Priority: | Normal | ||
Version: | Latest | ||
Hardware: | Any | ||
OS: | Any |
Description
Christoph Moench-Tegeder
2013-12-07 16:50:00 UTC
Responsible Changed From-To: freebsd-ports-bugs->gahr Over to maintainer (via the GNATS Auto Assign Tool) Apologies, the PR to reference should have been 182136. Gerald If this builds fine on all supported releases, please go ahead. Thanks! -- Pietro Cerutti The FreeBSD Project gahr@FreeBSD.org PGP Public Key: http://gahr.ch/pgp State Changed From-To: open->closed Committed, thanks! Author: mat Date: Tue Jan 7 22:48:05 2014 New Revision: 339043 URL: http://svnweb.freebsd.org/changeset/ports/339043 Log: Fix build with gcc47 PR: ports/184565 Submitted by: Christoph Moench-Tegeder Approved by: maintainer Added: head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h (contents, props changed) head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h (contents, props changed) Deleted: head/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h Added: head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h Tue Jan 7 22:48:05 2014 (r339043) @@ -0,0 +1,15 @@ +--- ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h.orig 2013-11-16 22:04:41.000000000 +0100 ++++ ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h 2013-11-16 22:04:56.000000000 +0100 +@@ -39,10 +39,11 @@ + //ScalarType BinWidth(ScalarType v); + + //! Reset histogram data. ++ /* dead code + void Clear() { + this->::Clear(); + CV.clear(); +- } ++ } */ + /* + Note that the histogram holds <n> valid bins plus two semi-infinite bins. + Added: head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h Tue Jan 7 22:48:05 2014 (r339043) @@ -0,0 +1,18 @@ +--- ../../vcglib/wrap/gl/trimesh.h.orig 2013-11-16 21:32:47.000000000 +0100 ++++ ../../vcglib/wrap/gl/trimesh.h 2013-11-16 21:33:23.000000000 +0100 +@@ -895,6 +895,7 @@ + #define VCTRACE (void)0 + //#define VCTRACE TRACE + ++/* dead code + template<class MESH_TYPE> + void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad) + { +@@ -1006,6 +1007,7 @@ + m.vert.math::Swap(newvert); + m.vn=m.vert.size(); + } ++*/ + + /* + Secondo tipo di crease angle. ha bisogno del per wedge normal _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" Author: mat Date: Tue Jan 7 23:21:35 2014 New Revision: 339048 URL: http://svnweb.freebsd.org/changeset/ports/339048 Log: MFH: r339043 Fix build with gcc47 PR: ports/184565 Submitted by: Christoph Moench-Tegeder Approved by: maintainer Approved by: portmgr (implicit) Added: branches/2014Q1/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h - copied unchanged from r339043, head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h branches/2014Q1/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h - copied unchanged from r339043, head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h Deleted: branches/2014Q1/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h (from r339043, head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h Tue Jan 7 23:21:35 2014 (r339048, copy of r339043, head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h) @@ -0,0 +1,15 @@ +--- ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h.orig 2013-11-16 22:04:41.000000000 +0100 ++++ ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h 2013-11-16 22:04:56.000000000 +0100 +@@ -39,10 +39,11 @@ + //ScalarType BinWidth(ScalarType v); + + //! Reset histogram data. ++ /* dead code + void Clear() { + this->::Clear(); + CV.clear(); +- } ++ } */ + /* + Note that the histogram holds <n> valid bins plus two semi-infinite bins. + Copied: branches/2014Q1/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h (from r339043, head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h Tue Jan 7 23:21:35 2014 (r339048, copy of r339043, head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h) @@ -0,0 +1,18 @@ +--- ../../vcglib/wrap/gl/trimesh.h.orig 2013-11-16 21:32:47.000000000 +0100 ++++ ../../vcglib/wrap/gl/trimesh.h 2013-11-16 21:33:23.000000000 +0100 +@@ -895,6 +895,7 @@ + #define VCTRACE (void)0 + //#define VCTRACE TRACE + ++/* dead code + template<class MESH_TYPE> + void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad) + { +@@ -1006,6 +1007,7 @@ + m.vert.math::Swap(newvert); + m.vn=m.vert.size(); + } ++*/ + + /* + Secondo tipo di crease angle. ha bisogno del per wedge normal _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" |