From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 7 16:50:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4B586426 for ; Sat, 7 Dec 2013 16:50:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1E4A91867 for ; Sat, 7 Dec 2013 16:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7Go0Bl028413 for ; Sat, 7 Dec 2013 16:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rB7Go05O028411; Sat, 7 Dec 2013 16:50:00 GMT (envelope-from gnats) Resent-Date: Sat, 7 Dec 2013 16:50:00 GMT Resent-Message-Id: <201312071650.rB7Go05O028411@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Christoph Moench-Tegeder Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9ED93E5 for ; Sat, 7 Dec 2013 16:45:40 +0000 (UTC) Received: from smtp.burggraben.net (base.exwg.net [IPv6:2a01:4f8:140:50a2::2]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 74B121846 for ; Sat, 7 Dec 2013 16:45:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp.burggraben.net (Postfix) with ESMTP id 1B6DF60008B for ; Sat, 7 Dec 2013 17:45:39 +0100 (CET) Received: from smtp.burggraben.net ([127.0.0.1]) by localhost (ns.burggraben.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q-OcFNRgZ+Jg for ; Sat, 7 Dec 2013 17:45:38 +0100 (CET) Received: from elch.exwg.net (elch.exwg.net [IPv6:2001:470:7b43:1:6a05:caff:fe01:aae9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "elch.exwg.net", Issuer "Christoph Moench-Tegeder" (verified OK)) by smtp.burggraben.net (Postfix) with ESMTPS for ; Sat, 7 Dec 2013 17:45:38 +0100 (CET) Received: by elch.exwg.net (Postfix, from userid 1000) id C01BC31016; Sat, 7 Dec 2013 17:45:33 +0100 (CET) Message-Id: <20131207164533.C01BC31016@elch.exwg.net> Date: Sat, 7 Dec 2013 17:45:33 +0100 (CET) From: Christoph Moench-Tegeder To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/184565: cad/meshlab : fix build with gcc47, unbreak X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Christoph Moench-Tegeder List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 16:50:01 -0000 >Number: 184565 >Category: ports >Synopsis: cad/meshlab : fix build with gcc47, unbreak >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 07 16:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Christoph Moench-Tegeder >Release: FreeBSD 9.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD elch.exwg.net 9.2-RELEASE FreeBSD 9.2-RELEASE #11 r255911: Fri Sep 27 17:09:40 CEST 2013 cmt@elch.exwg.net:/usr/obj/usr/src/sys/ELCH amd64 lang/gcc47 gcc47-4.7.4.20131130 cad/meshlab meshlab-1.3.2_2 >Description: Hi, in an effort towards upgrading lang/gcc to gcc 4.7, I'm helping gerald@ in making ports gcc47-safe. Please consider the following patch to your port. If you approve of the patch, gerald@ has offered his help in commiting it. If you're commiting yourself or have someone else commit this (or another patch to the same effect), can you please add an additional reference to ports/183342 in the commit message? In my test environment, the port built successfully with lang/gcc47. >How-To-Repeat: >Fix: This patch removes some unused template functions (gcc47 does not like that) and removes patch-vcglib-vcg-space_deprecated_point.h which broke the build. # remove blocks of dead code from colorhistogram.h and trimesh.h # gcc47 gets confused on template functions which are never instantiated # remove patch-vcglib-vcg-space_deprecated_point.h, it broke the calls to # static_assert() (which are re-defined assert()s) $ svn status A files/patch-meshlabplugins-decorate_base-colorhistogram.h D files/patch-vcglib-vcg-space_deprecated_point.h A files/patch-vcglib-wrap-gl-trimesh.h Index: files/patch-meshlabplugins-decorate_base-colorhistogram.h =================================================================== --- files/patch-meshlabplugins-decorate_base-colorhistogram.h (revision 0) +++ files/patch-meshlabplugins-decorate_base-colorhistogram.h (working copy) @@ -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 valid bins plus two semi-infinite bins. + Index: files/patch-vcglib-vcg-space_deprecated_point.h =================================================================== --- files/patch-vcglib-vcg-space_deprecated_point.h (revision 334032) +++ files/patch-vcglib-vcg-space_deprecated_point.h (working copy) @@ -1,19 +0,0 @@ ---- ../../vcglib/vcg/space/deprecated_point.h.orig 2013-10-30 18:12:59.000000000 +0100 -+++ ../../vcglib/vcg/space/deprecated_point.h 2013-10-30 18:12:33.000000000 +0100 -@@ -164,14 +164,14 @@ - } - inline const S &X() const { return _v[0]; } - inline const S &Y() const { return _v[1]; } -- inline const S &Z() const { static_assert(N>2); return _v[2]; } -+ inline const S &Z() const { static_assert(N>2, ""); return _v[2]; } - /// W is in any case the last coordinate. - /// (in a 2D point, W() == Y(). In a 3D point, W()==Z() - /// in a 4D point, W() is a separate component) - inline const S &W() const { return _v[N-1]; } - inline S &X() { return _v[0]; } - inline S &Y() { return _v[1]; } -- inline S &Z() { static_assert(N>2); return _v[2]; } -+ inline S &Z() { static_assert(N>2, ""); return _v[2]; } - inline S &W() { return _v[N-1]; } - inline const S * V() const - { Index: files/patch-vcglib-wrap-gl-trimesh.h =================================================================== --- files/patch-vcglib-wrap-gl-trimesh.h (revision 0) +++ files/patch-vcglib-wrap-gl-trimesh.h (working copy) @@ -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 + 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 Regards, Christoph >Release-Note: >Audit-Trail: >Unformatted: