diff options
Diffstat (limited to 'dev-games')
28 files changed, 358 insertions, 565 deletions
diff --git a/dev-games/flatzebra/Manifest b/dev-games/flatzebra/Manifest index 18d0ae031fb1..46eac68663fa 100644 --- a/dev-games/flatzebra/Manifest +++ b/dev-games/flatzebra/Manifest @@ -1 +1 @@ -DIST flatzebra-0.1.7.tar.gz 375938 BLAKE2B b84ee2a69c02a7fd519de3e709a81026946b107fa1ddf8f4ee24a490ae9993f2ecf6c8509b9e92d1ab4e11e7f41e41effaaa2b32a7d2e679400f02853602a9bb SHA512 12afbb0ef00dfac21654961da8d2101e9b7b0e6550b9e66bfb4da4faf77cc1dfb7f3da15c8b84c19379eb1ff8bac09324acc694f9282b74ae73a7379686f2374 +DIST flatzebra-0.2.0.tar.gz 654669 BLAKE2B ffb83a530ad8420e72913f3e1cd41ad8c323e712093a207fe46ac0a8faba76d8693c22d0546fc8fde00bb1d167bebf103ec5a748bb9edeef3554ad4b5f38a570 SHA512 d75914dd5a886d0c08407beb36370421c7cf8a375ca7df3d812f8edeac571d94b8ad2fc55a6cd8abadb14c55259d1031df585a1813c5b5e3b92ba07eb013a897 diff --git a/dev-games/flatzebra/flatzebra-0.1.7-r1.ebuild b/dev-games/flatzebra/flatzebra-0.2.0.ebuild index 89175cf28dff..35df9c7056e8 100644 --- a/dev-games/flatzebra/flatzebra-0.1.7-r1.ebuild +++ b/dev-games/flatzebra/flatzebra-0.2.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Generic game engine for 2D double-buffering animation" HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html" @@ -9,22 +9,17 @@ SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="static-libs" -RDEPEND="media-libs/libsdl[joystick,video] - media-libs/sdl-image - media-libs/sdl-mixer" +RDEPEND="media-libs/libsdl2[joystick,video] + media-libs/sdl2-gfx + media-libs/sdl2-image + media-libs/sdl2-mixer + media-libs/sdl2-ttf" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -src_prepare() { - default - sed -i \ - -e '/^doc_DATA =/s/^/NOTHANKS/' \ - Makefile.in || die -} - src_configure() { econf $(use_enable static-libs static) } diff --git a/dev-games/freecell-solver/freecell-solver-6.8.0.ebuild b/dev-games/freecell-solver/freecell-solver-6.8.0.ebuild index fa199fae5478..87ab3c18b20d 100644 --- a/dev-games/freecell-solver/freecell-solver-6.8.0.ebuild +++ b/dev-games/freecell-solver/freecell-solver-6.8.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake python-single-r1 DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants" diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest index d3e0adfca766..5a5473e4a4b7 100644 --- a/dev-games/godot/Manifest +++ b/dev-games/godot/Manifest @@ -1,2 +1 @@ -DIST godot-3.5.3-stable.tar.xz 24072964 BLAKE2B a4c03328e3aa77d741a1c642cfd645de04084f2852e865757fc8960c4919d3b8b8571e772f44004901fdd80a967e8e21bd8c6be8b36263db7afae787dcbd3ed6 SHA512 4c008af5bb7c298d465edbe03f6ebc642f5bbbb0a4254e99d7a7a88919e1f9424b98c5dff95a55ae68d4e2e5878c7c0bb7d13a66869cb632ecb51a913f865155 -DIST godot-4.2.2-stable.tar.xz 26768552 BLAKE2B e4a6040d7a1f63f841f56d74bb7b04e58f2fa26ddd8850df7f93937deb10c4af925ea2059c174d9f457222e0cddfe477498e3462bfaaf69ec8e57de8f2d43c83 SHA512 4a623063be5488957e1ede7e45b6865f6cd61bc954ac311587b9e97bed848a4083c4a7225d0a81bca285d854d33be9b07d7d0c21465c9f25b90e92b08090429c +DIST godot-4.3-stable.tar.xz 29140004 BLAKE2B 0698cf6c8ba853d094c39b461efe998c57a7de0609701e46cca48b17c29eca3da29c8644aa356cff330d1d3ae88048afc2148f5389d57cdfa1dd26784e6d9a44 SHA512 6e1eaba5c3447527ce60d623f7f81cbd90633a5a1ad4c6dd469055a43c8fb9b4807fcd3bae25331294596c2418eb6c0c9db0871c3e1405ddcc7d84e29c39a45b diff --git a/dev-games/godot/files/godot-3.5-musl.patch b/dev-games/godot/files/godot-3.5-musl.patch deleted file mode 100644 index 0738b035480f..000000000000 --- a/dev-games/godot/files/godot-3.5-musl.patch +++ /dev/null @@ -1,9 +0,0 @@ -crash handler requires glibc or libexecinfo (not packaged), -and is always enabled if build the editor (release_debug) ---- a/platform/x11/crash_handler_x11.cpp -+++ b/platform/x11/crash_handler_x11.cpp -@@ -38,3 +38,3 @@ - --#ifdef DEBUG_ENABLED -+#if defined(DEBUG_ENABLED) && defined(__GLIBC__) - #define CRASH_HANDLER_ENABLED 1 diff --git a/dev-games/godot/files/godot-3.5-scons.patch b/dev-games/godot/files/godot-3.5-scons.patch deleted file mode 100644 index b8ed7f50311d..000000000000 --- a/dev-games/godot/files/godot-3.5-scons.patch +++ /dev/null @@ -1,74 +0,0 @@ -* add option to respect AR - (respecting PKG_CONFIG is handled in the ebuild) -* handle recastnavigation unbundling -* remove unnecessary opusfile -* remove unnecessary -no-pie -* remove -pipe from LDFLAGS, may "possibly" be relevant to: - https://bugs.gentoo.org/861689 - https://github.com/godotengine/godot/commit/f035e784 ---- a/SConstruct -+++ b/SConstruct -@@ -192,4 +192,5 @@ - opts.Add("CXX", "C++ compiler") - opts.Add("CC", "C compiler") -+opts.Add("AR", "Archiver") - opts.Add("LINK", "Linker") - opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers") ---- a/platform/server/detect.py -+++ b/platform/server/detect.py -@@ -135,5 +135,4 @@ - - env.Append(CCFLAGS=["-pipe"]) -- env.Append(LINKFLAGS=["-pipe"]) - - ## Dependencies -@@ -178,4 +177,7 @@ - env.ParseConfig("pkg-config libenet --cflags --libs") - -+ if not env["builtin_recast"]: -+ env.ParseConfig("pkg-config recastnavigation --cflags --libs") -+ - if not env["builtin_squish"]: - env.ParseConfig("pkg-config libsquish --cflags --libs") -@@ -205,5 +207,5 @@ - if not env["builtin_opus"]: - env["builtin_libogg"] = False # Needed to link against system opus -- env.ParseConfig("pkg-config opus opusfile --cflags --libs") -+ env.ParseConfig("pkg-config opus --cflags --libs") - - if not env["builtin_libogg"]: ---- a/platform/x11/detect.py -+++ b/platform/x11/detect.py -@@ -232,17 +232,5 @@ - - env.Append(CCFLAGS=["-pipe"]) -- env.Append(LINKFLAGS=["-pipe"]) - -- # Check for gcc version >= 6 before adding -no-pie -- version = get_compiler_version(env) or [-1, -1] -- if using_gcc(env): -- if version[0] >= 6: -- env.Append(CCFLAGS=["-fpie"]) -- env.Append(LINKFLAGS=["-no-pie"]) -- # Do the same for clang should be fine with Clang 4 and higher -- if using_clang(env): -- if version[0] >= 4: -- env.Append(CCFLAGS=["-fpie"]) -- env.Append(LINKFLAGS=["-no-pie"]) - - ## Dependencies -@@ -298,4 +286,7 @@ - env.ParseConfig("pkg-config libenet --cflags --libs") - -+ if not env["builtin_recast"]: -+ env.ParseConfig("pkg-config recastnavigation --cflags --libs") -+ - if not env["builtin_squish"]: - env.ParseConfig("pkg-config libsquish --cflags --libs") -@@ -325,5 +316,5 @@ - if not env["builtin_opus"]: - env["builtin_libogg"] = False # Needed to link against system opus -- env.ParseConfig("pkg-config opus opusfile --cflags --libs") -+ env.ParseConfig("pkg-config opus --cflags --libs") - - if not env["builtin_libogg"]: diff --git a/dev-games/godot/files/godot-3.5.3-gcc13.patch b/dev-games/godot/files/godot-3.5.3-gcc13.patch deleted file mode 100644 index dd681b87dce5..000000000000 --- a/dev-games/godot/files/godot-3.5.3-gcc13.patch +++ /dev/null @@ -1,9 +0,0 @@ -Issues seem(?) to only trigger when gcc13 is combined with musl. - -https://bugs.gentoo.org/906363 ---- a/modules/fbx/fbx_parser/FBXCommon.h -+++ b/modules/fbx/fbx_parser/FBXCommon.h -@@ -78,2 +78,3 @@ - -+#include <cstdint> - #include <string> diff --git a/dev-games/godot/files/godot-4.0_rc2-musl.patch b/dev-games/godot/files/godot-4.0_rc2-musl.patch deleted file mode 100644 index 3b9a458ac7d4..000000000000 --- a/dev-games/godot/files/godot-4.0_rc2-musl.patch +++ /dev/null @@ -1,21 +0,0 @@ -Crash handler requires glibc or libexecinfo (not packaged) and is enabled -if build the editor (implies debug), but can be easily turned off. -https://bugs.gentoo.org/894762 ---- a/platform/linuxbsd/crash_handler_linuxbsd.cpp -+++ b/platform/linuxbsd/crash_handler_linuxbsd.cpp -@@ -38,3 +38,3 @@ - --#ifdef DEBUG_ENABLED -+#if defined(DEBUG_ENABLED) && defined(__GLIBC__) - #define CRASH_HANDLER_ENABLED 1 ---- a/platform/linuxbsd/detect.py -+++ b/platform/linuxbsd/detect.py -@@ -329,8 +329,2 @@ - -- if not env["execinfo"] and platform.libc_ver()[0] != "glibc": -- # The default crash handler depends on glibc, so if the host uses -- # a different libc (BSD libc, musl), fall back to libexecinfo. -- print("Note: Using `execinfo=yes` for the crash handler as required on platforms where glibc is missing.") -- env["execinfo"] = True -- - if env["execinfo"]: diff --git a/dev-games/godot/files/godot-4.0_rc3-scons.patch b/dev-games/godot/files/godot-4.0_rc3-scons.patch deleted file mode 100644 index 682e1510ac94..000000000000 --- a/dev-games/godot/files/godot-4.0_rc3-scons.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -241,2 +241,3 @@ - opts.Add("CC", "C compiler") -+opts.Add("AR", "Archiver") - opts.Add("LINK", "Linker") -@@ -569,8 +570,2 @@ - env.Append(CCFLAGS=["-g2"]) -- else: -- if methods.using_clang(env) and not methods.is_vanilla_clang(env): -- # Apple Clang, its linker doesn't like -s. -- env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"]) -- else: -- env.Append(LINKFLAGS=["-s"]) - diff --git a/dev-games/godot/files/godot-4.3-scons.patch b/dev-games/godot/files/godot-4.3-scons.patch new file mode 100644 index 000000000000..2451b7cf8a5f --- /dev/null +++ b/dev-games/godot/files/godot-4.3-scons.patch @@ -0,0 +1,15 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -297,2 +297,3 @@ + opts.Add("CC", "C compiler binary") ++opts.Add("AR", "Archiver") + opts.Add("LINK", "Linker binary") +@@ -731,8 +732,2 @@ + env.Append(CCFLAGS=[f"-ffile-prefix-map={project_path}=."]) +- else: +- if methods.using_clang(env) and not methods.is_vanilla_clang(env): +- # Apple Clang, its linker doesn't like -s. +- env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"]) +- else: +- env.Append(LINKFLAGS=["-s"]) + diff --git a/dev-games/godot/godot-3.5.3-r1.ebuild b/dev-games/godot/godot-3.5.3-r1.ebuild deleted file mode 100644 index 9a41621d39b5..000000000000 --- a/dev-games/godot/godot-3.5.3-r1.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit desktop python-any-r1 scons-utils shell-completion toolchain-funcs xdg - -DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor" -HOMEPAGE="https://godotengine.org/" -SRC_URI=" - https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz - https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz -" -S="${WORKDIR}/${P}-stable" - -LICENSE=" - MIT - Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB - gui? ( CC-BY-4.0 ) tools? ( BitstreamVera OFL-1.1 ) -" -SLOT="3" -KEYWORDS="~amd64" -# Enable roughly same as upstream by default so it works as expected, -# except raycast (tools-only heavy dependency), and deprecated. -IUSE=" - +bullet debug deprecated +gui pulseaudio raycast +runner +theora - +tools +udev +upnp +webm +webp -" - -# dlopen: alsa-lib,pulseaudio,udev -RDEPEND=" - app-arch/zstd:= - dev-games/recastnavigation:= - dev-libs/libpcre2:=[pcre32] - media-libs/alsa-lib - media-libs/freetype[brotli] - media-libs/libpng:= - <net-libs/mbedtls-3:= - net-libs/wslay - sys-libs/zlib:= - bullet? ( sci-physics/bullet:= ) - gui? ( - media-libs/libglvnd - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - tools? ( raycast? ( media-libs/embree:3 ) ) - ) - pulseaudio? ( media-libs/libpulse ) - theora? ( - media-libs/libogg - media-libs/libtheora - media-libs/libvorbis - ) - tools? ( app-misc/ca-certificates ) - udev? ( virtual/udev ) - webm? ( - media-libs/libvorbis - media-libs/libvpx:= - media-libs/opus - ) - webp? ( media-libs/libwebp:= ) -" -DEPEND=" - ${RDEPEND} - gui? ( x11-base/xorg-proto ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-musl.patch - "${FILESDIR}"/${PN}-3.5-scons.patch - "${FILESDIR}"/${PN}-3.5.3-gcc13.patch -) - -src_prepare() { - default - - # handle slotting - sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die - sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die - sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \ - -i misc/dist/linux/org.godotengine.Godot.desktop || die - sed -e "s/godot/&${SLOT}/g" \ - -i misc/dist/shell/{godot.bash-completion,godot.fish,_godot.zsh-completion} || die - - sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/{x11,server}/detect.py || die - - # use of builtin_ switches can be messy (see below), delete to be sure - local unbundle=( - bullet embree freetype libogg libpng libtheora libvorbis libvpx - libwebp mbedtls opus pcre2 recastnavigation wslay zlib zstd # miniupnpc - # certs: unused by generated header, but scons panics if not found - # miniupnpc: check if can re-add on bump, bug #934044 - ) - rm -r "${unbundle[@]/#/thirdparty/}" || die -} - -src_compile() { - local -x BUILD_NAME=gentoo # replaces "custom_build" in version string - - local esconsargs=( - AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)" - - platform=$(usex gui x11 server) - progress=no - verbose=yes - - deprecated=$(usex deprecated) - #execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged - minizip=yes # uses a modified bundled copy - pulseaudio=$(usex pulseaudio) - udev=$(usex udev) - - system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt - - # platform/*/detect.py uses builtin_* switches to check if need - # to link with system libraries, but ignores whether the dep is - # actually used, so "enable" deleted builtins on disabled deps - builtin_bullet=$(usex !bullet) - builtin_certs=no - builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast))) - builtin_enet=yes # bundled copy is patched for IPv6+DTLS support - builtin_freetype=no - builtin_libogg=yes # unused - builtin_libpng=no - builtin_libtheora=$(usex !theora) - builtin_libvorbis=$(usex !theora $(usex !webm)) - builtin_libvpx=$(usex !webm) - builtin_libwebp=$(usex !webp) - builtin_mbedtls=no - builtin_miniupnpc=yes #934044 (for now, should revisit) - builtin_opus=$(usex !webm) - builtin_pcre2=no - builtin_recast=no - builtin_rvo2=yes # bundled copy has godot-specific changes - builtin_squish=yes # ^ likewise, may not be safe to unbundle - builtin_wslay=no - builtin_xatlas=yes # not wired for unbundling nor packaged - builtin_zlib=no - builtin_zstd=no - # (more is bundled in third_party/ but they lack builtin_* switches) - - # modules with optional dependencies, "possible" to disable more but - # gets messy and breaks all sorts of features (expected enabled) - module_bullet_enabled=$(usex bullet) - module_mono_enabled=no # unhandled - module_ogg_enabled=no # unused - module_opus_enabled=no # unused, support is gone and webm uses system's - # note raycast is disabled on many arches, see raycast/config.py - module_raycast_enabled=$(usex gui $(usex tools $(usex raycast))) - module_theora_enabled=$(usex theora) - module_upnp_enabled=$(usex upnp) - module_vorbis_enabled=no # unused, non-theora/webm uses stb_vorbis - module_webm_enabled=$(usex webm) - module_webp_enabled=$(usex webp) - - # let *FLAGS handle these, e.g. can pass -flto as-is - debug_symbols=no - optimize=none - use_lto=no - use_static_cpp=no - ) - - if use runner && use tools; then - # build alternate faster + ~60% smaller binary for running - # games or servers without game development debug paths - escons extra_suffix=runner target=release tools=no "${esconsargs[@]}" - fi - - esconsargs+=( - # debug: debug for godot itself - # release_debug: debug for game development - # release: no debugging paths, only available with tools=no - target=$(usex debug{,} $(usex tools release_debug release)) - tools=$(usex tools) - ) - - escons extra_suffix=main "${esconsargs[@]}" -} - -src_install() { - local s=godot${SLOT} - - newbin bin/godot*.main ${s} - if use runner && use tools; then - newbin bin/godot*.runner ${s}-runner - else - # always available, revdeps shouldn't depend on [runner] - dosym ${s} /usr/bin/${s}-runner - fi - - newman misc/dist/linux/godot.6 ${s}.6 - dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md - - if use gui; then - newicon icon.svg ${s}.svg - newmenu misc/dist/linux/org.godotengine.Godot.desktop \ - org.godotengine.${s^}.desktop - - insinto /usr/share/metainfo - newins misc/dist/linux/org.godotengine.Godot.appdata.xml \ - org.godotengine.${s^}.appdata.xml - - insinto /usr/share/mime/application - newins misc/dist/linux/org.godotengine.Godot.xml \ - org.godotengine.${s^}.xml - fi - - newbashcomp misc/dist/shell/godot.bash-completion ${s} - newfishcomp misc/dist/shell/godot.fish ${s}.fish - newzshcomp misc/dist/shell/_godot.zsh-completion _${s} -} diff --git a/dev-games/godot/godot-4.2.2-r1.ebuild b/dev-games/godot/godot-4.3-r1.ebuild index d9ea297149f2..0bf48fbd9cbf 100644 --- a/dev-games/godot/godot-4.2.2-r1.ebuild +++ b/dev-games/godot/godot-4.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit desktop python-any-r1 flag-o-matic scons-utils inherit shell-completion toolchain-funcs xdg @@ -20,17 +20,23 @@ LICENSE=" Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 ) " -SLOT="4" +SLOT="0" KEYWORDS="~amd64" # Enable roughly same as upstream by default so it works as expected, # except raycast (tools-only heavy dependency), and deprecated. IUSE=" alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast - +runner speech test +theora +tools +udev +upnp +vulkan +webp + speech test +theora +tools +udev +upnp +vulkan wayland +webp " +REQUIRED_USE="wayland? ( gui )" # TODO: tests still need more figuring out RESTRICT="test" +# mbedtls: "can" use >=mbedtls-3 but the module needs updates handle +# the new tls1.3 default among other things, and the bundled 3.x copy +# builds it #undef MBEDTLS_SSL_PROTO_TLS1_3 + a patch or else will get +# "ERROR: TLS handshake error: -27648" with system's on startup +# https://github.com/godotengine/godot/commit/40fa684c181d # dlopen: libglvnd RDEPEND=" app-arch/brotli:= @@ -59,14 +65,18 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon - tools? ( raycast? ( media-libs/embree:3 ) ) - vulkan? ( media-libs/vulkan-loader[X] ) + tools? ( raycast? ( media-libs/embree:4 ) ) + vulkan? ( media-libs/vulkan-loader[X,wayland?] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) + wayland? ( + dev-libs/wayland + gui-libs/libdecor + ) webp? ( media-libs/libwebp:= ) " DEPEND=" @@ -74,24 +84,18 @@ DEPEND=" gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) ) " -BDEPEND="virtual/pkgconfig" +BDEPEND=" + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" PATCHES=( - "${FILESDIR}"/${PN}-4.0_rc2-musl.patch - "${FILESDIR}"/${PN}-4.0_rc3-scons.patch + "${FILESDIR}"/${PN}-4.3-scons.patch ) src_prepare() { default - # handle slotting - sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die - sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die - sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \ - -i misc/dist/linux/org.godotengine.Godot.desktop || die - sed -e "s/godot/&${SLOT}/g" \ - -i misc/dist/shell/{godot.bash-completion,godot.fish,_godot.zsh-completion} || die - sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die # use of builtin_ switches can be messy (see below), delete to be sure @@ -123,6 +127,7 @@ src_compile() { alsa=$(usex alsa) dbus=$(usex dbus) deprecated=$(usex deprecated) + execinfo=no # not packaged, disables crash handler if non-glibc fontconfig=$(usex fontconfig) opengl3=$(usex gui) pulseaudio=$(usex pulseaudio) @@ -130,6 +135,9 @@ src_compile() { udev=$(usex udev) use_volk=no # unnecessary when linking directly to libvulkan vulkan=$(usex gui $(usex vulkan)) + wayland=$(usex wayland) + # TODO: retry to add optional USE=X, wayland support is new + # and gui build is not well wired to handle USE="-X wayland" yet x11=$(usex gui) system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt @@ -182,12 +190,6 @@ src_compile() { use_static_cpp=no ) - if use runner && use tools; then - # build alternate faster + ~60% smaller binary for running - # games or servers without game development debug paths - escons extra_suffix=runner target=template_release "${esconsargs[@]}" - fi - esconsargs+=( target=$(usex tools editor template_$(usex debug{,} release)) dev_build=$(usex debug) @@ -196,43 +198,45 @@ src_compile() { tests=$(usex tools $(usex test)) ) - escons extra_suffix=main "${esconsargs[@]}" + escons "${esconsargs[@]}" } src_test() { xdg_environment_reset - bin/godot*.main --headless --test || die + + bin/godot* --headless --test || die } src_install() { - local s=godot${SLOT} - - newbin bin/godot*.main ${s} - if use runner && use tools; then - newbin bin/godot*.runner ${s}-runner - else - # always available, revdeps shouldn't depend on [runner] - dosym ${s} /usr/bin/${s}-runner - fi + # suffix varies depending on arch/features, use wildcard to simplify + newbin bin/godot* godot - newman misc/dist/linux/godot.6 ${s}.6 + doman misc/dist/linux/godot.6 dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md if use gui; then - newicon icon.svg ${s}.svg - newmenu misc/dist/linux/org.godotengine.Godot.desktop \ - org.godotengine.${s^}.desktop + newicon icon.svg godot.svg + domenu misc/dist/linux/org.godotengine.Godot.desktop insinto /usr/share/metainfo - newins misc/dist/linux/org.godotengine.Godot.appdata.xml \ - org.godotengine.${s^}.appdata.xml + doins misc/dist/linux/org.godotengine.Godot.appdata.xml insinto /usr/share/mime/application - newins misc/dist/linux/org.godotengine.Godot.xml \ - org.godotengine.${s^}.xml + doins misc/dist/linux/org.godotengine.Godot.xml fi - newbashcomp misc/dist/shell/godot.bash-completion ${s} - newfishcomp misc/dist/shell/godot.fish ${s}.fish - newzshcomp misc/dist/shell/_godot.zsh-completion _${s} + newbashcomp misc/dist/shell/godot.bash-completion godot + newfishcomp misc/dist/shell/godot.fish godot.fish + newzshcomp misc/dist/shell/_godot.zsh-completion _godot +} + +pkg_postinst() { + xdg_pkg_postinst + + if has_version dev-games/godot:3 || has_version dev-games/godot:4; then + elog + elog "Gentoo's godot ebuild has removed slotting support meaning that godot" + elog "is now invoked with 'godot' rather than 'godot4', and godot3 has been" + elog "removed. USE=runner and 'godot*-runner' were also removed." + fi } diff --git a/dev-games/godot/metadata.xml b/dev-games/godot/metadata.xml index 71f596fee4e9..b1acc9b2ce0d 100644 --- a/dev-games/godot/metadata.xml +++ b/dev-games/godot/metadata.xml @@ -20,12 +20,9 @@ and consoles. </longdescription> <use> - <flag name="bullet">Enable the <pkg>sci-physics/bullet</pkg> module</flag> <flag name="deprecated">Enable support for deprecated features</flag> <flag name="raycast">Enable the raycast Editor module using <pkg>media-libs/embree</pkg></flag> - <flag name="runner">Build an additional binary optimized for running games (only relevant with USE=tools)</flag> <flag name="tools">Enable the Godot Editor for game development</flag> - <flag name="webm">Enable the WebM module</flag> </use> <upstream> <doc>https://docs.godotengine.org/</doc> diff --git a/dev-games/guichan/guichan-0.8.2-r1.ebuild b/dev-games/guichan/guichan-0.8.2-r1.ebuild new file mode 100644 index 000000000000..22e244aec69d --- /dev/null +++ b/dev-games/guichan/guichan-0.8.2-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL" +HOMEPAGE="https://github.com/darkbitsorg/guichan" +SRC_URI="https://github.com/darkbitsorg/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="allegro opengl sdl" + +DEPEND=" + allegro? ( media-libs/allegro:0 ) + opengl? ( virtual/opengl ) + sdl? ( + media-libs/libsdl + media-libs/sdl-image + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-as-needed.patch + "${FILESDIR}"/${P}-automake-1.13.patch + "${FILESDIR}"/${P}-slibtool-undefined-references.patch +) + +src_prepare() { + default + + mv configure.in configure.ac || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable allegro) + $(use_enable opengl) + $(use_enable sdl) + $(use_enable sdl sdlimage) + ) + + econf "${myeconfargs}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-games/guichan/metadata.xml b/dev-games/guichan/metadata.xml index 82d4f99756bf..59e233d7f502 100644 --- a/dev-games/guichan/metadata.xml +++ b/dev-games/guichan/metadata.xml @@ -11,5 +11,6 @@ <upstream> <remote-id type="google-code">guichan</remote-id> <remote-id type="sourceforge">guichan</remote-id> + <remote-id type="github">darkbitsorg/guichan</remote-id> </upstream> </pkgmetadata> diff --git a/dev-games/irrlicht-headers/Manifest b/dev-games/irrlicht-headers/Manifest index 94979316ecc7..ab76d98df0bf 100644 --- a/dev-games/irrlicht-headers/Manifest +++ b/dev-games/irrlicht-headers/Manifest @@ -1,2 +1,3 @@ DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602 DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 +DIST irrlicht-1.8.5.zip 21827696 BLAKE2B 25f2a6479d8c60b3e99c2f6d80181f82ba983f9aeca2bed31f63dcb5a0aa62a82753f733e5b516a5eacdb5b4119b0bb6385ced9144471a46e99e6ebd0d3b0126 SHA512 d11c7a056bfb8c9737ed583c5bc5794223bc59fb4620411b63bc4d1eedc41db2ed1cab5cb7a37fee42a7f38c0e0645f5fc53fd329fff0f2aa78e0df6804c47c9 diff --git a/dev-games/irrlicht-headers/irrlicht-headers-1.8.5.ebuild b/dev-games/irrlicht-headers/irrlicht-headers-1.8.5.ebuild new file mode 100644 index 000000000000..841369b95a2c --- /dev/null +++ b/dev-games/irrlicht-headers/irrlicht-headers-1.8.5.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edos2unix + +MY_PN="irrlicht" +MY_P="${MY_PN}-${PV}" +DESCRIPTION="Irrlicht 3D engine headers" +HOMEPAGE="https://irrlicht.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/irrlicht/${MY_P}.zip + https://dev.gentoo.org/~mgorny/dist/${MY_PN}-1.8.4-patchset.tar.bz2" +S="${WORKDIR}/${MY_P}/source/${MY_PN^}" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" + +BDEPEND="app-arch/unzip" + +PATCHES=( + "${WORKDIR}"/${MY_PN}-1.8.4-patchset/${MY_PN}-1.8.4-config.patch +) + +src_prepare() { + cd "${WORKDIR}"/${MY_P} || die + edos2unix include/IrrCompileConfig.h + default +} + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + cd "${WORKDIR}"/${MY_P} || die + + insinto /usr/include/${MY_PN} + doins include/* +} diff --git a/dev-games/irrlicht-mt-headers/Manifest b/dev-games/irrlicht-mt-headers/Manifest index 10aff65bbbca..9250f2b93075 100644 --- a/dev-games/irrlicht-mt-headers/Manifest +++ b/dev-games/irrlicht-mt-headers/Manifest @@ -1,2 +1 @@ -DIST irrlicht-mt-1.9.0.10.tar.gz 898774 BLAKE2B 2b11aead4556127bff7c7f06d16a57632cf1758ad0ddf12e6d9346d80d13c0cd437ccade268db5bec25f8d62cfa61e9ecda07a98d0a82c18b548a1b520dccee2 SHA512 216221b5073d2b234b2d19658b30517c3abb2677c16e3a9b7fd31c15431bd2ffc047a68851c5bebf94aeb178d6b761a80c2f5744a7498cdac1d7b65fed139cc0 DIST irrlicht-mt-1.9.0.13.tar.gz 754056 BLAKE2B 02e3a219c2cfbd0c383f70c5e82d06563e28b4ae3fb59d420bb570e38d8618b525db50ddb67fbb91182f64b0567f99caa517f9799c650be3c8cd98ce43a9bc76 SHA512 5226d78eaacf8b56eafbbb6359bfb6137f9d6a555a252224e33d39c0d219fcb7d0d29fd3828961eee37d55940f3aa6e767fea31c96fb772dd5eca3889f5ac16e diff --git a/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.10.ebuild b/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.10.ebuild deleted file mode 100644 index ca22218f7ec1..000000000000 --- a/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.10.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="${PN%-mt-headers}" -MY_PV="$(ver_rs 3 'mt')" -MY_P="${MY_PN}-${MY_PV}" -# These two should be kept in sync with dev-games/irrlicht-mt -SRC_PN="${PN%-headers}" -SRC_P="${SRC_PN}-${PV}" - -DESCRIPTION="Header files for Minetest's fork of dev-games/irrlicht" -HOMEPAGE="https://github.com/minetest/irrlicht" -SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${SRC_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~riscv" - -RDEPEND="!<dev-games/irrlicht-mt-1.9.0.4-r1" - -S="${WORKDIR}"/${MY_P} - -src_configure() { :; } - -src_compile() { :; } - -src_install() { - insinto /usr/include/${SRC_PN/-/} - doins include/* -} diff --git a/dev-games/irrlicht-mt/Manifest b/dev-games/irrlicht-mt/Manifest index 10aff65bbbca..9250f2b93075 100644 --- a/dev-games/irrlicht-mt/Manifest +++ b/dev-games/irrlicht-mt/Manifest @@ -1,2 +1 @@ -DIST irrlicht-mt-1.9.0.10.tar.gz 898774 BLAKE2B 2b11aead4556127bff7c7f06d16a57632cf1758ad0ddf12e6d9346d80d13c0cd437ccade268db5bec25f8d62cfa61e9ecda07a98d0a82c18b548a1b520dccee2 SHA512 216221b5073d2b234b2d19658b30517c3abb2677c16e3a9b7fd31c15431bd2ffc047a68851c5bebf94aeb178d6b761a80c2f5744a7498cdac1d7b65fed139cc0 DIST irrlicht-mt-1.9.0.13.tar.gz 754056 BLAKE2B 02e3a219c2cfbd0c383f70c5e82d06563e28b4ae3fb59d420bb570e38d8618b525db50ddb67fbb91182f64b0567f99caa517f9799c650be3c8cd98ce43a9bc76 SHA512 5226d78eaacf8b56eafbbb6359bfb6137f9d6a555a252224e33d39c0d219fcb7d0d29fd3828961eee37d55940f3aa6e767fea31c96fb772dd5eca3889f5ac16e diff --git a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild deleted file mode 100644 index aabef13c265f..000000000000 --- a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN="${PN%-mt}" -MY_PV="$(ver_rs 3 'mt')" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Minetest's fork of dev-games/irrlicht" -HOMEPAGE="https://github.com/minetest/irrlicht" -SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~riscv" - -RDEPEND="~dev-games/irrlicht-mt-headers-${PV} - media-libs/libpng:0= - sys-libs/zlib - media-libs/libjpeg-turbo - virtual/opengl - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0.10-no_upstream_optflags.patch -) - -S="${WORKDIR}"/${MY_P} - -src_install() { - cmake_src_install - - # We package these separately - rm -r "${ED}"/usr/include/${PN/-/} || die "Failed to exclude header files from installation" -} diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest index 94979316ecc7..ab76d98df0bf 100644 --- a/dev-games/irrlicht/Manifest +++ b/dev-games/irrlicht/Manifest @@ -1,2 +1,3 @@ DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602 DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 +DIST irrlicht-1.8.5.zip 21827696 BLAKE2B 25f2a6479d8c60b3e99c2f6d80181f82ba983f9aeca2bed31f63dcb5a0aa62a82753f733e5b516a5eacdb5b4119b0bb6385ced9144471a46e99e6ebd0d3b0126 SHA512 d11c7a056bfb8c9737ed583c5bc5794223bc59fb4620411b63bc4d1eedc41db2ed1cab5cb7a37fee42a7f38c0e0645f5fc53fd329fff0f2aa78e0df6804c47c9 diff --git a/dev-games/irrlicht/irrlicht-1.8.5.ebuild b/dev-games/irrlicht/irrlicht-1.8.5.ebuild new file mode 100644 index 000000000000..538e8e60e57e --- /dev/null +++ b/dev-games/irrlicht/irrlicht-1.8.5.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Open source high performance realtime 3D engine written in C++" +HOMEPAGE="https://irrlicht.sourceforge.io/" +SRC_URI=" + https://downloads.sourceforge.net/irrlicht/${P}.zip + https://dev.gentoo.org/~mgorny/dist/${PN}-1.8.4-patchset.tar.bz2" +S="${WORKDIR}/${P}/source/${PN^}" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="debug doc" + +RDEPEND=" + app-arch/bzip2 + ~dev-games/irrlicht-headers-${PV} + media-libs/libpng:= + sys-libs/zlib:= + media-libs/libjpeg-turbo:= + virtual/opengl + x11-libs/libX11 + x11-libs/libXxf86vm" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="app-arch/unzip" + +PATCHES=( + "${WORKDIR}"/${PN}-1.8.4-patchset/${PN}-1.8.4-gentoo.patch + "${WORKDIR}"/${PN}-1.8.4-patchset/${PN}-1.8.4-demoMake.patch + "${WORKDIR}"/${PN}-1.8.4-patchset/${PN}-1.8.4-mesa-10.x.patch + "${WORKDIR}"/${PN}-1.8.4-patchset/${PN}-1.8.4-jpeg-9a.patch + "${FILESDIR}"/${PN}-1.8.4-drop-register.patch +) + +DOCS=( changes.txt readme.txt ) + +src_prepare() { + cd "${WORKDIR}"/${P} || die + + # Use system-provided Irrlicht headers + rm -r include || die + ln -s "${ESYSROOT}/usr/include/irrlicht" include || die + + # Fix relative path to media directory + sed -i \ + -e 's:\.\./\.\./media:../media:g' \ + $(grep -rl '\.\./\.\./media' examples) \ + || die 'sed failed' + + # Fix line endings so ${P}-remove-sys-sysctl.h.patch applies + sed -i \ + -e 's/\r$//' \ + source/Irrlicht/COSOperator.cpp \ + || die 'sed failed' + + default +} + +src_compile() { + tc-export CXX CC AR + emake NDEBUG=$(usev !debug 1) sharedlib +} + +src_install() { + cd "${WORKDIR}"/${P} || die + + dolib.so lib/Linux/libIrrlicht.so* + + # create library symlinks + dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8 + dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so + + einstalldocs + + # don't do these with einstalldocs because they shouldn't be compressed + use doc && dodoc -r examples media +} diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild index f86ab21c32aa..a00bfb2e0bd7 100644 --- a/dev-games/simgear/simgear-9999.ebuild +++ b/dev-games/simgear/simgear-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,8 +7,7 @@ inherit cmake toolchain-funcs git-r3 DESCRIPTION="Development library for simulation games" HOMEPAGE="https://www.flightgear.org/" -EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/${PN} - git://mapserver.flightgear.org/${PN}" +EGIT_REPO_URI="https://git.code.sf.net/p/flightgear/${PN}" EGIT_BRANCH="next" LICENSE="GPL-2" diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest index e42c7439c30b..ba18d96e0838 100644 --- a/dev-games/tiled/Manifest +++ b/dev-games/tiled/Manifest @@ -1 +1 @@ -DIST tiled-1.8.6.tar.gz 17053221 BLAKE2B a226ff9861ebfa3980176fac2b23c7fff8ac6db585444c5d5c21afff2301298e1eaa74179970bfaeb07c62074c706378040c520d5f0155b030f9e2025c51abb0 SHA512 f77ff46fbb707d8c02499f168e5748f39081fa780fb9a5b1ea04603b09cd71280d76034cab28b23fc30280bd856121e473c992c9c39d7c46fc97d5fbfbe4191d +DIST tiled-1.11.0.tar.gz 17458724 BLAKE2B 3e7ea2ce4a61aa31d60487bf4cd68efb9307be0a753ee1571b9d2a90dff5299fdbbfd432c38eddafbea98cd6a1c59aa338c9ab5337e923e3178456a720e24ed4 SHA512 59e7ff38bedb0b897b40b2d3f6231004970de843e3700ef8adfaf78ab9b15c57e291ec27d409ba61094871b84f27238defb33bef5b23e838736f515ec1addf5d diff --git a/dev-games/tiled/metadata.xml b/dev-games/tiled/metadata.xml index 13233bbdb862..d6abd76eacce 100644 --- a/dev-games/tiled/metadata.xml +++ b/dev-games/tiled/metadata.xml @@ -1,8 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>mechakotik@gmail.com</email> + <name>Andrei Sabalenka</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> - <remote-id type="github">bjorn/tiled</remote-id> + <remote-id type="github">mapeditor/tiled</remote-id> </upstream> + <use> + <flag name="minimal">Exclude optional plugins and development headers</flag> + </use> </pkgmetadata> + diff --git a/dev-games/tiled/tiled-1.11.0.ebuild b/dev-games/tiled/tiled-1.11.0.ebuild new file mode 100644 index 000000000000..66a5a4df0232 --- /dev/null +++ b/dev-games/tiled/tiled-1.11.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) +inherit edo flag-o-matic multiprocessing python-single-r1 toolchain-funcs xdg + +DESCRIPTION="A general purpose tile map editor" +HOMEPAGE="https://www.mapeditor.org/ https://github.com/mapeditor/tiled" +SRC_URI="https://github.com/mapeditor/tiled/archive/v${PV}/${P}.tar.gz" + +LICENSE="BSD BSD-2 GPL-2+" +SLOT="0" +KEYWORDS="amd64" +IUSE="minimal python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + app-arch/zstd:= + dev-qt/qtbase:6[X,dbus,gui,network,opengl,widgets] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 + sys-libs/zlib + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/qbs + dev-qt/qtbase:6 + dev-qt/qttools:6[linguist] +" + +QBS_PRODUCTS="tiled,csv,json" + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +qbs_format_flags() { + local -a array + for flag in ${@}; do + array+=( "\"${flag}\"" ) + done + echo "[$(IFS=","; echo "${array[*]}")]" +} + +src_configure() { + if use python; then + QBS_PRODUCTS="${QBS_PRODUCTS},python" + fi + if ! use minimal; then + QBS_PRODUCTS="${QBS_PRODUCTS},defold,defoldcollection,droidcraft,flare,gmx,json1,lua,replicaisland,rpmap,tbin,tengine,terraingenerator,tmxrasterizer,tmxviewer,tscn,yy" + fi + + edo qbs setup-qt /usr/bin/qmake6 qt6 + edo qbs config defaultProfile qt6 + + local toolchain=$(tc-get-compiler-type) + edo qbs setup-toolchains ${toolchain} ${toolchain} + edo qbs config profiles.qt6.baseProfile ${toolchain} + + edo qbs resolve \ + --force-probe-execution \ + qbs.installPrefix:"/usr" \ + projects.Tiled.useRPaths:false \ + projects.Tiled.installHeaders:$(usex minimal false true) \ + project.libDir:$(get_libdir) \ + modules.cpp.cFlags:$(qbs_format_flags ${CFLAGS}) \ + modules.cpp.cxxFlags:$(qbs_format_flags ${CXXFLAGS}) \ + modules.cpp.linkerFlags:$(qbs_format_flags $(raw-ldflags ${LDFLAGS})) +} + +src_compile() { + edo qbs build \ + -p ${QBS_PRODUCTS} \ + -j $(get_makeopts_jobs) +} + +src_install() { + edo qbs install -p ${QBS_PRODUCTS} --install-root "${D}" + + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples +} diff --git a/dev-games/tiled/tiled-1.8.6.ebuild b/dev-games/tiled/tiled-1.8.6.ebuild deleted file mode 100644 index 44e23d47cbd4..000000000000 --- a/dev-games/tiled/tiled-1.8.6.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-single-r1 qmake-utils xdg-utils - -DESCRIPTION="A general purpose tile map editor" -HOMEPAGE="https://www.mapeditor.org/" -SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz" - -LICENSE="BSD BSD-2 GPL-2+" -SLOT="0" -KEYWORDS="amd64" -IUSE="examples python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - app-arch/zstd:= - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtdbus-5.15:5 - >=dev-qt/qtdeclarative-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtnetwork-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - sys-libs/zlib - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -DOCS=( AUTHORS COPYING NEWS.md README.md ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - eqmake5 \ - LIBDIR="/usr/$(get_libdir)" \ - PREFIX="/usr" \ - SYSTEM_ZSTD="yes" \ - DISABLE_PYTHON_PLUGIN="$(usex !python)" \ - USE_FHS_PLUGIN_PATH="true" -} - -src_install() { - emake INSTALL_ROOT="${D}" install - - einstalldocs - - if use examples ; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - fi -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} |