From bad2dbd5321cc1f8efdec67b1ba899427fd6bde1 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sat, 18 Jan 2025 15:24:56 +0000 Subject: [PATCH] bump(main/libode): 0.16.6 Remove CMakeLists.patch file which was added in upstream. https://bitbucket.org/odedevs/ode/commits/89b3286467985b1b04b78dc1ad6642830d12ba58 --- packages/libode/CMakeLists.patch | 40 -------------------------------- packages/libode/build.sh | 4 ++-- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 packages/libode/CMakeLists.patch diff --git a/packages/libode/CMakeLists.patch b/packages/libode/CMakeLists.patch deleted file mode 100644 index 34aeb39067f9da..00000000000000 --- a/packages/libode/CMakeLists.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b105b9a5..c7a3aada 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -567,9 +567,18 @@ 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) -+ find_package(ccd REQUIRED) -+ target_compile_definitions(ODE PRIVATE -DdLIBCCD_ENABLED -DdLIBCCD_SYSTEM) -+ target_include_directories( -+ ODE -+ PRIVATE -+ $ -+ ) -+ if(TARGET ccd::ccd) -+ target_link_libraries(ODE PRIVATE ccd::ccd) -+ else() -+ target_link_libraries(ODE PRIVATE ccd) -+ endif() - else() - target_compile_definitions(ODE PRIVATE -DdLIBCCD_ENABLED -DdLIBCCD_INTERNAL) - target_include_directories( -diff --git a/ode-config.cmake.in b/ode-config.cmake.in -index 210b558a..fdccbc3d 100644 ---- a/ode-config.cmake.in -+++ b/ode-config.cmake.in -@@ -11,3 +11,9 @@ set(ODE_DEFINITIONS "") - set(ODE_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include") - set(ODE_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/lib") - set(ODE_LIBRARIES "ODE::ODE") -+ -+include(CMakeFindDependencyMacro) -+ -+if(ODE_WITH_LIBCCD_SYSTEM) -+ find_dependency(ccd) -+endif() diff --git a/packages/libode/build.sh b/packages/libode/build.sh index 77459f84917d7c..5c0486d2cdf4cc 100644 --- a/packages/libode/build.sh +++ b/packages/libode/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="An open source, high performance library for simulating TERMUX_PKG_GROUPS="science" TERMUX_PKG_LICENSE="BSD 3-Clause, LGPL-2.1" TERMUX_PKG_MAINTAINER="Pooya Moradi " -TERMUX_PKG_VERSION="0.16.5" +TERMUX_PKG_VERSION="0.16.6" TERMUX_PKG_SRCURL="https://bitbucket.org/odedevs/ode/downloads/ode-$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=ba875edd164570958795eeaa70f14853bfc34cc9871f8adde8da47e12bd54679 +TERMUX_PKG_SHA256=c91a28c6ff2650284784a79c726a380d6afec87ecf7a35c32a6be0c5b74513e8 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_FORCE_CMAKE=true