From c104ed036bdd1bdcb92fd7ec7ef40eb2ae48acf6 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Thu, 13 Nov 2025 14:08:58 +0000
Subject: [PATCH 1/2] fix(main/nlopt): Fix includedir and libdir in cmake and
 pkgconfig files

---
 packages/nlopt/CMakeLists.txt.patch             | 11 +++++++++++
 packages/nlopt/build.sh                         |  2 +-
 packages/nlopt/cmake-NLoptConfig.cmake.in.patch | 13 +++++++++++++
 packages/nlopt/nlopt.pc.in.patch                | 10 ++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 packages/nlopt/CMakeLists.txt.patch
 create mode 100644 packages/nlopt/cmake-NLoptConfig.cmake.in.patch
 create mode 100644 packages/nlopt/nlopt.pc.in.patch

diff --git a/packages/nlopt/CMakeLists.txt.patch b/packages/nlopt/CMakeLists.txt.patch
new file mode 100644
index 00000000000000..2bcdfc75377abe
--- /dev/null
+++ b/packages/nlopt/CMakeLists.txt.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -287,7 +287,7 @@
+   src/api)
+ 
+ get_target_property (NLOPT_PRIVATE_INCLUDE_DIRS ${nlopt_lib} INCLUDE_DIRECTORIES)
+-target_include_directories (${nlopt_lib} INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/api;${PROJECT_BINARY_DIR}>" "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++target_include_directories (${nlopt_lib} INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/api;${PROJECT_BINARY_DIR}>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+ 
+ if (BUILD_SHARED_LIBS)
+   target_compile_definitions (${nlopt_lib} PUBLIC NLOPT_DLL)
diff --git a/packages/nlopt/build.sh b/packages/nlopt/build.sh
index 0493c25fa62821..2571b92d3ab52a 100644
--- a/packages/nlopt/build.sh
+++ b/packages/nlopt/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library for nonlinear optimization"
 TERMUX_PKG_LICENSE="LGPL-2.1, MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.10.0"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/stevengj/nlopt/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=506f83a9e778ad4f204446e99509cb2bdf5539de8beccc260a014bd560237be1
 TERMUX_PKG_DEPENDS="libc++"
diff --git a/packages/nlopt/cmake-NLoptConfig.cmake.in.patch b/packages/nlopt/cmake-NLoptConfig.cmake.in.patch
new file mode 100644
index 00000000000000..3b9a39724965b9
--- /dev/null
+++ b/packages/nlopt/cmake-NLoptConfig.cmake.in.patch
@@ -0,0 +1,13 @@
+--- a/cmake/NLoptConfig.cmake.in
++++ b/cmake/NLoptConfig.cmake.in
+@@ -3,8 +3,8 @@
+ 
+ set (NLOPT_VERSION "@NLOPT_VERSION_STRING@")
+ 
+-set (NLOPT_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@NLOPT_INSTALL_INCLUDEDIR@")
+-set (NLOPT_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@NLOPT_INSTALL_LIBDIR@")
++set (NLOPT_INCLUDE_DIRS "@NLOPT_INSTALL_INCLUDEDIR@")
++set (NLOPT_LIBRARY_DIRS "@NLOPT_INSTALL_LIBDIR@")
+ 
+ # Allows loading NLOPT settings from another project
+ set (NLOPT_CONFIG_FILE "${CMAKE_CURRENT_LIST_FILE}")
diff --git a/packages/nlopt/nlopt.pc.in.patch b/packages/nlopt/nlopt.pc.in.patch
new file mode 100644
index 00000000000000..8eef15a9bc2795
--- /dev/null
+++ b/packages/nlopt/nlopt.pc.in.patch
@@ -0,0 +1,10 @@
+--- a/nlopt.pc.in
++++ b/nlopt.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/@NLOPT_INSTALL_LIBDIR@
++libdir=${exec_prefix}/lib
+ includedir=${prefix}/include
+ 
+ Name: NLopt

From af197cf7caf0b681aee70d0e9e2640b3690daaa8 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Thu, 13 Nov 2025 14:09:15 +0000
Subject: [PATCH 2/2] fix(main/libode): Fix includedir and libdir in cmake and
 pkgconfig files

---
 packages/libode/CMakeLists.txt.patch | 22 ++++++++++++++++++++++
 packages/libode/build.sh             |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 packages/libode/CMakeLists.txt.patch

diff --git a/packages/libode/CMakeLists.txt.patch b/packages/libode/CMakeLists.txt.patch
new file mode 100644
index 00000000000000..8f40fe19615622
--- /dev/null
+++ b/packages/libode/CMakeLists.txt.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -603,7 +603,7 @@
+ 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ode/src>
+ 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ode/src/joints>
+ 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ou/include>
+-	$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
++	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+ )
+ 
+ if(ODE_16BIT_INDICES)
+@@ -759,8 +759,8 @@
+ string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}")
+ set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}")
+ set(exec_prefix "\${prefix}")
+-set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+-set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
++set(libdir "\${exec_prefix}/lib")
++set(includedir "\${prefix}/include")
+ configure_file(ode.pc.in ode.pc @ONLY)
+ set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..")
+ configure_file(ode-config.in ode-config @ONLY)
diff --git a/packages/libode/build.sh b/packages/libode/build.sh
index 23dadfffcaec3e..93b572ab632aad 100644
--- a/packages/libode/build.sh
+++ b/packages/libode/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_GROUPS="science"
 TERMUX_PKG_LICENSE="BSD 3-Clause, LGPL-2.1"
 TERMUX_PKG_MAINTAINER="Pooya Moradi <pvonmoradi@gmail.com>"
 TERMUX_PKG_VERSION="0.16.6"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://bitbucket.org/odedevs/ode/downloads/ode-$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=c91a28c6ff2650284784a79c726a380d6afec87ecf7a35c32a6be0c5b74513e8
 TERMUX_PKG_BUILD_IN_SRC=true