From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- app-emulation/86Box/86Box-4.1.1-r1.ebuild | 83 ------------------------ app-emulation/86Box/86Box-4.2.ebuild | 85 +++++++++++++++++++++++++ app-emulation/86Box/Manifest | 5 +- app-emulation/86Box/files/86Box-4.2-gcc14.patch | 28 ++++++++ 4 files changed, 116 insertions(+), 85 deletions(-) delete mode 100644 app-emulation/86Box/86Box-4.1.1-r1.ebuild create mode 100644 app-emulation/86Box/86Box-4.2.ebuild create mode 100644 app-emulation/86Box/files/86Box-4.2-gcc14.patch (limited to 'app-emulation/86Box') diff --git a/app-emulation/86Box/86Box-4.1.1-r1.ebuild b/app-emulation/86Box/86Box-4.1.1-r1.ebuild deleted file mode 100644 index 1acbe1d341bd..000000000000 --- a/app-emulation/86Box/86Box-4.1.1-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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" - -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/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 905eb0c36c60..1bbd03309578 100644 --- a/app-emulation/86Box/Manifest +++ b/app-emulation/86Box/Manifest @@ -1,3 +1,4 @@ -DIST 86Box-4.1.1.tar.gz 5383817 BLAKE2B 04a03f039e3112e9dc02d25073afdf53d45603a71e27f8377309667917f30ef9f213cf0a7a6d8c2f4c2f1dd0fd73adfac3bbd8f0f9fc4b47fb2e9cbedffb4b6c SHA512 d1b0a1810f8712464ce8266942e9bfdc9721ab4ac70bbb242b3b06d6a7d6613b7bcb0ba730a2e458b2731c8d58e38c4b245b6f4afb5ee6c11ab4a2fb0dfd6d5e -EBUILD 86Box-4.1.1-r1.ebuild 1882 BLAKE2B d3d60f85b13dc6812928e03bff9386f8e41a2a90d9e82c288ce46b746962bc700d92691003ba0219d008e988ecf00c5c71075222a520f18b5df067b48875749d SHA512 1d35af112d06c067c13c26af737c779b0fbd4429fabbf8fbfeecbe9a109193535ceb45b283b2ecade30acfa601520b4597d8e504842df1b38f177fe4e01ddff8 +AUX 86Box-4.2-gcc14.patch 869 BLAKE2B f7c84e789509031b8d5221426348356d55042c115006a5d8039fc389cb2e9139c68831ca2d6f4a24c3100120ce72d3ab7479e8da193277d2427eb2fe7a585d17 SHA512 b7be8262e5ba1f7e357496e3b717593131da6b33c16988eb714eacf637bbbaa6479b286ba2658d0e9dc00e3fbd6de9c07cfc1c1789f8652d5cf9e3d520814102 +DIST 86Box-4.2.tar.gz 5297797 BLAKE2B a1933aaaa501f54539b05436a2c0f91454a253a0f1a98bbea165f0a11188c3f5a55af58dbbc53387fec1be853c5bcacb510d74f5a98a47d7821ab0f257f93f82 SHA512 af817d2fdf385e761bf98728633f6c5cf4feca5e39d7323d7825f2f6a11c42882009005d2c50fded19fb2615eff8679b010ab85fd38b7cabc08408e2c447baed +EBUILD 86Box-4.2.ebuild 1934 BLAKE2B e99138165e6354f2f152b2d8a2375191a03c5a7681cf3e94b67161a216a19249d1551b268ae9b3a1ee559e998d0f55d316707fbd8db8a4a7abe8855ec6d2e15c SHA512 c6d890b604e1de72c36ae4b7200db117e00551b709e9e27bde5c2776753cfcf8879f23121803f96d8dda129cb21e283d069074b83bf6c4cc4a4675001985a9b3 MISC metadata.xml 1066 BLAKE2B d5cf35e3d6feca5dbc2aeefe48331941f641195b9d0712df4c3589dedf041397e733b331d832d35099bb26701dd8598b317a8de1a62d955688429d0ffe4a527a SHA512 63909161608115764a28aea61bb1e5e15a34a05a8adaf5a5529d82a5d3f0ea3726340f34178d7c64bfa704b7ff84af4830f636e9536552ccab2050328fc5ee84 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 +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"; -- cgit v1.2.3