diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-09-16 12:11:35 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-16 12:11:35 +0100 |
| commit | b66ecfb4dc09ba76e37787df2f7df1a78c3c1cc9 (patch) | |
| tree | 884bce771a1bba8b311dfffbde4acdad07bf2c54 /app-emulation/86Box | |
| parent | 08e318096831eb3aae369910ba75e27f59367e2f (diff) | |
gentoo auto-resync : 16:09:2024 - 12:11:35
Diffstat (limited to 'app-emulation/86Box')
| -rw-r--r-- | app-emulation/86Box/86Box-4.2.1.ebuild (renamed from app-emulation/86Box/86Box-4.2.ebuild) | 16 | ||||
| -rw-r--r-- | app-emulation/86Box/Manifest | 5 | ||||
| -rw-r--r-- | app-emulation/86Box/files/86Box-4.2-gcc14.patch | 28 |
3 files changed, 4 insertions, 45 deletions
diff --git a/app-emulation/86Box/86Box-4.2.ebuild b/app-emulation/86Box/86Box-4.2.1.ebuild index d71b01dcb937..1be46ab052ba 100644 --- a/app-emulation/86Box/86Box-4.2.ebuild +++ b/app-emulation/86Box/86Box-4.2.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}. LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64" -IUSE="experimental +fluidsynth +munt new-dynarec +openal qt5 +qt6 +threads" +IUSE="experimental +fluidsynth +munt new-dynarec +openal +qt6 +threads" DEPEND=" app-emulation/faudio @@ -24,7 +24,6 @@ DEPEND=" media-libs/rtmidi net-libs/libslirp sys-libs/zlib - qt5? ( x11-libs/libXi ) qt6? ( x11-libs/libXi ) " @@ -33,15 +32,6 @@ RDEPEND=" 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 @@ -51,8 +41,6 @@ RDEPEND=" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${PN}-4.2-gcc14.patch" ) - src_configure() { # LTO needs to be filtered # See https://bugs.gentoo.org/854507 @@ -71,7 +59,7 @@ src_configure() { -DOPENAL="$(usex openal)" -DPREFER_STATIC="OFF" -DRTMIDI="ON" - -DQT="$(usex qt5 'ON' $(usex qt6))" + -DQT="$(usex qt6)" -DRELEASE="ON" $(usex qt6 '-DUSE_QT6=ON' '') ) diff --git a/app-emulation/86Box/Manifest b/app-emulation/86Box/Manifest index 1bbd03309578..967c5d24fd61 100644 --- a/app-emulation/86Box/Manifest +++ b/app-emulation/86Box/Manifest @@ -1,4 +1,3 @@ -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 +DIST 86Box-4.2.1.tar.gz 5320110 BLAKE2B cf3379dffcd93f9c317c02b91ba5772a54abcc0e67ca588b22e07d5b221d40db4c0a54dcdd30cd1e2dd46a808393a9e09db917fe9445cbfb56ff9675d4eb35d9 SHA512 ed8e90f68318d163c39202479d654859d4d74b6fdffd47cfcba6b0393965265615aa008b02cfd04ac8cafc2f38cead53ed5d6071cabd4b96eba91ec805c5a2df +EBUILD 86Box-4.2.1.ebuild 1668 BLAKE2B e480357a58eb0f5996abaa3577475387f1f06cb6e05d85f530aadf005198de7d5b4de01b3d5b00edb8b8a4a61418ca29a5ee1229eb6de3b94d1a0e019395c021 SHA512 83bbb5075a3354fcfa228517459779a69087e41d102f7f361be715ea894f1d7fe50f39a3055f9493a2cd498920511d7a6279a3e876ef33f0913aaf3dcdeb2ff0 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 deleted file mode 100644 index 68794d21cf1b..000000000000 --- a/app-emulation/86Box/files/86Box-4.2-gcc14.patch +++ /dev/null @@ -1,28 +0,0 @@ -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"; |