aboutsummaryrefslogtreecommitdiff
path: root/science/opensim-core
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2020-06-17 18:17:45 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2020-06-17 18:17:45 +0000
commitcb333cf1eccb98899b1700ca42a800ab92697fa4 (patch)
tree7f623e7c3f52defb4424cb7124504b8d4e77d35c /science/opensim-core
parente2a5e08ce3f52f8bff9eb487e88342c0ec9fff81 (diff)
downloadports-cb333cf1eccb98899b1700ca42a800ab92697fa4.tar.gz
ports-cb333cf1eccb98899b1700ca42a800ab92697fa4.zip
Notes
Diffstat (limited to 'science/opensim-core')
-rw-r--r--science/opensim-core/Makefile6
-rw-r--r--science/opensim-core/files/patch-Bindings-common.i14
-rw-r--r--science/opensim-core/pkg-plist13
3 files changed, 23 insertions, 10 deletions
diff --git a/science/opensim-core/Makefile b/science/opensim-core/Makefile
index f4cf31e89665..1a7bbf4a6749 100644
--- a/science/opensim-core/Makefile
+++ b/science/opensim-core/Makefile
@@ -2,7 +2,7 @@
PORTNAME= OpenSim
DISTVERSION= 4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= science
PKGNAMESUFFIX= -core
@@ -35,14 +35,14 @@ OPTIONS_SUB= yes
PYTHON_CMAKE_BOOL= BUILD_PYTHON_WRAPPING
PYTHON_USES= python
-PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30
+PYTHON_BUILD_DEPENDS= swig:devel/swig
JAVA_CMAKE_BOOL= BUILD_JAVA_WRAPPING
JAVA_CMAKE_ON= -DJAVA_AWT_LIBRARY=${LOCALBASE}/openjdk8/jre/lib/amd64/libawt.so \
-DJAVA_JVM_LIBRARY=${LOCALBASE}/openjdk8/jre/lib/amd64/server/libjvm.so \
-DJAVA_INCLUDE_PATH=${LOCALBASE}/openjdk8/include
JAVA_USE= JAVA=yes
-JAVA_BUILD_DEPENDS= swig3.0:devel/swig30
+JAVA_BUILD_DEPENDS= swig:devel/swig
DOCS_CMAKE_BOOL= INSTALL_DOCS
PORTDOCS= *
diff --git a/science/opensim-core/files/patch-Bindings-common.i b/science/opensim-core/files/patch-Bindings-common.i
new file mode 100644
index 000000000000..0a87dcf3dce2
--- /dev/null
+++ b/science/opensim-core/files/patch-Bindings-common.i
@@ -0,0 +1,14 @@
+--- Bindings/common.i.orig 2020-02-01 04:17:56 UTC
++++ Bindings/common.i
+@@ -353,9 +353,11 @@ DATATABLE_CLONE(double, SimTK::Rotation_<double>)
+
+ %include <OpenSim/Common/Event.h>
+ %template(StdVectorEvent) std::vector<OpenSim::Event>;
++/*
+ %template(StdMapStringTimeSeriesTableVec3)
+ std::map<std::string,
+ std::shared_ptr<OpenSim::TimeSeriesTable_<SimTK::Vec3>>>;
++*/
+ %shared_ptr(OpenSim::DataAdapter)
+ %shared_ptr(OpenSim::FileAdapter)
+ %shared_ptr(OpenSim::DelimFileAdapter)
diff --git a/science/opensim-core/pkg-plist b/science/opensim-core/pkg-plist
index c535f2dabea0..326cb4948a37 100644
--- a/science/opensim-core/pkg-plist
+++ b/science/opensim-core/pkg-plist
@@ -916,12 +916,12 @@ lib/libosimTools.so
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__initializer_listT_SimTK__VecT_6_double_1_t_t.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__initializer_listT_double_t.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__istream.java
-%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__AbstractDataTable_const_p_t.java
-%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_SimTK__Transform_T_double_t_t__Channel_t.java
-%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_SimTK__VecT_2_SimTK__Vec3_1_t_t__Channel_t.java
-%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_SimTK__VecT_3_double_1_t_t__Channel_t.java
-%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_SimTK__Vector_T_double_t_t__Channel_t.java
-%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_double_t__Channel_t.java
+%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__AbstractDataTable_const_p_std__lessT_std__string_t_t.java
+%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_SimTK__Transform_T_double_t_t__Channel_std__lessT_std__string_t_t.java
+%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_SimTK__VecT_2_SimTK__Vec3_1_t_t__Channel_std__lessT_std__string_t_t.java
+%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_SimTK__VecT_3_double_1_t_t__Channel_std__lessT_std__string_t_t.java
+%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_SimTK__Vector_T_double_t_t__Channel_std__lessT_std__string_t_t.java
+%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__mapT_std__string_OpenSim__OutputT_double_t__Channel_std__lessT_std__string_t_t.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__ostream.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__pairT_std__vectorT_SimTK__State_t__const_iterator_std__vectorT_SimTK__State_t__const_iterator_t.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/SWIGTYPE_p_std__reverse_iteratorT_OpenSim__CoordinateReference_const_p_t.java
@@ -1007,7 +1007,6 @@ lib/libosimTools.so
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/Station.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/StdMapStringAbstractDataTable.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/StdMapStringDataAdapter.java
-%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/StdMapStringTimeSeriesTableVec3.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/StdVectorDouble.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/StdVectorEvent.java
%%JAVA%%%%DATADIR%%/java/org/opensim/modeling/StdVectorInt.java