* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/
@ 2024-11-23 22:23 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2024-11-23 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 17549ed93e7e00b4307ebce5db2d4d1fcb522cdf
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 22:22:31 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 22:23:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17549ed9
games-util/slade: Move S variable
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-util/slade/slade-3.2.4-r1.ebuild | 3 +--
games-util/slade/slade-3.2.6.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/games-util/slade/slade-3.2.4-r1.ebuild b/games-util/slade/slade-3.2.4-r1.ebuild
index 5e70fd0ab9a4..7ba249ac765a 100644
--- a/games-util/slade/slade-3.2.4-r1.ebuild
+++ b/games-util/slade/slade-3.2.4-r1.ebuild
@@ -12,6 +12,7 @@ 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"
+S="${WORKDIR}/${PN^^}-${MY_PV}"
LICENSE="GPL-2 MIT"
SLOT="0"
KEYWORDS="~amd64"
@@ -44,8 +45,6 @@ BDEPEND="
virtual/pkgconfig
"
-S="${WORKDIR}/${PN^^}-${MY_PV}"
-
PATCHES=(
"${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
"${FILESDIR}"/${PN}-3.2.2-wayland.patch
diff --git a/games-util/slade/slade-3.2.6.ebuild b/games-util/slade/slade-3.2.6.ebuild
index 22f6c0975984..607006a54dce 100644
--- a/games-util/slade/slade-3.2.6.ebuild
+++ b/games-util/slade/slade-3.2.6.ebuild
@@ -12,6 +12,7 @@ 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"
+S="${WORKDIR}/${PN^^}-${MY_PV}"
LICENSE="GPL-2 MIT"
SLOT="0"
KEYWORDS="~amd64"
@@ -44,8 +45,6 @@ BDEPEND="
virtual/pkgconfig
"
-S="${WORKDIR}/${PN^^}-${MY_PV}"
-
PATCHES=(
"${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
"${FILESDIR}"/${PN}-3.2.2-wayland.patch
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/
@ 2024-11-20 13:51 Petr Vaněk
0 siblings, 0 replies; 5+ messages in thread
From: Petr Vaněk @ 2024-11-20 13:51 UTC (permalink / raw
To: gentoo-commits
commit: d22ea46df77aeb6a3d198de4797055ea7c5288b8
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 13:41:02 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 13:49:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22ea46d
games-util/slade: restrict <libfmt-11 in 3.2.4
SLADE-3.2.4 fails to build with libfmt-11, see [1].
[1] https://github.com/sirjuddington/SLADE/issues/1746
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
games-util/slade/{slade-3.2.4.ebuild => slade-3.2.4-r1.ebuild} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/games-util/slade/slade-3.2.4.ebuild b/games-util/slade/slade-3.2.4-r1.ebuild
similarity index 92%
rename from games-util/slade/slade-3.2.4.ebuild
rename to games-util/slade/slade-3.2.4-r1.ebuild
index 48395e6d88fa..06d0d3eeef76 100644
--- a/games-util/slade/slade-3.2.4.ebuild
+++ b/games-util/slade/slade-3.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,10 +18,11 @@ KEYWORDS="~amd64"
IUSE="fluidsynth timidity webkit"
REQUIRED_USE="${LUA_REQUIRED_USE}"
+# <libfmt-11 https://github.com/sirjuddington/SLADE/issues/1746
DEPEND="
${LUA_DEPS}
app-arch/bzip2:=
- dev-libs/libfmt:=
+ <dev-libs/libfmt-11:=
>=media-libs/dumb-2:=
media-libs/freeimage[jpeg,png,tiff]
media-libs/glew:0=
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/
@ 2023-07-12 20:50 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2023-07-12 20:50 UTC (permalink / raw
To: gentoo-commits
commit: b59a4c160da533bc6333024032c21541be03d3db
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 20:48:16 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 20:49:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b59a4c16
games-util/slade: Bump to 3.2.4, fixes build with GCC 13
Closes: https://bugs.gentoo.org/899040
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-util/slade/Manifest | 1 +
games-util/slade/slade-3.2.4.ebuild | 80 +++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 71d47f925a43..e05f21844609 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,2 +1,3 @@
DIST slade-3.2.1.tar.gz 6471666 BLAKE2B 17a4f2ec23699a56d4fd970605d7141d3f4593f7ced6fff205c87d9ecddc7b90e6da2991aeea32bd008e24cdfee95b7c16946f78b2701c94e51266afd78863d6 SHA512 b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
DIST slade-3.2.2.tar.gz 6479812 BLAKE2B 2394f8f1e858a2f96e625cbf68a983d235e96a055c2fba7b99e79475e84bc43a9fce49bac1fadd6d5a5cfcf68f59f92ee61272def54962ec251a9441ca03c357 SHA512 4fd73f36df4800873154329222a382f9051f0d61aba1d7061e48b0350b5ab68066e5c484dd3200a118f254be5cb7b86dad7fa3a757556243bd5c8af5ea89d638
+DIST slade-3.2.4.tar.gz 7000370 BLAKE2B 251c79b1f90dea7971120a7b55d89d5112857f04a5609a26ce3970116d616c7361b1bea98da05a5e3fde0d433e62a34e9610a1d32ca9e72ee4f140ae7ac22ec6 SHA512 e3dda37aebc9c4bab3fb0d1179cbe726be2cdf55d9d7d95cfa47c8f817a1cf2b01863cce09da17da85af1e4077f1f9b7841abdaa8f114e3a6db1fe2b48292ffd
diff --git a/games-util/slade/slade-3.2.4.ebuild b/games-util/slade/slade-3.2.4.ebuild
new file mode 100644
index 000000000000..48395e6d88fa
--- /dev/null
+++ b/games-util/slade/slade-3.2.4.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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/
@ 2020-07-02 22:50 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2020-07-02 22:50 UTC (permalink / raw
To: gentoo-commits
commit: 02cb1f049e6b4d6f8aa720945a3bb98353769663
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 2 22:49:18 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 2 22:50:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cb1f04
games-util/slade: Add missing gstreamer flag on wxGTK dep
It's not obvious but this flag enables wxMediaCtrl, which is
referenced in the SLADE code.
Closes: https://bugs.gentoo.org/730174
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-util/slade/slade-3.1.12a.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-util/slade/slade-3.1.12a.ebuild b/games-util/slade/slade-3.1.12a.ebuild
index 641a17fb010..3ddd53ebe75 100644
--- a/games-util/slade/slade-3.1.12a.ebuild
+++ b/games-util/slade/slade-3.1.12a.ebuild
@@ -23,7 +23,7 @@ DEPEND="
media-libs/libsfml:=
net-misc/curl
sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X]
+ x11-libs/wxGTK:${WX_GTK_VER}[gstreamer,opengl,webkit?,X]
fluidsynth? ( media-sound/fluidsynth:= )
"
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/
@ 2020-06-01 20:49 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2020-06-01 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 86a295beeb833b54036e213b2f50c982e33a20d0
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 1 20:49:20 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 1 20:49:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a295be
games-util/slade: Fix missing USE flags on wxGTK dependency
Closes: https://bugs.gentoo.org/726694
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-util/slade/slade-3.1.12a.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-util/slade/slade-3.1.12a.ebuild b/games-util/slade/slade-3.1.12a.ebuild
index b204c6c7870..641a17fb010 100644
--- a/games-util/slade/slade-3.1.12a.ebuild
+++ b/games-util/slade/slade-3.1.12a.ebuild
@@ -23,7 +23,7 @@ DEPEND="
media-libs/libsfml:=
net-misc/curl
sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[webkit?]
+ x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X]
fluidsynth? ( media-sound/fluidsynth:= )
"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-11-23 22:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-23 22:23 [gentoo-commits] repo/gentoo:master commit in: games-util/slade/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-11-20 13:51 Petr Vaněk
2023-07-12 20:50 James Le Cuirot
2020-07-02 22:50 James Le Cuirot
2020-06-01 20:49 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox