gentoo auto-resync : 20:09:2024 - 12:12:03

7 files changed, 103 insertions, 4 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 6bb947c28932..349ac124cf3e 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/jazz2-data/Manifest b/games-arcade/jazz2-data/Manifest
index 75a69fee6f01..959e471bfae5 100644
--- a/games-arcade/jazz2-data/Manifest
+++ b/games-arcade/jazz2-data/Manifest
@@ -2,5 +2,5 @@ DIST jazz2-shareware-demo.zip 7658261 BLAKE2B b2b4412cd62feba07878a091a2a47d432a
 DIST jj2plus-v1.zip 153487 BLAKE2B 49867cd3d30ee26e8795a7983657f7092710d43b0b8f083853bd0284fc5e1917954951a796747f4700ab43f82633886eb7fa229950fcc003c798f24fd9c33209 SHA512 139b8f98a6c4b8bb7067893e4387af540e7c15d1e633c5f964d7a6ae64320ad1a432434403a74aa4b4af36e3d4eb5245e74ade395ea473c8fd2e3fc37cef06a5
 DIST setup_jazz_jackrabbit_2_1.24hf_(16886).exe 58050816 BLAKE2B 6a6492aedc3d7387e5ef5bfc641d54c46dbe850f65f9269268c962cf963164dcd98c2f2651e9dc3b7c2d0ea9ea00836e9cc1332a158b08c34f8fa9fbfb44859e SHA512 df6fc47abf24aaa1895df5f897f698b53865fdc499e2454e07b273eddc8fcdeeebe8fc2992292fb27e077da252d3d5728823ce6a2e83412c150fb8742a52116f
 DIST setup_jazz_jackrabbit_2_cc_1.2x_(16742).exe 57273872 BLAKE2B 85cd51fbe706bd6a040931d084102cf46c13d3508653ac429f721b93b8bcef131bea688a1d49cc6e789fa108fed5611e2bd476a2f50ceee4ac0c16531d49795a SHA512 fafce9bb318903970b8ba8e3c08cd261c748180158c162db4f67408d12b436a1a091b2423e2df0859e6c65df5ffe1e7e07d370089b6ebf70f8fc32ff5c260a86
-EBUILD jazz2-data-0-r20200327.ebuild 1776 BLAKE2B f9675dbb7487d4f0a7d5958dd3f6a9779c45eff546ad3ce325ebd9d6fda5fafee6dad49b7e09c68ddbeb400cf41118f965ffc20ea62b4cb3083e79b340e2684e SHA512 639a526f0eb5c064f2af574a9be3a90610f0e0b9bc75e05595c8d609290b3bfe5dd3b34eaf5a0e879a1b71d7b788642f1abc2fbb98bf1a318014162907a73f24
+EBUILD jazz2-data-0-r20200327.ebuild 1833 BLAKE2B 3c9ddcb372f67f6219dbcfc196eb37fd8e7a9c319a2056331b6b1d1eaf92f250b525b62d0ee97cffb2053ffc863f667b3f5a9c6c8f1a2db68bc527938c4ff363 SHA512 e9bc4994484521dc737e1bff89321b227bd4f8267d6a88409867bc887b3a3dea4dc0a3d7b44800bcbc75209f292f255ac63274974a789bc4b50f986b0c76488c
 MISC metadata.xml 512 BLAKE2B d56ac98f2d1c8bfc9b0d34083033d8bf273b320102b9e3d38771894bfd799476e26bf75e19c223eea5b99d66b9d353d955007d44f9a3a6315ae2c363576a6e53 SHA512 87ddcda53963aa6d37fb9d407488f9e93ac713d635420bf14248d7a390e646b5d417ce6a9b71eec2336c780f9c750ba572faf0b8b8b9778c3b02d8e80ae84f23
diff --git a/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild b/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild
index 10ac074109cf..ecb870298485 100644
--- a/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild
+++ b/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,8 @@ KEYWORDS="~amd64"
 IUSE="+cc demo gles2-only"
 RESTRICT="!demo? ( bindist fetch )"
 
-RDEPEND="games-arcade/jazz2:=[gles2-only=]"
+# jazz2-import is available only before version 1.0.0
+RDEPEND="<games-arcade/jazz2-1:=[gles2-only=]"
 
 BDEPEND="
 	${RDEPEND}
diff --git a/games-arcade/jazz2/Manifest b/games-arcade/jazz2/Manifest
index f07b80596bb0..bb530fd61e97 100644
--- a/games-arcade/jazz2/Manifest
+++ b/games-arcade/jazz2/Manifest
@@ -1,3 +1,6 @@
+AUX jazz2-2.8.0-about-section.patch 720 BLAKE2B 96bead2d6233b02232eb3db865928fcbd3f79bc701e4f387c0db0adca61ebf4772cdfe9ed63a6e3799798f560db925c3007aae61fed38d28e5bcc6a7a11b8200 SHA512 2eca42570c28883c8e3d83cd1ae5c6952985f0ceba72fc5c3995799b59a36d3ced973eacb102c88ef5bdd9245a763dfe17de35dd1432da4f5a2a6116efa31d26
 DIST jazz2-0.6.7.tar.gz 11031735 BLAKE2B 014ff24c6f5a834a727aaed3760a1e228d9f7d9653dd293e98030c9105cbf15a3b420c2d515605e36187cc833ae892ed30589f1bf821c0b674b883cea216f3f5 SHA512 7172a3ccb367122d1c9bfbd36b76cc3d365024affba9aea5cfa595fd11a9b4dc980e57c1cfdb0d32bc28bb7ecb5f6f5225909697c4c93c43117596f44d80ff8f
+DIST jazz2-2.8.0.tar.gz 3656018 BLAKE2B c023e722871304754e45a1329cfff9e0e713413a6a05b5265dd000bab8a057ac5dbdb1a263b29f562df0221b97eb326fbd15f3c6b6f316b756630c2521413bec SHA512 1a6b61cb654c5afee7d615cca912b75ef4f1e90929d7808800467bd13a1ebd9096430d1c1fa969cfacf8c10ff1e696c74371c1809a0ffbda90c5db31c686ae05
 EBUILD jazz2-0.6.7-r1.ebuild 1845 BLAKE2B 4e811e21b4a2dfd300d26a676bf040b7c1a632f6f31c403c154b9b55e748b01b9784e45aa1cbd3df2aeaadae2c2038e6e5af6cb5819e36e6141ea294e81bcc8e SHA512 77f9fb6c54b7de2c82149a9cdd1275b494f8243ad6595740ff73e9ae47d23b9cad15f9a18c1b3d7635aa0e1d277414c0bd6b35524c398d77cb79140b622947de
-MISC metadata.xml 414 BLAKE2B 574db31d78b10091e2ad3a1b3186489cd5a1cf72137c42f311d754a992fa7d01fbddcef799da94d9f1dcd552233f8016a8b11b10d047af99c01f7c12a1a5b650 SHA512 79e32f392910d96d3022279d36d9ffb4ac881d701b761ff35adeb18fa569091d7b07eccf6afa47c3c5a173790f360aef6c5d637d50ab3446f116a3dd2fba10bc
+EBUILD jazz2-2.8.0.ebuild 1411 BLAKE2B 598fa96ae1ba9af48ff52250fcc630bd974842a36d74c7451d9a083fd2ed589eb99a568226dd0c7091ed790c3f4f8d5e39aaf8f98e081a138684c3322813b969 SHA512 f8bb2ec9cdc30c5e0e7f1656148ed18e65722f8db4c6cf9112a81935775e5bce5806f65c5352da459f719f9ea7b458a3a058ae40b38a3894201995893da7d790
+MISC metadata.xml 534 BLAKE2B d4854038d3768cbe033bb6e22fcdf81f0f964d8c08a0e46dc33f033bac741609903a64fd551a8ce742d18a9427bc11790772571d78de15458435230645b9b9d7 SHA512 ba8a143912432f5c8d4f0e698e59463cbf9b5c601ec95ac499938efa21c489d8dd070ef879dc68526c7ec5f3fdacef03cf7dd14a1eb368c9fc9d464c4fd6dac2
diff --git a/games-arcade/jazz2/files/jazz2-2.8.0-about-section.patch b/games-arcade/jazz2/files/jazz2-2.8.0-about-section.patch
new file mode 100644
index 000000000000..349ec40fd180
--- /dev/null
+++ b/games-arcade/jazz2/files/jazz2-2.8.0-about-section.patch
@@ -0,0 +1,20 @@
+From 04d43f938c8b656bf5fb0dbed464566af4c0062c Mon Sep 17 00:00:00 2001
+From: Death Killer <884052+deathkiller@users.noreply.github.com>
+Date: Sun, 4 Aug 2024 16:49:59 +0200
+Subject: [PATCH] Fixed about screen
+
+https://github.com/deathkiller/jazz2-native/commit/04d43f938c8b656bf5fb0dbed464566af4c0062c
+
+diff --git a/Sources/Jazz2/UI/Menu/AboutSection.cpp b/Sources/Jazz2/UI/Menu/AboutSection.cpp
+index 9c3afd59..ea7723e9 100644
+--- a/Sources/Jazz2/UI/Menu/AboutSection.cpp
++++ b/Sources/Jazz2/UI/Menu/AboutSection.cpp
+@@ -62,7 +62,7 @@
+ #		define _i7 "\nOpenAL \f[c:#707070]· \f[h:80]https://github.com/kcat/openal-soft\f[/h]\f[/c]"
+ #	endif
+ #else
+-#	define _i6 ""
++#	define _i7 ""
+ #endif
+ 
+ #if defined(WITH_VORBIS)
diff --git a/games-arcade/jazz2/jazz2-2.8.0.ebuild b/games-arcade/jazz2/jazz2-2.8.0.ebuild
new file mode 100644
index 000000000000..bcc62ab10108
--- /dev/null
+++ b/games-arcade/jazz2/jazz2-2.8.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Open source reimplementation of Jazz Jackrabbit 2"
+HOMEPAGE="
+	https://deat.tk/jazz2/
+	https://github.com/deathkiller/jazz2-native
+"
+SRC_URI="
+	https://github.com/deathkiller/jazz2-native/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-native-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+openal sdl"
+
+DEPEND="
+	sys-libs/zlib:=
+	openal? (
+		media-libs/libopenmpt
+		media-libs/openal
+	)
+	!sdl? ( media-libs/glfw:= )
+	sdl? ( media-libs/libsdl2:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-about-section.patch"
+)
+
+src_prepare() {
+	# We need to install README.md to a different directory, default
+	# src_install will handle that.
+	sed -i '/README_INSTALL_DESTINATION/d' cmake/ncine_installation.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local backend=GLFW
+	use sdl && backend=SDL2
+	local mycmakeargs=(
+		-DNCINE_LINUX_PACKAGE="${PN}"
+
+		-DNCINE_DOWNLOAD_DEPENDENCIES=OFF
+		-DNCINE_LINKTIME_OPTIMIZATION=OFF
+		-DNCINE_STRIP_BINARIES=OFF
+		-DNCINE_VERSION_FROM_GIT=OFF
+		-DNCINE_WITH_BACKWARD=OFF
+
+		-DNCINE_WITH_GLEW=OFF
+
+		-DNCINE_PREFERRED_BACKEND=${backend}
+
+		-DNCINE_WITH_AUDIO=$(usex openal)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-arcade/jazz2/metadata.xml b/games-arcade/jazz2/metadata.xml
index dff951fa6b7f..39f3565c770c 100644
--- a/games-arcade/jazz2/metadata.xml
+++ b/games-arcade/jazz2/metadata.xml
@@ -7,8 +7,10 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">deathkiller/jazz2</remote-id>
+		<remote-id type="github">deathkiller/jazz2-native</remote-id>
 	</upstream>
 	<use>
 		<flag name="server">Build the multiplayer game server</flag>
+		<flag name="sdl">Prefer SDL2 over GLFW backend</flag>
 	</use>
 </pkgmetadata>