[gentoo-commits] repo/gentoo:master commit in: app-emulation/86Box/, app-emulation/86Box/files/

["Sam James" <sam@gentoo.org>]

commit:     1fee19f28119bce9c5c378e239ed5d3b4d752b2f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  5 09:05:18 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  5 09:06:54 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fee19f2

Revert "app-emulation/86Box: drop 4.2"

This reverts commit df8fea79797d2acee18ea747481046dadd718a86.

4.2.1 has a bug and upcoming 4.2.2 should fix that.

Bug: https://bugs.gentoo.org/953992
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/86Box/86Box-4.2.ebuild            | 85 +++++++++++++++++++++++++
 app-emulation/86Box/Manifest                    |  1 +
 app-emulation/86Box/files/86Box-4.2-gcc14.patch | 28 ++++++++
 3 files changed, 114 insertions(+)

diff --git a/app-emulation/86Box/86Box-4.2.ebuild b/app-emulation/86Box/86Box-4.2.ebuild
new file mode 100644
index 000000000000..d71b01dcb937
--- /dev/null
+++ b/app-emulation/86Box/86Box-4.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Emulator of x86-based machines based on PCem"
+HOMEPAGE="https://github.com/86Box/86Box"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="experimental +fluidsynth +munt new-dynarec +openal qt5 +qt6 +threads"
+
+DEPEND="
+	app-emulation/faudio
+	dev-libs/libevdev
+	media-libs/freetype:2=
+	media-libs/libpng:=
+	media-libs/libsdl2
+	media-libs/openal
+	media-libs/rtmidi
+	net-libs/libslirp
+	sys-libs/zlib
+	qt5? ( x11-libs/libXi )
+	qt6? ( x11-libs/libXi )
+"
+
+RDEPEND="
+	${DEPEND}
+	fluidsynth? ( media-sound/fluidsynth )
+	munt? ( media-libs/munt-mt32emu )
+	openal? ( media-libs/openal )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qttranslations:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/extra-cmake-modules
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,network,opengl,widgets]
+		dev-qt/qttranslations:6
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-gcc14.patch" )
+
+src_configure() {
+	# LTO needs to be filtered
+	# See https://bugs.gentoo.org/854507
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DCPPTHREADS="$(usex threads)"
+		-DDEV_BRANCH="$(usex experimental)"
+		-DDYNAREC="ON"
+		-DMUNT_EXTERNAL="$(usex munt)"
+		-DFLUIDSYNTH="$(usex fluidsynth)"
+		-DMINITRACE="OFF"
+		-DMUNT="$(usex munt)"
+		-DNEW_DYNAREC="$(usex new-dynarec)"
+		-DOPENAL="$(usex openal)"
+		-DPREFER_STATIC="OFF"
+		-DRTMIDI="ON"
+		-DQT="$(usex qt5 'ON' $(usex qt6))"
+		-DRELEASE="ON"
+		$(usex qt6 '-DUSE_QT6=ON' '')
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "In order to use 86Box, you will need some roms for various emulated systems."
+	elog "See https://github.com/86Box/roms for more information."
+}

diff --git a/app-emulation/86Box/Manifest b/app-emulation/86Box/Manifest
index ae6146a24334..ba6834853309 100644
--- a/app-emulation/86Box/Manifest
+++ b/app-emulation/86Box/Manifest
@@ -1 +1,2 @@
 DIST 86Box-4.2.1.tar.gz 5320110 BLAKE2B cf3379dffcd93f9c317c02b91ba5772a54abcc0e67ca588b22e07d5b221d40db4c0a54dcdd30cd1e2dd46a808393a9e09db917fe9445cbfb56ff9675d4eb35d9 SHA512 ed8e90f68318d163c39202479d654859d4d74b6fdffd47cfcba6b0393965265615aa008b02cfd04ac8cafc2f38cead53ed5d6071cabd4b96eba91ec805c5a2df
+DIST 86Box-4.2.tar.gz 5297797 BLAKE2B a1933aaaa501f54539b05436a2c0f91454a253a0f1a98bbea165f0a11188c3f5a55af58dbbc53387fec1be853c5bcacb510d74f5a98a47d7821ab0f257f93f82 SHA512 af817d2fdf385e761bf98728633f6c5cf4feca5e39d7323d7825f2f6a11c42882009005d2c50fded19fb2615eff8679b010ab85fd38b7cabc08408e2c447baed

diff --git a/app-emulation/86Box/files/86Box-4.2-gcc14.patch b/app-emulation/86Box/files/86Box-4.2-gcc14.patch
new file mode 100644
index 000000000000..68794d21cf1b
--- /dev/null
+++ b/app-emulation/86Box/files/86Box-4.2-gcc14.patch
@@ -0,0 +1,28 @@
+From aca6355eb291171d652f09a530040d18f29dbd2e Mon Sep 17 00:00:00 2001
+From: OBattler <oubattler@gmail.com>
+Date: Sat, 27 Jul 2024 16:58:36 +0200
+Subject: [PATCH] Rewrote a line in unix.c, fixes #4658.
+
+---
+ src/unix/unix.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/unix/unix.c b/src/unix/unix.c
+index 1fe477a231..d4d73817f9 100644
+--- a/src/unix/unix.c
++++ b/src/unix/unix.c
+@@ -640,8 +640,12 @@ ui_msgbox_header(int flags, void *header, void *message)
+     SDL_MessageBoxData       msgdata;
+     SDL_MessageBoxButtonData msgbtn;
+ 
+-    if (!header)
+-        header = (void *) ((flags & MBX_ANSI) ? "86Box" : L"86Box");
++    if (!header) {
++        if (flags & MBX_ANSI)
++            header = (void *) "86Box";
++        else
++            header = (void *) L"86Box";
++    }
+ 
+     msgbtn.buttonid = 1;
+     msgbtn.text     = "OK";