[gentoo-commits] repo/gentoo:master commit in: dev-games/recastnavigation/files/, dev-games/recastnavigation/

2025-05-21 Thread Sam James
commit: 35b04648a390ebc6b10218d9db0dcfd97bf16078
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Tue May 13 20:30:56 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 22 00:34:53 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b04648

dev-games/recastnavigation: fix build with cmake 4

Closes: https://bugs.gentoo.org/955845
Signed-off-by: Alexey Sokolov  asokolov.org>
Part-of: https://github.com/gentoo/gentoo/pull/42078
Closes: https://github.com/gentoo/gentoo/pull/42078
Signed-off-by: Sam James  gentoo.org>

 .../files/recastnavigation-1.6.0-cmake4.patch | 11 +++
 ...vigation-1.6.0.ebuild => recastnavigation-1.6.0-r1.ebuild} |  6 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git 
a/dev-games/recastnavigation/files/recastnavigation-1.6.0-cmake4.patch 
b/dev-games/recastnavigation/files/recastnavigation-1.6.0-cmake4.patch
new file mode 100644
index ..9a756ad06865
--- /dev/null
+++ b/dev-games/recastnavigation/files/recastnavigation-1.6.0-cmake4.patch
@@ -0,0 +1,11 @@
+https://github.com/recastnavigation/recastnavigation/pull/775
+https://bugs.gentoo.org/955845
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.1...4.0)
+ 
+ project(RecastNavigation)
+ 

diff --git a/dev-games/recastnavigation/recastnavigation-1.6.0.ebuild 
b/dev-games/recastnavigation/recastnavigation-1.6.0-r1.ebuild
similarity index 90%
rename from dev-games/recastnavigation/recastnavigation-1.6.0.ebuild
rename to dev-games/recastnavigation/recastnavigation-1.6.0-r1.ebuild
index 588293ef40f9..478c7deabc27 100644
--- a/dev-games/recastnavigation/recastnavigation-1.6.0.ebuild
+++ b/dev-games/recastnavigation/recastnavigation-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,6 +18,10 @@ RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-cpp/catch:0 )"
 
+PATCHES=(
+   "${FILESDIR}/${P}-cmake4.patch"
+)
+
 src_prepare() {
rm -r Tests/Contrib/catch2 || die
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/recastnavigation/files/, dev-games/recastnavigation/

2023-10-16 Thread Yixun Lan
commit: 9db0624ed26457cee16fe18de793fe1309bb59ea
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Wed Sep 27 23:06:33 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Oct 17 05:23:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db0624e

dev-games/recastnavigation: drop 1.5.1_p20230102

Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: Yixun Lan  gentoo.org>

 dev-games/recastnavigation/Manifest|  1 -
 .../recastnavigation-1.5.1_p20230102-catch.patch   | 10 --
 .../recastnavigation-1.5.1_p20230102.ebuild| 41 --
 3 files changed, 52 deletions(-)

diff --git a/dev-games/recastnavigation/Manifest 
b/dev-games/recastnavigation/Manifest
index 2a678f54c463..3961245a59fa 100644
--- a/dev-games/recastnavigation/Manifest
+++ b/dev-games/recastnavigation/Manifest
@@ -1,2 +1 @@
-DIST recastnavigation-1.5.1_p20230102.tar.gz 1276864 BLAKE2B 
0958fd76c1855dee0d4d4ee8b0e31cfac3c1bdee1f5f767c4dec0bec75b3c919760d9201ba27d772602200e9416e08955b7ef326603ec21fb9594f2d40c079bc
 SHA512 
4820e473735b08920bca7032851b258e8748c093bae331b11c0c9f630e9973264d9ca6277f7d92818b0a8c0864ce2601f129b708ec7976c9baead88d7b844f76
 DIST recastnavigation-1.6.0.tar.gz 1280501 BLAKE2B 
e2bca1cfab7f8a904530b381225dcf4f8c0f6fb05da7f628d52e0e0f03c7dd59e43825b459fa5df8fc0ac50cbcdd18e3807841b6cfbfb484b2ed0cd811916304
 SHA512 
7567aaa78219cc490a6f76210fba1f130f0c17aeaa06432ab1207e0fd03404abe31042e8b03971aa0d04ad65d39469f13575fe0072fb920c38581d39568b70fb

diff --git 
a/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20230102-catch.patch 
b/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20230102-catch.patch
deleted file mode 100644
index 5b0ff9bc6017..
--- 
a/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20230102-catch.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -10,5 +10,6 @@ add_executable(Tests ${TESTS_SOURCES})
- set_property(TARGET Tests PROPERTY CXX_STANDARD 17)
- 
- add_dependencies(Tests Recast Detour)
--target_link_libraries(Tests Recast Detour)
-+find_package(Catch2 REQUIRED)
-+target_link_libraries(Tests Recast Detour Catch2::Catch2WithMain)
- add_test(Tests Tests)

diff --git a/dev-games/recastnavigation/recastnavigation-1.5.1_p20230102.ebuild 
b/dev-games/recastnavigation/recastnavigation-1.5.1_p20230102.ebuild
deleted file mode 100644
index d62785277e49..
--- a/dev-games/recastnavigation/recastnavigation-1.5.1_p20230102.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Navigation mesh construction toolset for games"
-HOMEPAGE="https://github.com/recastnavigation/recastnavigation";
-MY_COMMIT="405cc095ab3a2df976a298421974a2af83843baf"
-SRC_URI="https://github.com/recastnavigation/recastnavigation/archive/${MY_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="ZLIB"
-SLOT="0/1.5.1"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/catch:0 )"
-
-PATCHES=(
-   "${FILESDIR}/${P}-catch.patch"
-)
-
-src_prepare() {
-   rm Tests/Contrib/Catch/* || die
-   echo "#include " > 
Tests/Contrib/Catch/catch_amalgamated.hpp || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DRECASTNAVIGATION_DEMO=OFF
-   -DRECASTNAVIGATION_EXAMPLES=OFF
-   -DRECASTNAVIGATION_TESTS=$(usex test)
-   )
-
-   cmake_src_configure
-}