gentoo auto-resync : 09:04:2023 - 05:33:50

4 files changed, 110 insertions, 1 deletions

diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 71b6c3ea3497..af9304c1d522 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,5 +1,8 @@
 AUX slade-3.2.0-bundled-libs.patch 5507 BLAKE2B 963e1b8b128acbe34ddaee537b32e047ab72f5555860ebabedf35891cae5a0c992d5bcb7cf69defb176b4b2980ec9a027e8684b3125129d1adf628af0afd1e13 SHA512 70cbd8953bea56b82b8741f0bd283c1770498386f637405ccfd73d3eb80113a6a5c312e36a769c4d0158dc7e87835a526593ac93a21af3e4c7f2f80816013958
 AUX slade-3.2.0_beta2-fluidsynth-driver.patch 790 BLAKE2B ea84ff6515b4b80cbce021624c27dbd4c067758b7e5861402d42628ddee85385a260396163838b1504e2196c3b275977ad5ddde3d684e49de600270d7990a1c0 SHA512 3de05beafc060891d674d388cbb07107ead138ef2a89812dfffabfc8c9de2beb939290b1064b75e14d3cc42621c8ee66ced06eacdcb2afd376a9539fa74c54c8
+AUX slade-3.2.2-wayland.patch 697 BLAKE2B 71c0a42cc831763a6d5aca15601e4503bcc965f2241227742ccc09b7d97fef54242ba65081743d2cc58f43091cb4397915942218c00b8c7cd677f0740643ce0a SHA512 f1c4a73e6edeb3d23e02d4dc81d585fee2be446ded3a05e42e653edd8e83a5c5d6b05e2902fa65caa5c7076fd338f6785ab301c8cc8208a9cab27e70bc04ff59
 DIST slade-3.2.1.tar.gz 6471666 BLAKE2B 17a4f2ec23699a56d4fd970605d7141d3f4593f7ced6fff205c87d9ecddc7b90e6da2991aeea32bd008e24cdfee95b7c16946f78b2701c94e51266afd78863d6 SHA512 b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
-EBUILD slade-3.2.1-r1.ebuild 1692 BLAKE2B fe4206570d58759ff61cd899c3fc896f55e41452bb3430d28e02b7a895329c3e55e92a6d2663392e9327e71048115ee69bfa395f06df2f80c17242b9648a9463 SHA512 3ddbb9e5640f2e6d5700c9594d9baf5e2038eed6f0102b312906220cd9381ea1c3cd8a869c2932063e9d664a4b77913fbd4e531febe52499861a841e578eb806
+DIST slade-3.2.2.tar.gz 6479812 BLAKE2B 2394f8f1e858a2f96e625cbf68a983d235e96a055c2fba7b99e79475e84bc43a9fce49bac1fadd6d5a5cfcf68f59f92ee61272def54962ec251a9441ca03c357 SHA512 4fd73f36df4800873154329222a382f9051f0d61aba1d7061e48b0350b5ab68066e5c484dd3200a118f254be5cb7b86dad7fa3a757556243bd5c8af5ea89d638
+EBUILD slade-3.2.1-r1.ebuild 1733 BLAKE2B 3cd6ee41b46db8238ec6f6028e1ac6f500213f4aa193b852dcf0b10750729e7cc357a2f17f6b698cbfc37d318b22b89f72ff0db1588288e674deede92b5ddda6 SHA512 fd41fae40722f757f9cfd0f1727a9d4f5936125bab5b517f110eb096af6b0635cab6445ee0979b6cf139eb3cf049958673ff9b2f5aeab22019a17980bbd1bf12
+EBUILD slade-3.2.2.ebuild 1687 BLAKE2B a96e2bd126eab15f7eba3ddf05333a79861f7859a03675e2aa68255a8c8de9eefdc34a6b8abd19633a8de45a575d4542fd0c26408048800b76b7f829f9f1efee SHA512 053d8494e6c8be0705d670a516d6b9f4d11c655843e70eafacf0584888966171ed36fde932639361aaca5e3d2311dbd33a2865429655d64ee4580be4750a2b83
 MISC metadata.xml 457 BLAKE2B 241e53a5b4e6b85472c19b5431bae365eb740632cc71c9c2df1fb1f6c7f4875e8cb6d7ce17cddef12377a306c7abd8787a9f8e4cdd21b2b892d639ef68e8c077 SHA512 ae81e2d7faa90358dfd5f6511650de78fae50b7356609e7c54b635515e2fd9fb1348e9f34931e1cd82a3ad37206e47a64a02969c7762f38e62c32ffb5512b769
diff --git a/games-util/slade/files/slade-3.2.2-wayland.patch b/games-util/slade/files/slade-3.2.2-wayland.patch
new file mode 100644
index 000000000000..4207ceb2076d
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.2-wayland.patch
@@ -0,0 +1,25 @@
+SFML's render window only supports X11 under Linux, so SLADE crashes if GDK
+chooses the Wayland backend. This patch tells GDK to prefer the X11 backend.
+SLADE 3.3.0 will apparently not use the render window.
+
+diff --git a/src/Application/SLADEWxApp.cpp b/src/Application/SLADEWxApp.cpp
+index 3dadf241..de01e340 100644
+--- a/src/Application/SLADEWxApp.cpp
++++ b/src/Application/SLADEWxApp.cpp
+@@ -52,6 +52,16 @@
+ using namespace slade;
+
+
++#ifdef __WXGTK__
++#include <gdk/gdk.h>
++
++struct PreferX11 {
++	PreferX11() { gdk_set_allowed_backends("x11,*"); }
++};
++static PreferX11 preferx11;
++#endif
++
++
+ // -----------------------------------------------------------------------------
+ //
+ // Variables
diff --git a/games-util/slade/slade-3.2.1-r1.ebuild b/games-util/slade/slade-3.2.1-r1.ebuild
index 285ef98db6f9..75ed0c04389d 100644
--- a/games-util/slade/slade-3.2.1-r1.ebuild
+++ b/games-util/slade/slade-3.2.1-r1.ebuild
@@ -48,6 +48,7 @@ S="${WORKDIR}/${PN^^}-${MY_PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.0-bundled-libs.patch
 	"${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
+	"${FILESDIR}"/${PN}-3.2.2-wayland.patch
 )
 
 src_prepare() {
diff --git a/games-util/slade/slade-3.2.2.ebuild b/games-util/slade/slade-3.2.2.ebuild
new file mode 100644
index 000000000000..48395e6d88fa
--- /dev/null
+++ b/games-util/slade/slade-3.2.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake lua-single wxwidgets
+
+MY_PV="${PV/beta/b}"
+DESCRIPTION="Modern editor for Doom-engine based games and source ports"
+HOMEPAGE="https://slade.mancubus.net/"
+SRC_URI="https://github.com/sirjuddington/${PN^^}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fluidsynth timidity webkit"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="
+	${LUA_DEPS}
+	app-arch/bzip2:=
+	dev-libs/libfmt:=
+	>=media-libs/dumb-2:=
+	media-libs/freeimage[jpeg,png,tiff]
+	media-libs/glew:0=
+	media-libs/libsfml:=
+	media-sound/mpg123
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X]
+	fluidsynth? ( media-sound/fluidsynth:= )
+"
+
+RDEPEND="
+	${DEPEND}
+	timidity? ( media-sound/timidity++ )
+"
+
+BDEPEND="
+	app-arch/p7zip
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN^^}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
+	"${FILESDIR}"/${PN}-3.2.2-wayland.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Delete bundled libraries just in case.
+	rm -r thirdparty/dumb/ thirdparty/fmt/ || die
+
+}
+
+src_configure() {
+	local luav=$(lua_get_version)
+
+	local mycmakeargs=(
+		-DLua_FIND_VERSION_MAJOR=$(ver_cut 1 "${luav}")
+		-DLua_FIND_VERSION_MINOR=$(ver_cut 2 "${luav}")
+		-DLua_FIND_VERSION_COUNT=2
+		-DLua_FIND_VERSION_EXACT=ON
+		-DNO_COTIRE=ON
+		-DNO_FLUIDSYNTH=$(usex fluidsynth OFF ON)
+		-DNO_WEBVIEW=$(usex webkit OFF ON)
+		-DUSE_SFML_RENDERWINDOW=ON
+		-DUSE_SYSTEM_DUMB=ON
+		-DUSE_SYSTEM_FMT=ON
+		-DWX_GTK3=ON
+	)
+
+	setup-wxwidgets
+	cmake_src_configure
+}