diff options
Diffstat (limited to 'devel/ode')
| -rw-r--r-- | devel/ode/Makefile | 17 | ||||
| -rw-r--r-- | devel/ode/distinfo | 6 | ||||
| -rw-r--r-- | devel/ode/files/patch-CMakeLists.txt | 51 | ||||
| -rw-r--r-- | devel/ode/pkg-plist | 11 |
4 files changed, 63 insertions, 22 deletions
diff --git a/devel/ode/Makefile b/devel/ode/Makefile index 95b843553986..38642fd2dd5b 100644 --- a/devel/ode/Makefile +++ b/devel/ode/Makefile @@ -1,5 +1,6 @@ PORTNAME= ode -DISTVERSION= 0.16.2 +DISTVERSION= 0.16.6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/odedevs/${PORTNAME}/downloads/ @@ -13,6 +14,20 @@ LICENSE_COMB= dual USES= cmake:testing +FLAVORS= double single +FLAVOR?= ${FLAVORS:[1]} + +single_CONFLICTS= odoo-double +double_CONFLICTS= odoo-single + +.if ${FLAVOR} == double +PKGNAMESUFFIX= -double +CMAKE_ON= ODE_DOUBLE_PRECISION +.else +PKGNAMESUFFIX= -single +CMAKE_OFF= ODE_DOUBLE_PRECISION +.endif + CMAKE_OFF= ODE_WITH_TESTS CMAKE_TESTING_ON= ODE_WITH_TESTS diff --git a/devel/ode/distinfo b/devel/ode/distinfo index 77c7e88d2be7..033bbde522cb 100644 --- a/devel/ode/distinfo +++ b/devel/ode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667161105 -SHA256 (ode-0.16.2.tar.gz) = b26aebdcb015e2d89720ef48e0cb2e8a3ca77915f89d853893e7cc861f810f22 -SIZE (ode-0.16.2.tar.gz) = 2627992 +TIMESTAMP = 1763779692 +SHA256 (ode-0.16.6.tar.gz) = c91a28c6ff2650284784a79c726a380d6afec87ecf7a35c32a6be0c5b74513e8 +SIZE (ode-0.16.6.tar.gz) = 2631885 diff --git a/devel/ode/files/patch-CMakeLists.txt b/devel/ode/files/patch-CMakeLists.txt index 1ea3a77cc367..cd9da41f7047 100644 --- a/devel/ode/files/patch-CMakeLists.txt +++ b/devel/ode/files/patch-CMakeLists.txt @@ -1,13 +1,38 @@ ---- 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( +--- CMakeLists.txt.orig 2025-01-16 14:48:49.000000000 -0800 ++++ CMakeLists.txt 2025-11-22 17:13:28.892206000 -0800 +@@ -43,6 +43,7 @@ + option(ODE_WITH_TESTS "Builds the unit test application." ON) + option(ODE_WIN32_LIB_OUTPUT_NAME_BASED_ON_FLOAT_SIZE "The output name of the library will be based on the size of float, on Windows." ON) + option(ODE_WIN32_INSTALL_STATIC_LIBS_PDB "Install the PDB files for the static libraries (.lib) on Windows." OFF) ++option(ODE_DOUBLE_PRECISION "Use double-precision math." OFF) + + cmake_dependent_option(ODE_WITH_LIBCCD_BOX_CYL "Use libccd for box-cylinder." ON "ODE_WITH_LIBCCD" OFF) + cmake_dependent_option(ODE_WITH_LIBCCD_CAP_CYL "Use libccd for capsule-cylinder." ON "ODE_WITH_LIBCCD" OFF) +@@ -54,12 +55,6 @@ + cmake_dependent_option(ODE_WITH_LIBCCD_CONVEX_SPHERE "Use libccd for convex-sphere." ON "ODE_WITH_LIBCCD" OFF) + cmake_dependent_option(ODE_WITH_LIBCCD_SYSTEM "Use system libccd." OFF "ODE_WITH_LIBCCD" OFF) + +-if(CMAKE_SIZEOF_VOID_P EQUAL 4) +- option(ODE_DOUBLE_PRECISION "Use double-precision math." OFF) +-else() +- option(ODE_DOUBLE_PRECISION "Use double-precision math." ON) +-endif() +- + set(ODE_WIN32_STATIC_LIB_POSTFIX_DEBUG "sd" CACHE STRING "The postfix to use when building the library as a static .lib on Windows in DEBUG.") + set(ODE_WIN32_STATIC_LIB_POSTFIX_MINSIZEREL "s" CACHE STRING "The postfix to use when building the library as a static .lib on Windows in MINSIZEREL.") + set(ODE_WIN32_STATIC_LIB_POSTFIX_RELEASE "s" CACHE STRING "The postfix to use when building the library as a static .lib on Windows in RELEASE.") +@@ -757,12 +752,12 @@ + + file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}") + string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}") +-set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}") ++set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") + set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + configure_file(ode.pc.in ode.pc @ONLY) +-set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..") ++set(prefix "${CMAKE_INSTALL_PREFIX}") + configure_file(ode-config.in ode-config @ONLY) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ode.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development) diff --git a/devel/ode/pkg-plist b/devel/ode/pkg-plist index ec840b633c84..1b0459e8c2f2 100644 --- a/devel/ode/pkg-plist +++ b/devel/ode/pkg-plist @@ -27,10 +27,11 @@ include/ode/threading.h include/ode/threading_impl.h include/ode/timer.h 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/cmake/ode-0.16.6/ode-config-version.cmake +lib/cmake/ode-0.16.6/ode-config.cmake +lib/cmake/ode-0.16.6/ode-export-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ode-0.16.6/ode-export.cmake lib/libode.so -lib/libode.so.0.16.2 +lib/libode.so.8 +lib/libode.so.8.2.0 libdata/pkgconfig/ode.pc |