[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: d3560710d8e3b50c746a1a87ae057882dd77da6d
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Oct 16 22:44:44 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Oct 16 22:44:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3560710
games-simulation/corsix-th: Fix USE=doc with better Lua handling
We need to restrict to the requested Lua version and ensure the necessary
modules are installed for that version.
Closes: https://bugs.gentoo.org/915515
Signed-off-by: James Le Cuirot gentoo.org>
games-simulation/corsix-th/corsix-th-0.67.ebuild | 16 +++
.../files/corsix-th-0.66-cmake_lua_detection.patch | 13
.../files/corsix-th-0.67-cmake_lua_detection.patch | 24 ++
3 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.67.ebuild
b/games-simulation/corsix-th/corsix-th-0.67.ebuild
index fb20bf9d939b..abeaae5f4a0c 100644
--- a/games-simulation/corsix-th/corsix-th-0.67.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.67.ebuild
@@ -39,23 +39,23 @@ RDEPEND="${LUA_DEPS}
DEPEND="${RDEPEND}"
-# Technically, build-time generation of documentation could use any version
-# of Lua (or to be precise: if in src_configure cmake has been told to use
-# LuaJIT documentation generation looks for LuaJIT, otherwise any
-# dev-lang/lua slot will do; see the first few lines of the bundled file
-# CMake/GenerateDoc.cmake for details) - but since dev-lang/lua conflicts
-# with the other slots of same, try to keep the deptree sane until we get
-# rid of unslotted Lua.
+# Although the docs could potentially be built with nearly any Lua version,
+# we need to ensure the necessary Lua modules are installed, so pin to the
+# same single version as runtime.
BDEPEND="
virtual/pkgconfig
doc? (
app-doc/doxygen[dot]
${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ >=dev-lua/luafilesystem-1.5[${LUA_USEDEP}]
+ >=dev-lua/lpeg-0.9[${LUA_USEDEP}]
+ ')
)
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.66-cmake_lua_detection.patch
+ "${FILESDIR}"/${PN}-0.67-cmake_lua_detection.patch
)
src_configure() {
diff --git
a/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
deleted file mode 100644
index f85d1bfb0b89..
--- a/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt
-index 1544810..05ed3b0 100644
a/CorsixTH/CMakeLists.txt
-+++ b/CorsixTH/CMakeLists.txt
-@@ -133,7 +133,7 @@ if(MSVC AND USE_VCPKG_DEPS)
- target_link_libraries(CorsixTH_lib lua)
- target_link_libraries(CorsixTH lua)
- else()
-- find_package(Lua REQUIRED)
-+ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
- if(Lua_FOUND OR LUA_FOUND)
- target_link_libraries(CorsixTH ${LUA_LIBRARY})
- include_directories(${LUA_INCLUDE_DIR})
diff --git
a/games-simulation/corsix-th/files/corsix-th-0.67-cmake_lua_detection.patch
b/games-simulation/corsix-th/files/corsix-th-0.67-cmake_lua_detection.patch
new file mode 100644
index ..b5a62a81a615
--- /dev/null
+++ b/games-simulation/corsix-th/files/corsix-th-0.67-cmake_lua_detection.patch
@@ -0,0 +1,24 @@
+diff -Naur a/CMake/GenerateDoc.cmake b/CMake/GenerateDoc.cmake
+--- a/CMake/GenerateDoc.cmake 2023-08-06 04:02:29.0 +0100
b/CMake/GenerateDoc.cmake 2023-10-16 23:26:11.527720737 +0100
+@@ -5,7 +5,7 @@
+ set(LUA_PROGRAM_NAMES lua53 lua5.3 lua-5.3 lua52 lua5.2 lua-5.2 lua51
lua5.1 lua-5.1 lua)
+ endif()
+
+-find_program(LUA_PROGRAM_PATH ${LUA_PROGRAM_NAMES}
++find_program(LUA_PROGRAM_PATH lua${LUA_VERSION}
+ PATHS
+ ENV LUA_DIR
+ /opt
+diff -Naur a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt
+--- a/CorsixTH/CMakeLists.txt 2023-08-06 04:02:29.0 +0100
b/CorsixTH/CMakeLists.txt 2023-10-16 23:23:20.119763454 +0100
+@@ -132,7 +132,7 @@
+ target_link_libraries(CorsixTH_lib lua)
+ target_link_libraries(CorsixTH lua)
+ else()
+- find_package(Lua REQUIRED)
++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ if(Lua_FOUND OR LUA_FOUND)
+ target_link_libraries(CorsixTH ${LUA_LIBRARY})
+ include_directories(${LUA_INCLUDE_DIR})
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: 3879aa52afd9e9b5f9cacd67a5eb3a06b9806dee
Author: Sam James gentoo org>
AuthorDate: Fri Jul 1 09:44:53 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 1 09:45:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3879aa52
games-simulation/corsix-th: fix Lua detection
I swear I remember checking the compile lines, too! I dunno what happened there.
Signed-off-by: Sam James gentoo.org>
.../{corsix-th-0.66.ebuild => corsix-th-0.66-r1.ebuild}| 1 +
.../files/corsix-th-0.66-cmake_lua_detection.patch | 14 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.66.ebuild
b/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
similarity index 98%
rename from games-simulation/corsix-th/corsix-th-0.66.ebuild
rename to games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
index 07f24a781502..37a6785596eb 100644
--- a/games-simulation/corsix-th/corsix-th-0.66.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
src_configure() {
local mycmakeargs=(
+ -DLUA_VERSION=$(lua_get_version)
-DWITH_AUDIO=$(usex sound)
-DWITH_FREETYPE2=$(usex truetype)
-DWITH_MOVIES=$(usex videos)
diff --git
a/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
index b201aa4877f8..f85d1bfb0b89 100644
--- a/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
+++ b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
@@ -1,13 +1,13 @@
diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt
-index 1544810..d9d3332 100644
+index 1544810..05ed3b0 100644
--- a/CorsixTH/CMakeLists.txt
+++ b/CorsixTH/CMakeLists.txt
-@@ -129,7 +129,7 @@ endif()
-
- # Find Lua
- if(MSVC AND USE_VCPKG_DEPS)
-- find_package(Lua CONFIG REQUIRED)
-+ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+@@ -133,7 +133,7 @@ if(MSVC AND USE_VCPKG_DEPS)
target_link_libraries(CorsixTH_lib lua)
target_link_libraries(CorsixTH lua)
else()
+- find_package(Lua REQUIRED)
++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ if(Lua_FOUND OR LUA_FOUND)
+ target_link_libraries(CorsixTH ${LUA_LIBRARY})
+ include_directories(${LUA_INCLUDE_DIR})
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: ddd0f32707c42ec68ba35206436f7d82e6043a0e
Author: Sam James gentoo org>
AuthorDate: Fri Jul 1 08:59:32 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 1 09:01:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd0f327
games-simulation/corsix-th: add 0.66
Signed-off-by: Sam James gentoo.org>
games-simulation/corsix-th/Manifest| 1 +
games-simulation/corsix-th/corsix-th-0.66.ebuild | 78 ++
.../files/corsix-th-0.66-cmake_lua_detection.patch | 13
3 files changed, 92 insertions(+)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index 277c736b9d1e..962ac658fb26 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1 +1,2 @@
DIST corsix-th-0.65.1.tar.gz 4163922 BLAKE2B
c1d9255e41521876716b377579642ed46b9fc54823816dc431f7b56ffa532af7091ae0b1e291bb1c4fb74165ca07786e0991a990c90bc3a13e234ba31c6fa706
SHA512
b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577
+DIST corsix-th-0.66.tar.gz 4117046 BLAKE2B
7bceb0d5893849ba906ccd9516ecd52f0a1c54f3a91bff932c0db053f66e71a3d38dfdb55979cb9bb2047c7338b3badbb32defa216a9867fb7166f4ca14bfa75
SHA512
a5cea74e7754132a7edbe188c63c08eb40ba8a8bbef6dc7441e41c5f46e96cacaa077d00bead4f8b3af3b8e07eadb4cfd08b1fb147e1397e2f9aa02642d29105
diff --git a/games-simulation/corsix-th/corsix-th-0.66.ebuild
b/games-simulation/corsix-th/corsix-th-0.66.ebuild
new file mode 100644
index ..07f24a781502
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.66.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit cmake lua-single xdg
+
+MY_PN="CorsixTH"
+
+DESCRIPTION="Open source clone of Theme Hospital"
+HOMEPAGE="https://corsixth.com";
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc +midi +sound +truetype +videos"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ >=dev-lua/luafilesystem-1.5[${LUA_USEDEP}]
+ >=dev-lua/lpeg-0.9[${LUA_USEDEP}]
+ >=dev-lua/luasocket-3.0_rc1-r4[${LUA_USEDEP}]
+ ')
+ media-libs/libsdl2[opengl,video]
+ sound? ( media-libs/sdl2-mixer[midi?] )
+ truetype? ( >=media-libs/freetype-2.5.3:2 )
+ videos? ( >=media-video/ffmpeg-2.2.3:0= )
+"
+
+DEPEND="${RDEPEND}"
+
+# Technically, build-time generation of documentation could use any version
+# of Lua (or to be precise: if in src_configure cmake has been told to use
+# LuaJIT documentation generation looks for LuaJIT, otherwise any
+# dev-lang/lua slot will do; see the first few lines of the bundled file
+# CMake/GenerateDoc.cmake for details) - but since dev-lang/lua conflicts
+# with the other slots of same, try to keep the deptree sane until we get
+# rid of unslotted Lua.
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ ${LUA_DEPS}
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.66-cmake_lua_detection.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_AUDIO=$(usex sound)
+ -DWITH_FREETYPE2=$(usex truetype)
+ -DWITH_MOVIES=$(usex videos)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_src_compile doc
+}
+
+src_install() {
+ cmake_src_install
+ dodoc changelog.txt CONTRIBUTING.md
+
+ docinto html
+ use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
diff --git
a/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
new file mode 100644
index ..b201aa4877f8
--- /dev/null
+++ b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch
@@ -0,0 +1,13 @@
+diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt
+index 1544810..d9d3332 100644
+--- a/CorsixTH/CMakeLists.txt
b/CorsixTH/CMakeLists.txt
+@@ -129,7 +129,7 @@ endif()
+
+ # Find Lua
+ if(MSVC AND USE_VCPKG_DEPS)
+- find_package(Lua CONFIG REQUIRED)
++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ target_link_libraries(CorsixTH_lib lua)
+ target_link_libraries(CorsixTH lua)
+ else()
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: 610bb3553288b51ec7e013b2c0f6e18bca930758
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Feb 13 00:11:54 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Feb 13 00:12:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610bb355
games-simulation/corsix-th: tweak for gcc-10
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich gentoo.org>
games-simulation/corsix-th/corsix-th-0.62.ebuild | 4 +++-
games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch | 10 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/games-simulation/corsix-th/corsix-th-0.62.ebuild
b/games-simulation/corsix-th/corsix-th-0.62.ebuild
index dd775153d21..b7772ebb338 100644
--- a/games-simulation/corsix-th/corsix-th-0.62.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,6 +34,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
src_configure() {
local mycmakeargs=(
-DWITH_AUDIO="$(usex sound)"
diff --git a/games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch
b/games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch
new file mode 100644
index 000..ff820f44946
--- /dev/null
+++ b/games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch
@@ -0,0 +1,10 @@
+--- a/CorsixTH/Src/th_lua_map.cpp
b/CorsixTH/Src/th_lua_map.cpp
+@@ -26,6 +26,7 @@ SOFTWARE.
+ #include
+ #include
+ #include
++#include /* std::out_of_range */
+
+ static const int player_max = 4;
+
[gentoo-commits] repo/gentoo:master commit in: games-simulation/corsix-th/files/, games-simulation/corsix-th/
commit: cb96db1781055042994e7cb7815e7c8ee231d75d
Author: Pacho Ramos gentoo org>
AuthorDate: Sat May 21 15:08:44 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat May 21 15:35:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb96db17
games-simulation/corsix-th: drop old
Package-Manager: portage-2.3.0_rc1
games-simulation/corsix-th/Manifest| 1 -
.../corsix-th/corsix-th-0.21-r1.ebuild | 62 --
.../corsix-th/files/corsix-th-0.21-naming.patch| 17 --
.../corsix-th/files/corsix-th-nodoc.patch | 11
4 files changed, 91 deletions(-)
diff --git a/games-simulation/corsix-th/Manifest
b/games-simulation/corsix-th/Manifest
index 53f07f3..55ea375 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,2 +1 @@
-DIST CorsixTH-0.21-Source.tar.gz 3908197 SHA256
9a8b54644e614dc13d4b5d97bf023b8e023e0186f931695b8f4ec7e4577a4ead SHA512
6f75772a7af0a09d216f042eda437e4159061637b404c0282472dab4751b7d515e25c6a922bb51051cfe7c351396491ac68d7969e3f37dafb1862fb6c85b6b52
WHIRLPOOL
69e3a57581e0a7446fda839284d2200ed8be559403504a42cfa187c8180689b175a96fb7b15b2b124ac3605dd936190f8ee882f4ea464acdc81157f598b0b20a
DIST corsix-th-0.30.tar.gz 4345385 SHA256
4947ebdc50b01fde0aca797250d50b9806b9e6f3f4323872fd914f033f4c92e7 SHA512
1afd9d68dd6db82393e454e2c234179029902b701aafe4d2ca76381be195acba55f0ee062ce071a78cf3f5e8762e25452f386276aecc1af816553532b870964a
WHIRLPOOL
b01a1d72c0408c1d7d7d0a72e55c9b9f0863acfe064c07f4920c3f66bfb29fb0acf0a7e4e1d80e214b2e81d073e070427fbd8fca9cd34e14cda561159a88d4d0
diff --git a/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild
b/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild
deleted file mode 100644
index 663f04f..000
--- a/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils games
-
-MY_P="CorsixTH-${PV}-Source"
-
-DESCRIPTION="Open source clone of Theme Hospital"
-HOMEPAGE="https://code.google.com/p/corsix-th/";
-SRC_URI="https://corsix-th.googlecode.com/files/${MY_P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ffmpeg truetype opengl +sdl +sound +midi"
-REQUIRED_USE="|| ( sdl opengl )"
-
-RDEPEND=">=dev-lang/lua-5.1
- media-libs/libsdl[X]
- ffmpeg? ( virtual/ffmpeg )
- truetype? ( media-libs/freetype:2 )
- opengl? ( virtual/opengl )
- sound? ( media-libs/sdl-mixer )
- midi? ( media-libs/sdl-mixer[timidity] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-nodoc.patch"
-
- # Use a coherent naming for installation dir
- epatch "${FILESDIR}/${P}-naming.patch"
-}
-
-src_configure() {
- local mycmakeargs="$(cmake-utils_use_with opengl OPENGL) \
- $(cmake-utils_use_with sdl SDL) \
- $(cmake-utils_use_with sound AUDIO) \
- $(cmake-utils_use_with truetype FREETYPE2) \
- $(cmake-utils_use_with ffmpeg MOVIES) \
- -DCMAKE_INSTALL_PREFIX=${GAMES_DATADIR}"
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- DOCS="CorsixTH/README.txt CorsixTH/changelog.txt"
cmake-utils_src_install
- games_make_wrapper ${PN} "${GAMES_DATADIR}/${PN}/CorsixTH" || die
- make_desktop_entry ${PN} ${PN} \
- "${GAMES_DATADIR}/${PN}/CorsixTH.ico"
- prepgamesdirs
-}
diff --git a/games-simulation/corsix-th/files/corsix-th-0.21-naming.patch
b/games-simulation/corsix-th/files/corsix-th-0.21-naming.patch
deleted file mode 100644
index b82b5fa..000
--- a/games-simulation/corsix-th/files/corsix-th-0.21-naming.patch
+++ /dev/null
@@ -1,17 +0,0 @@
CorsixTH/CMakeLists.txt2013-07-26 19:35:30.463506153 +0200
-+++ CorsixTH/CMakeLists.txt.new2013-07-26 19:38:07.944473631 +0200
-@@ -222,10 +222,10 @@
- ENDIF()
-
- ELSE()
-- install(TARGETS CorsixTH RUNTIME DESTINATION CorsixTH)
-- install(DIRECTORY Lua Levels DESTINATION CorsixTH PATTERN "*.svn" EXCLUDE)
-- install(DIRECTORY Bitmap DESTINATION CorsixTH
-+ install(TARGETS CorsixTH RUNTIME DESTINATION corsix-th)
-+ install(DIRECTORY Lua Levels DESTINATION corsix-th PATTERN "*.svn" EXCLUDE)
-+ install(DIRECTORY Bitmap DESTINATION corsix-th
- FILES_MATCHING REGEX ".*\\.(tab|pal|dat|png)$"
- PATTERN "*.svn" EXCLUDE)
-- install(FILES CorsixTH.lua CorsixTH.ico DESTINATION CorsixTH )
-+ install(FILES CorsixTH.lua CorsixTH.ico DESTINATION corsix-th )
- ENDIF()
diff --git a/games-simulation/corsix-th/files/corsix-th-nodoc.patch
b/games-simulation/corsix-th/files/corsix-th-nodoc.patch
deleted file mode 100644
index 0fcae9b..000
--- a/games-simula
