gentoo auto-resync : 03:12:2024 - 02:07:18

4 files changed, 119 insertions, 0 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index bb6709c456f0..33ff07ed1c91 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 5b6a01bf12e6..a9701c88b98b 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,4 +1,6 @@
 AUX odamex-10.3.0-unbundle-fltk.patch 3556 BLAKE2B 8aa1fd752c465a89566edab409c2df03ce1bae7a3ae1fdf3749fbce90cef81d1315f1f677f3090d676ad514df957a043cfd02c497d03673c248d55b02ee89768 SHA512 3facbcb43f0bc516e85c6030d66fc03c2c0b11d25ed30bac1947cbffd1f3123e173c46e02b198215dc5b4aac7fccbf1bfe9aeaf54db6c0d159d7bd6d3abd3797
+AUX odamex-10.6.0-odalaunch-sorting-crash.patch 865 BLAKE2B 90a775db8d469a6bd457c5a7c221e3bf8477e9739bbfb1af05e3f1bd482ac6019687262a9a678f33d7b42ceee4d1c99a878258cc4e7bbe4497bd60019e1445d6 SHA512 20f5f0c6bfd6f626bc269dce78827920f105bde882f490b6f716eac6a5a823d7f1d4b4b5bfaf0c68a17063937177dfe8ab94634c867247e8b1b0ab4a134052d8
 DIST odamex-src-10.6.0.tar.xz 17560572 BLAKE2B eeb9742b587a7e45fa5d33ae7a96b767a4d6517732ffc82a58c68557edfd43305413667fdcc24f7256613c05421da85a81db2c5d36d7ad09b91e4b2d76fa1693 SHA512 c1269a9047199af16c64aee5d0520070cfa36c7a2488628bb19744024f13e083a6841b65f8dc18b930d3b0ef39cdebddfcf028ea44af98b4418319c364e806c0
+EBUILD odamex-10.6.0-r1.ebuild 2251 BLAKE2B 33457eb1d5e60474fd0cad16f84f9656b35915e58b01c0f53cae4ecff1acc9f450ed918df7cfe7196d208568ad136f97dfed0b7e52a3753573e9abe521f47448 SHA512 c25054a9a2971e13c9bf8532ec9bb2b1785b3d0c0f143e4f16dbdda837d053a23abd51998c4b289ca5de1d05e550ba931d0dc274a7dae6571ff9f0421b8ca9c7
 EBUILD odamex-10.6.0.ebuild 2303 BLAKE2B 64c65fa0fd3dea072adfdd119513b39e60619e6a6743d97bfb900530016646f8469a2020d7372c8d72ea51abf7424b47eecda5fe451f424a2172e3196afa7b24 SHA512 b7a670c1bbe4bc8ab6b22e5958567e12f328935070ef3bd27035e4e718c39a7365def360928b3424325278bfbc62516d3312564a87e17e5a824a7d1e4546546b
 MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af
diff --git a/games-engines/odamex/files/odamex-10.6.0-odalaunch-sorting-crash.patch b/games-engines/odamex/files/odamex-10.6.0-odalaunch-sorting-crash.patch
new file mode 100644
index 000000000000..b665d16d86a4
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.6.0-odalaunch-sorting-crash.patch
@@ -0,0 +1,28 @@
+From e8dfbdc08a58d709fa7c23e38911c421cdb2a76d Mon Sep 17 00:00:00 2001
+From: Pavel Miksha <89637241+keyboardcrash32@users.noreply.github.com>
+Date: Sun, 20 Oct 2024 15:53:14 +0300
+Subject: [PATCH] Fix odalaunch crashing when sorting servers
+
+---
+ odalaunch/src/lst_custom.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/odalaunch/src/lst_custom.cpp b/odalaunch/src/lst_custom.cpp
+index 1ad0387fa..22182b6cb 100644
+--- a/odalaunch/src/lst_custom.cpp
++++ b/odalaunch/src/lst_custom.cpp
+@@ -319,6 +319,14 @@ int wxCALLBACK wxCompareFunction(wxIntPtr item1, wxIntPtr item2,
+ 	Item.SetColumn(SortCol);
+ 	Item.SetMask(wxLIST_MASK_TEXT);
+ 
++	long id1 = ListCtrl->FindItem(-1, item1);
++	long id2 = ListCtrl->FindItem(-1, item2);
++
++	if (id1 == -1 || id2 == -1)
++	{
++		return 0;
++	}
++
+ 	if(SortCol == ListCtrl->GetSpecialSortColumn())
+ 	{
+ 		int Img1, Img2;
diff --git a/games-engines/odamex/odamex-10.6.0-r1.ebuild b/games-engines/odamex/odamex-10.6.0-r1.ebuild
new file mode 100644
index 000000000000..504ec274d098
--- /dev/null
+++ b/games-engines/odamex/odamex-10.6.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit cmake desktop prefix wxwidgets xdg
+
+DESCRIPTION="Online multiplayer free software engine for DOOM"
+HOMEPAGE="https://odamex.net/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz"
+S="${WORKDIR}/${PN}-src-${PV}"
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+client hidpi master +odalaunch portmidi server upnp"
+REQUIRED_USE="|| ( client master server )"
+
+# protobuf is still bundled. Unfortunately an old version is required for C++98
+# compatibility. We could use C++11, but upstream is concerned about using a
+# completely different protobuf version on a multiplayer-focused engine.
+
+RDEPEND="
+	client? (
+		media-libs/libpng:0=
+		media-libs/libsdl2[joystick,sound,video]
+		media-libs/sdl2-mixer
+		net-misc/curl
+		x11-libs/libX11
+		!hidpi? ( x11-libs/fltk:1 )
+		portmidi? ( media-libs/portmidi )
+	)
+	odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	server? (
+		dev-libs/jsoncpp:=
+		upnp? ( net-libs/miniupnpc:= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
+	"${FILESDIR}"/${P}-odalaunch-sorting-crash.patch
+)
+
+src_prepare() {
+	rm -r libraries/miniupnp || die
+	hprefixify common/d_main.cpp
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	use odalaunch && setup-wxwidgets
+
+	local mycmakeargs=(
+		-DUSE_INTERNAL_FLTK=$(usex hidpi)
+		-DUSE_INTERNAL_JSONCPP=0
+		-DUSE_INTERNAL_LIBS=0
+		-DUSE_INTERNAL_MINIUPNP=0
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_LAUNCHER=$(usex odalaunch)
+		-DBUILD_MASTER=$(usex master)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_OR_FAIL=1
+		-DENABLE_PORTMIDI=$(usex portmidi)
+		-DUSE_MINIUPNP=$(usex upnp)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use client ; then
+		for size in 96 128 256 512; do
+			newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png"
+		done
+		make_desktop_entry "${PN}" "Odamex"
+
+		if use odalaunch ; then
+			for size in 96 128 256 512; do
+				newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png"
+			done
+			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
+		fi
+	fi
+
+	cmake_src_install
+}