From owner-dev-commits-ports-main@freebsd.org Thu Apr 22 12:09:58 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D9745F01E9; Thu, 22 Apr 2021 12:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQx7V0rQ8z3r2S; Thu, 22 Apr 2021 12:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0FC3E19727; Thu, 22 Apr 2021 12:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MC9vAK069145; Thu, 22 Apr 2021 12:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MC9vSZ069144; Thu, 22 Apr 2021 12:09:57 GMT (envelope-from git) Date: Thu, 22 Apr 2021 12:09:57 GMT Message-Id: <202104221209.13MC9vSZ069144@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 96b5f3c1c98b - main - devel/ode: fix and optionize building demos, other minor improvements MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96b5f3c1c98b69a9991d7e00909a7eccd1ff7961 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 12:09:58 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=96b5f3c1c98b69a9991d7e00909a7eccd1ff7961 commit 96b5f3c1c98b69a9991d7e00909a7eccd1ff7961 Author: Dmitry Marakasov AuthorDate: 2021-04-08 23:35:52 +0000 Commit: Dmitry Marakasov CommitDate: 2021-04-22 12:08:19 +0000 devel/ode: fix and optionize building demos, other minor improvements - Optionize building demos - Fix depends (only depend on GL for demos, fix configure dependency detection by using USES=localbase and pkgconfig) - Fix build of demo code (use older compatible C++ standard and patch some bits) - Use native OPTIONS feature to make options mutually exclusive PR: 254898 Approved by: acm (maintainer) --- devel/ode/Makefile | 21 ++++++++++----------- devel/ode/files/patch-ode_demo_demo__jointPR.cpp | 11 +++++++++++ devel/ode/files/patch-ode_demo_demo__jointPU.cpp | 11 +++++++++++ devel/ode/files/patch-ode_demo_demo__piston.cpp | 11 +++++++++++ 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/devel/ode/Makefile b/devel/ode/Makefile index d3ddd1ccf2e3..53481dfc5291 100644 --- a/devel/ode/Makefile +++ b/devel/ode/Makefile @@ -13,28 +13,27 @@ COMMENT= Articulated rigid body dynamics library LICENSE= LGPL21 BSD3CLAUSE LICENSE_COMB= dual -USES= gl tar:bzip2 libtool pathfix -USE_GL= yes +USES= tar:bzip2 libtool pathfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared TEST_TARGET= check +USE_CXXSTD= c++03 -OPTIONS_DEFINE= GIMPACT DOUBLE OU +OPTIONS_DEFINE= GIMPACT DOUBLE OU DEMOS GIMPACT_DESC= Enable gimpact instead of opcode support DOUBLE_DESC= Enable double precision (BROKEN with GIMPACT) OU_DESC= Enable Thread-local storage (Experimental) +DEMOS_DESC= Build demos (not installed) +GIMPACT_PREVENTS= DOUBLE GIMPACT_CONFIGURE_ON= --with-trimesh=gimpact GIMPACT_CONFIGURE_OFF= --with-trimesh=opcode -DOUBLE_CONFIGURE_ENABLE= double-precision -OU_CONFIGURE_ENABLE= ou - -.include - -.if ${PORT_OPTIONS:MGIMPACT} && ${PORT_OPTIONS:MDOUBLE} -IGNORE= currently double precision is not supported by gimpact -.endif +DOUBLE_CONFIGURE_ENABLE=double-precision +OU_CONFIGURE_ENABLE= ou +DEMOS_CONFIGURE_ENABLE= demos +DEMOS_USES= gl localbase pkgconfig +DEMOS_USE= GL=gl,glu post-patch: @${REINPLACE_CMD} -e '/if test/ s|==|=|' -e 's|^\( *CFLAGS=\)|#\1|;' \ diff --git a/devel/ode/files/patch-ode_demo_demo__jointPR.cpp b/devel/ode/files/patch-ode_demo_demo__jointPR.cpp new file mode 100644 index 000000000000..189a7ef9e500 --- /dev/null +++ b/devel/ode/files/patch-ode_demo_demo__jointPR.cpp @@ -0,0 +1,11 @@ +--- ode/demo/demo_jointPR.cpp.orig 2013-08-19 17:48:05 UTC ++++ ode/demo/demo_jointPR.cpp +@@ -329,7 +329,7 @@ int main (int argc, char **argv) + { + int j = i+1; + if ( j+1 > argc || // Check if we have enough arguments +- argv[j] == '\0' || // We should have a path here ++ argv[j][0] == '\0' || // We should have a path here + argv[j][0] == '-' ) // We should have a path not a command line + Help(argv); + else diff --git a/devel/ode/files/patch-ode_demo_demo__jointPU.cpp b/devel/ode/files/patch-ode_demo_demo__jointPU.cpp new file mode 100644 index 000000000000..588366a601a4 --- /dev/null +++ b/devel/ode/files/patch-ode_demo_demo__jointPU.cpp @@ -0,0 +1,11 @@ +--- ode/demo/demo_jointPU.cpp.orig 2013-12-06 21:52:14 UTC ++++ ode/demo/demo_jointPU.cpp +@@ -579,7 +579,7 @@ int main (int argc, char **argv) + if (0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) { + int j = i+1; + if ( j+1 > argc || // Check if we have enough arguments +- argv[j] == '\0' || // We should have a path here ++ argv[j][0] == '\0' || // We should have a path here + argv[j][0] == '-' ) // We should have a path not a command line + Help (argv); + else diff --git a/devel/ode/files/patch-ode_demo_demo__piston.cpp b/devel/ode/files/patch-ode_demo_demo__piston.cpp new file mode 100644 index 000000000000..3fdbb3327816 --- /dev/null +++ b/devel/ode/files/patch-ode_demo_demo__piston.cpp @@ -0,0 +1,11 @@ +--- ode/demo/demo_piston.cpp.orig 2013-08-19 17:48:05 UTC ++++ ode/demo/demo_piston.cpp +@@ -659,7 +659,7 @@ int main (int argc, char **argv) + { + int j = i+1; + if ( j+1 > argc || // Check if we have enough arguments +- argv[j] == '\0' || // We should have a path here ++ argv[j][0] == '\0' || // We should have a path here + argv[j][0] == '-' ) // We should have a path not a command line + Help (argv); + else