From nobody Fri Nov 04 05:38:18 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N3Ttg1W5mz4h5Dq; Fri, 4 Nov 2022 05:38:19 +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 4N3Ttg12BVz4MZt; Fri, 4 Nov 2022 05:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667540299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IYGc30UnQfaZYuXu2HUHWs3dQqkVTkFGTIhq87eT3Qw=; b=bUCEMr4Ydmn4ZSr6WhjlEjKceQYQTtbtf7DSMdwB/Gon95qpNNXSbbUbo0rFwZoOKH3QPj uHw8gQPoFxjw7FKTu/ESnVl8nzbKfw4yKtmBDoob/aAFkJLH1GIIg1+SUOIPDvQj0VsEl3 sKL7LRSWnawRq+mAzaMddJJAmzU9DNKcSM6D4DsCrqyWeIRjk0LJTaA4CHeoOJM/HA76cO VyMPlLEBFZaZuPxCrz8yJjrQlatGJbbadxhvBemjNaPUs8QOqIe2yZExTxRyGR44sJL193 4aQMHnK9dQkY6XqyPW5dDMMbga0DKUGn52tPnCtRgMxT5Ynai6YzXhtwkEAdLA== 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 4N3Ttg05Qdz145R; Fri, 4 Nov 2022 05:38:19 +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 2A45cI58060810; Fri, 4 Nov 2022 05:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A45cI7t060809; Fri, 4 Nov 2022 05:38:18 GMT (envelope-from git) Date: Fri, 4 Nov 2022 05:38:18 GMT Message-Id: <202211040538.2A45cI7t060809@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: a5a627bd6681 - main - devel/ode: Update 0.13 -> 0.16.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5a627bd66810124dbcf9eefd036bff5a522af89 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667540299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IYGc30UnQfaZYuXu2HUHWs3dQqkVTkFGTIhq87eT3Qw=; b=kCDKy1CoYjquZLlMNPPZwKIJFkxTSgaatDaftuPJCuzOKZVMWeRh8AptCxMK5Psl82UE1j fSk6za+tl+uh2uFgrPIWOxNMQxCeU4NkNpXb8lwgORodQdm3n0lN78PZwOdpies/quhmBZ V8wFoqSb0nG6qFFlT0baxZzZigTLq4CYGhlt34aHOh6ZcEOS6qL7bNtiL1jxe7G8SW+H31 ifprOiwN1sGAQuhi+EdPjnabUEOaKTeKp5Dvt1mFA96xs20IGXwTIAOE7OOfeTDUzy3ueP g8l+1VbyNdO3SotHRTWe6SIz1MvLoAnlC1p+7+2+QxgcfhzGJr6XBoRtFy6Vgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667540299; a=rsa-sha256; cv=none; b=A+2VlwgUllQ7KIYFaxKEFUmqQIJKM9bWTw5hgABezlNyGNqppaQcyVPQYwUokNlmzO1vfc 6hvHqXNVW2IcvIcLrNK/pH1EASa0vt9KFZPtATsqgIR0RqboxNkciASVGlqAlad2/sfc5W D3MfkdpolvI6sSHJF58w4ppzvFMTIpQhH+CV3afXaHSWEBOAoa0/QqkiaguBAVqjHmdApb k8VhUHg/82qRyUqLIYL5xJG19oBx+tGP28gIQuzjMNuDrRjiBJFAgetenNUvptgl4W2Y3E VzRmPHz4MBMVXJDpqpLi7Ako9vm7TOAfo1baSWoIcsf6YYwfODqqp+uyKtiukA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5a627bd66810124dbcf9eefd036bff5a522af89 commit a5a627bd66810124dbcf9eefd036bff5a522af89 Author: Yuri Victorovich AuthorDate: 2022-11-04 05:34:40 +0000 Commit: Yuri Victorovich CommitDate: 2022-11-04 05:34:40 +0000 devel/ode: Update 0.13 -> 0.16.2 PR: 255111 Approved by: acm@ (maintainer) --- devel/ode/Makefile | 58 ++++++++++-------------- devel/ode/distinfo | 5 +- devel/ode/files/patch-CMakeLists.txt | 13 ++++++ devel/ode/files/patch-config.h.cmake.in | 11 +++++ 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 ----- devel/ode/pkg-plist | 12 +++-- games/alienarena/Makefile | 2 +- games/crashtest/Makefile | 2 +- games/gillo/Makefile | 2 +- games/irrlamb/Makefile | 1 + games/stormbaancoureur/Makefile | 2 +- games/xmoto/Makefile | 2 +- games/xonotic/Makefile | 2 +- misc/dartsim/Makefile | 2 +- misc/ompl/Makefile | 2 +- 17 files changed, 69 insertions(+), 80 deletions(-) diff --git a/devel/ode/Makefile b/devel/ode/Makefile index 8395544bdd3e..95b843553986 100644 --- a/devel/ode/Makefile +++ b/devel/ode/Makefile @@ -1,9 +1,8 @@ PORTNAME= ode -PORTVERSION= 0.13 -PORTREVISION= 4 +DISTVERSION= 0.16.2 PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= SF/opende/ODE/${PORTVERSION} +MASTER_SITES= https://bitbucket.org/odedevs/${PORTNAME}/downloads/ MAINTAINER= acm@FreeBSD.org COMMENT= Articulated rigid body dynamics library @@ -12,41 +11,34 @@ WWW= https://www.ode.org/ LICENSE= LGPL21 BSD3CLAUSE LICENSE_COMB= dual -USES= tar:bzip2 libtool pathfix -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared -TEST_TARGET= check -USE_CXXSTD= c++03 +USES= cmake:testing -OPTIONS_DEFINE= GIMPACT DOUBLE OU DEMOS +CMAKE_OFF= ODE_WITH_TESTS +CMAKE_TESTING_ON= ODE_WITH_TESTS -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) +CXXFLAGS+= -Wno-c++11-narrowing -GIMPACT_PREVENTS= DOUBLE -GIMPACT_CONFIGURE_ON= --with-trimesh=gimpact -GIMPACT_CONFIGURE_OFF= --with-trimesh=opcode -DOUBLE_CONFIGURE_ENABLE=double-precision -OU_CONFIGURE_ENABLE= ou -DEMOS_CONFIGURE_ENABLE= demos +OPTIONS_DEFINE= DEMOS GIMPACT LIBCCD OU TRIMESH # it looks like TRIMESH isn't defined but is needed because ODE_NO_TRIMESH is never defined otherwise +OPTIONS_DEFAULT= TRIMESH + +DEMOS_DESC= Build demos (not installed) +DEMOS_CMAKE_BOOL= ODE_WITH_DEMOS DEMOS_USES= gl localbase pkgconfig DEMOS_USE= GL=gl,glu -post-patch: - @${REINPLACE_CMD} -e '/if test/ s|==|=|' -e 's|^\( *CFLAGS=\)|#\1|;' \ - -e 's|^\( *CPPFLAGS=\)|#\1|' -e 's|^\( *CXXFLAGS=\)|#\1|' \ - -e 's|CPPFLAGS+=" |CPPFLAGS="$$CPPFLAGS |' \ - ${WRKSRC}/configure - @${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \ - -e '/^DEFAULT_INCLUDES/ s|$$| -I$$(top_builddir)/include|' \ - -e '/CFLAGS/ s|-O[12]||' - @${REINPLACE_CMD} 's|||g' \ - ${WRKSRC}/build/config-default.h ${WRKSRC}/ou/src/ou/malloc.cpp - -post-install: - ${SED} -e '/PACKAGE/ s|^|//|; /VERSION/ s|^|//|' ${WRKSRC}/ode/src/config.h \ - > ${STAGEDIR}${PREFIX}/include/ode/config.h +GIMPACT_DESC= Enable gimpact instead of opcode support +GIMPACT_CMAKE_BOOL= ODE_WITH_GIMPACT +GIMPACT_PREVENTS= TRIMESH + +LIBCCD_DESC= Use libccd for handling some collision tests absent in ODE +LIBCCD_CMAKE_BOOL= ODE_WITH_LIBCCD ODE_WITH_LIBCCD_SYSTEM +LIBCCD_CXXFLAGS= -I${WRKSRC}/libccd/src/custom +LIBCCD_LIB_DEPENDS= libccd.so:math/libccd + +OU_DESC= Enable Thread-local storage (Experimental) +OU_CMAKE_BOOL= ODE_WITH_OU + +TRIMESH_DESC= Build with trimesh +TRIMESH_CMAKE_OFF= -DODE_NO_TRIMESH=ON .include diff --git a/devel/ode/distinfo b/devel/ode/distinfo index 4679824956d8..77c7e88d2be7 100644 --- a/devel/ode/distinfo +++ b/devel/ode/distinfo @@ -1,2 +1,3 @@ -SHA256 (ode-0.13.tar.bz2) = 34ce3e236e313bf109a0cb5546d2fca462aed99f29a42e62bc1463b803c31ef9 -SIZE (ode-0.13.tar.bz2) = 2008288 +TIMESTAMP = 1667161105 +SHA256 (ode-0.16.2.tar.gz) = b26aebdcb015e2d89720ef48e0cb2e8a3ca77915f89d853893e7cc861f810f22 +SIZE (ode-0.16.2.tar.gz) = 2627992 diff --git a/devel/ode/files/patch-CMakeLists.txt b/devel/ode/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..1ea3a77cc367 --- /dev/null +++ b/devel/ode/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2020-07-30 13:27:35 UTC ++++ CMakeLists.txt +@@ -568,8 +568,8 @@ endif() + if(ODE_WITH_LIBCCD) + if(ODE_WITH_LIBCCD_SYSTEM) + find_package(ccd) +- target_compile_definitions(ode PRIVATE -DdLIBCCD_ENABLED -DdLIBCCD_SYSTEM) +- target_link_libraries(ODE ccd::ccd) ++ target_compile_definitions(ODE PRIVATE -DdLIBCCD_ENABLED -DdLIBCCD_SYSTEM) ++ target_link_libraries(ODE ccd) + else() + target_compile_definitions(ODE PRIVATE -DdLIBCCD_ENABLED -DdLIBCCD_INTERNAL) + target_include_directories( diff --git a/devel/ode/files/patch-config.h.cmake.in b/devel/ode/files/patch-config.h.cmake.in new file mode 100644 index 000000000000..86e771e11c96 --- /dev/null +++ b/devel/ode/files/patch-config.h.cmake.in @@ -0,0 +1,11 @@ +--- config.h.cmake.in.orig 2022-10-30 20:20:09 UTC ++++ config.h.cmake.in +@@ -67,7 +67,7 @@ + #define ODE_PLATFORM_PS3 + #elif defined(_MSC_VER) || defined(__CYGWIN32__) || defined(__MINGW32__) + #define ODE_PLATFORM_WINDOWS +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + #define ODE_PLATFORM_LINUX + #elif defined(__APPLE__) && defined(__MACH__) + #define ODE_PLATFORM_OSX diff --git a/devel/ode/files/patch-ode_demo_demo__jointPR.cpp b/devel/ode/files/patch-ode_demo_demo__jointPR.cpp deleted file mode 100644 index 189a7ef9e500..000000000000 --- a/devel/ode/files/patch-ode_demo_demo__jointPR.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 588366a601a4..000000000000 --- a/devel/ode/files/patch-ode_demo_demo__jointPU.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 3fdbb3327816..000000000000 --- a/devel/ode/files/patch-ode_demo_demo__piston.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/devel/ode/pkg-plist b/devel/ode/pkg-plist index 6956b591ec05..ec840b633c84 100644 --- a/devel/ode/pkg-plist +++ b/devel/ode/pkg-plist @@ -4,12 +4,13 @@ include/ode/collision_space.h include/ode/collision_trimesh.h include/ode/common.h include/ode/compatibility.h -include/ode/config.h include/ode/contact.h +include/ode/cooperative.h include/ode/error.h include/ode/export-dif.h include/ode/mass.h include/ode/matrix.h +include/ode/matrix_coop.h include/ode/memory.h include/ode/misc.h include/ode/objects.h @@ -25,8 +26,11 @@ include/ode/rotation.h include/ode/threading.h include/ode/threading_impl.h include/ode/timer.h -lib/libode.a +include/ode/version.h +lib/cmake/ode-0.16.2/ode-config-version.cmake +lib/cmake/ode-0.16.2/ode-config.cmake +lib/cmake/ode-0.16.2/ode-export-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ode-0.16.2/ode-export.cmake lib/libode.so -lib/libode.so.3 -lib/libode.so.3.1.0 +lib/libode.so.0.16.2 libdata/pkgconfig/ode.pc diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index 5330f03cdd8c..4cb224365bb0 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -1,6 +1,6 @@ PORTNAME= alienarena PORTVERSION= 2013.766 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= SF/alienarena.mirror/Alien%20Arena%207.66/ \ http://icculus.org/alienarena/Files/ \ diff --git a/games/crashtest/Makefile b/games/crashtest/Makefile index 43f66b87a668..e5577708b93d 100644 --- a/games/crashtest/Makefile +++ b/games/crashtest/Makefile @@ -1,6 +1,6 @@ PORTNAME= crashtest PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games education MASTER_SITES= http://www.stolk.org/crashtest/ diff --git a/games/gillo/Makefile b/games/gillo/Makefile index afbfb0753306..892cb0875e4c 100644 --- a/games/gillo/Makefile +++ b/games/gillo/Makefile @@ -1,6 +1,6 @@ PORTNAME= gillo DISTVERSION= 1.0beta1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0beta1 DISTNAME= ${PORTNAME}-${DISTVERSION}-src diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile index 19590abf7499..a00e1e65b463 100644 --- a/games/irrlamb/Makefile +++ b/games/irrlamb/Makefile @@ -1,5 +1,6 @@ PORTNAME= irrlamb PORTVERSION= 1.0.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= games diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile index fd9969b95400..6a4c9d689c98 100644 --- a/games/stormbaancoureur/Makefile +++ b/games/stormbaancoureur/Makefile @@ -1,6 +1,6 @@ PORTNAME= stormbaancoureur PORTVERSION= 2.1.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.stolk.org/stormbaancoureur/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 7044db0063b6..bb0c2ca913f2 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -1,6 +1,6 @@ PORTNAME= xmoto PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile index b989d89872a5..8f1b25abbb9d 100644 --- a/games/xonotic/Makefile +++ b/games/xonotic/Makefile @@ -1,6 +1,6 @@ PORTNAME= xonotic PORTVERSION= 0.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://nl.dl.xonotic.org/ \ http://mirror.bitmissile.com/xonotic/releases/ diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile index 3cd4985b3067..b5110bb9d19f 100644 --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -1,7 +1,7 @@ PORTNAME= dartsim DISTVERSIONPREFIX= v DISTVERSION= 6.12.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/ompl/Makefile b/misc/ompl/Makefile index 49158e2671b2..16e7b9570cb5 100644 --- a/misc/ompl/Makefile +++ b/misc/ompl/Makefile @@ -1,6 +1,6 @@ PORTNAME= ompl DISTVERSION= 1.5.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc comms MAINTAINER= yuri@FreeBSD.org