commit: dbccaf407624d90b06b1d07b11cf04cc9f2a08b8 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Thu Nov 13 22:03:23 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Thu Nov 13 22:03:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbccaf40
app-emulation/86Box: drop 4.2.1-r2, 5.0, 5.1 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> app-emulation/86Box/86Box-4.2.1-r2.ebuild | 79 --------------------- app-emulation/86Box/86Box-5.0.ebuild | 82 ---------------------- app-emulation/86Box/86Box-5.1.ebuild | 82 ---------------------- app-emulation/86Box/Manifest | 3 - .../86Box/files/86Box-4.2.1-crashfix-1.patch | 22 ------ .../86Box/files/86Box-4.2.1-crashfix-2.patch | 36 ---------- .../86Box/files/86Box-4.2.1-crashfix-3.patch | 40 ----------- 7 files changed, 344 deletions(-) diff --git a/app-emulation/86Box/86Box-4.2.1-r2.ebuild b/app-emulation/86Box/86Box-4.2.1-r2.ebuild deleted file mode 100644 index 4aa6acb51a88..000000000000 --- a/app-emulation/86Box/86Box-4.2.1-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2025 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 +qt6 +threads vde" - -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 - virtual/zlib:= - fluidsynth? ( media-sound/fluidsynth:= ) - munt? ( media-libs/munt-mt32emu ) - openal? ( media-libs/openal ) - qt6? ( - dev-libs/wayland - dev-qt/qtbase:6=[gui,network,opengl,widgets] - x11-libs/libX11 - x11-libs/libXi - x11-libs/libxkbcommon - ) -" -RDEPEND="${DEPEND} - qt6? ( dev-qt/qttranslations:6 ) - vde? ( net-misc/vde ) -" -BDEPEND=" - virtual/pkgconfig - qt6? ( kde-frameworks/extra-cmake-modules ) -" - -PATCHES=( "${FILESDIR}"/${P}-crashfix-{1,2,3}.patch ) # bug #953992, git master - -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 qt6)" - -DRELEASE="ON" - $(usex qt6 '-DUSE_QT6=ON' '') - -DHAS_VDE="$(usex vde "${EPREFIX}/usr/$(get_libdir)/libvdeplug.so" "HAS_VDE-NOTFOUND")" - ) - - 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-5.0.ebuild b/app-emulation/86Box/86Box-5.0.ebuild deleted file mode 100644 index 6f91430f30ef..000000000000 --- a/app-emulation/86Box/86Box-5.0.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2025 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="discord experimental +fluidsynth +munt new-dynarec +openal +qt6 +threads vde vnc" - -DEPEND=" - app-emulation/faudio - dev-libs/libevdev - dev-libs/libserialport - media-libs/freetype:2= - media-libs/libpng:= - media-libs/libsdl2 - media-libs/libsndfile - media-libs/openal - media-libs/rtmidi - net-libs/libslirp - virtual/zlib:= - fluidsynth? ( media-sound/fluidsynth:= ) - munt? ( media-libs/munt-mt32emu ) - openal? ( media-libs/openal ) - qt6? ( - dev-libs/wayland - dev-qt/qtbase:6=[gui,network,opengl,widgets] - x11-libs/libX11 - x11-libs/libXi - x11-libs/libxkbcommon - ) - vnc? ( net-libs/libvncserver ) -" -RDEPEND="${DEPEND} - qt6? ( dev-qt/qttranslations:6 ) - vde? ( net-misc/vde ) -" -BDEPEND=" - virtual/pkgconfig - qt6? ( kde-frameworks/extra-cmake-modules ) -" - -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)" - -DDISCORD="$(usex discord)" - -DDYNAREC="ON" - -DFLUIDSYNTH="$(usex fluidsynth)" - -DHAS_VDE="$(usex vde "${EPREFIX}/usr/$(get_libdir)/libvdeplug.so" "HAS_VDE-NOTFOUND")" - -DMINITRACE="OFF" - -DMUNT="$(usex munt)" - -DMUNT_EXTERNAL="$(usex munt)" - -DNEW_DYNAREC="$(usex new-dynarec)" - -DOPENAL="$(usex openal)" - -DPREFER_STATIC="OFF" - -DQT="$(usex qt6)" - -DRELEASE="ON" - -DRTMIDI="ON" - $(usex qt6 '-DUSE_QT6=ON' '') - -DVNC="$(usex vnc)" - ) - - 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-5.1.ebuild b/app-emulation/86Box/86Box-5.1.ebuild deleted file mode 100644 index 6f91430f30ef..000000000000 --- a/app-emulation/86Box/86Box-5.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2025 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="discord experimental +fluidsynth +munt new-dynarec +openal +qt6 +threads vde vnc" - -DEPEND=" - app-emulation/faudio - dev-libs/libevdev - dev-libs/libserialport - media-libs/freetype:2= - media-libs/libpng:= - media-libs/libsdl2 - media-libs/libsndfile - media-libs/openal - media-libs/rtmidi - net-libs/libslirp - virtual/zlib:= - fluidsynth? ( media-sound/fluidsynth:= ) - munt? ( media-libs/munt-mt32emu ) - openal? ( media-libs/openal ) - qt6? ( - dev-libs/wayland - dev-qt/qtbase:6=[gui,network,opengl,widgets] - x11-libs/libX11 - x11-libs/libXi - x11-libs/libxkbcommon - ) - vnc? ( net-libs/libvncserver ) -" -RDEPEND="${DEPEND} - qt6? ( dev-qt/qttranslations:6 ) - vde? ( net-misc/vde ) -" -BDEPEND=" - virtual/pkgconfig - qt6? ( kde-frameworks/extra-cmake-modules ) -" - -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)" - -DDISCORD="$(usex discord)" - -DDYNAREC="ON" - -DFLUIDSYNTH="$(usex fluidsynth)" - -DHAS_VDE="$(usex vde "${EPREFIX}/usr/$(get_libdir)/libvdeplug.so" "HAS_VDE-NOTFOUND")" - -DMINITRACE="OFF" - -DMUNT="$(usex munt)" - -DMUNT_EXTERNAL="$(usex munt)" - -DNEW_DYNAREC="$(usex new-dynarec)" - -DOPENAL="$(usex openal)" - -DPREFER_STATIC="OFF" - -DQT="$(usex qt6)" - -DRELEASE="ON" - -DRTMIDI="ON" - $(usex qt6 '-DUSE_QT6=ON' '') - -DVNC="$(usex vnc)" - ) - - 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 281cf273dc97..04280da8b5df 100644 --- a/app-emulation/86Box/Manifest +++ b/app-emulation/86Box/Manifest @@ -1,4 +1 @@ -DIST 86Box-4.2.1.tar.gz 5320110 BLAKE2B cf3379dffcd93f9c317c02b91ba5772a54abcc0e67ca588b22e07d5b221d40db4c0a54dcdd30cd1e2dd46a808393a9e09db917fe9445cbfb56ff9675d4eb35d9 SHA512 ed8e90f68318d163c39202479d654859d4d74b6fdffd47cfcba6b0393965265615aa008b02cfd04ac8cafc2f38cead53ed5d6071cabd4b96eba91ec805c5a2df -DIST 86Box-5.0.tar.gz 13880473 BLAKE2B 53d6c67eb0750cf3b52f845373317bf42d0c9143f953158025d6ee389778871581abd3bfe3e3fb0e418f56a5b7e7e4ad8ed261dce0b8b3d53060ef4450c6324f SHA512 e2ce22b856e995d3248a10e304ae091162747d79be821d9b74c7bd2b1f8a03061b07ff29dfa026650f28129538917b7548721e110a9a2fe387915c79684340cc -DIST 86Box-5.1.tar.gz 13904013 BLAKE2B ef703622b18b465d66586a7f684a3a0f38d40e5179cd14b9bf8f2d39bafc36a8145e84bd6306b08eecdca03603ee2bc4d356f0bf501668667e496650949c5dd9 SHA512 5c68a21621da58a37a5e9f8199b2cabf0b3483303a44a53221c746f76a80d248d26b56499b771bd18670a16c3942ed6f3f92db95211a37677bda19becb75f70b DIST 86Box-5.2.tar.gz 13933308 BLAKE2B e397f15b8477dcbfad956761481455e7eb766c5edc206e453b00278dcd2caba02065faa3ff50858180905f30b741c67ece3a3b3b95ab41c7e72537d445875a6f SHA512 0e8352645823ef156fe9458d2adff652aab2cdc0cae7a05102f93fb46d779b057f4aeddc0ae4e3eaf768d1c0f71435159dd1c4016308ad59f7e5f9801caac791 diff --git a/app-emulation/86Box/files/86Box-4.2.1-crashfix-1.patch b/app-emulation/86Box/files/86Box-4.2.1-crashfix-1.patch deleted file mode 100644 index 56dfae1cad56..000000000000 --- a/app-emulation/86Box/files/86Box-4.2.1-crashfix-1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f37c2339dce9213c21c7ccc8f8ad01260ce80603 Mon Sep 17 00:00:00 2001 -From: Tarek Soliman <[email protected]> -Date: Fri, 6 Sep 2024 17:05:44 -0500 -Subject: [PATCH] Media history: fix buffer overflow - ---- - src/qt/qt_mediahistorymanager.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qt/qt_mediahistorymanager.cpp b/src/qt/qt_mediahistorymanager.cpp -index 9886c205bd..cd9be766b3 100644 ---- a/src/qt/qt_mediahistorymanager.cpp -+++ b/src/qt/qt_mediahistorymanager.cpp -@@ -337,7 +337,7 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history) - } - - char *p = checked_path.toUtf8().data(); -- char temp[1024] = { 0 }; -+ char temp[MAX_IMAGE_PATH_LEN -1] = { 0 }; - - if (path_abs(p)) { - if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1)) diff --git a/app-emulation/86Box/files/86Box-4.2.1-crashfix-2.patch b/app-emulation/86Box/files/86Box-4.2.1-crashfix-2.patch deleted file mode 100644 index 2b7fca267f47..000000000000 --- a/app-emulation/86Box/files/86Box-4.2.1-crashfix-2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ea5ef55bd13f504c26d075ce73f72867c1d4cea3 Mon Sep 17 00:00:00 2001 -From: RichardG867 <[email protected]> -Date: Fri, 11 Oct 2024 16:50:12 -0300 -Subject: [PATCH] qt: Fix another media menu string deallocation crash - ---- - src/qt/qt_mediahistorymanager.cpp | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/src/qt/qt_mediahistorymanager.cpp b/src/qt/qt_mediahistorymanager.cpp -index cd9be766b3..2acdc8e5bb 100644 ---- a/src/qt/qt_mediahistorymanager.cpp -+++ b/src/qt/qt_mediahistorymanager.cpp -@@ -336,17 +336,16 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history) - continue; - } - -- char *p = checked_path.toUtf8().data(); - char temp[MAX_IMAGE_PATH_LEN -1] = { 0 }; - -- if (path_abs(p)) { -- if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1)) -- fatal("removeMissingImages(): strlen(p) > 2047\n"); -+ if (path_abs(checked_path.toUtf8().data())) { -+ if (checked_path.length() > (MAX_IMAGE_PATH_LEN - 1)) -+ fatal("removeMissingImages(): checked_path.length() > 2047\n"); - else -- snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", p); -+ snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", checked_path.toUtf8().constData()); - } else - snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path, -- path_get_slash(usr_path), p); -+ path_get_slash(usr_path), checked_path.toUtf8().constData()); - path_normalize(temp); - - QString qstr = QString::fromUtf8(temp); diff --git a/app-emulation/86Box/files/86Box-4.2.1-crashfix-3.patch b/app-emulation/86Box/files/86Box-4.2.1-crashfix-3.patch deleted file mode 100644 index d97f4d274e1d..000000000000 --- a/app-emulation/86Box/files/86Box-4.2.1-crashfix-3.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6b05602ea4d1593edf8d0fff17e733b182e94637 Mon Sep 17 00:00:00 2001 -From: OBattler <[email protected]> -Date: Sun, 5 Jan 2025 22:35:50 +0100 -Subject: [PATCH] QT: Increase buffer size and improve sanity checking when - removing an image. - ---- - src/qt/qt_mediahistorymanager.cpp | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/qt/qt_mediahistorymanager.cpp b/src/qt/qt_mediahistorymanager.cpp -index 2acdc8e5bb..d548c0779c 100644 ---- a/src/qt/qt_mediahistorymanager.cpp -+++ b/src/qt/qt_mediahistorymanager.cpp -@@ -336,16 +336,20 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history) - continue; - } - -- char temp[MAX_IMAGE_PATH_LEN -1] = { 0 }; -+ char temp[MAX_IMAGE_PATH_LEN * 2] = { 0 }; - - if (path_abs(checked_path.toUtf8().data())) { - if (checked_path.length() > (MAX_IMAGE_PATH_LEN - 1)) -- fatal("removeMissingImages(): checked_path.length() > 2047\n"); -+ fatal("removeMissingImages(): checked_path.length() > %i\n", MAX_IMAGE_PATH_LEN - 1); - else - snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", checked_path.toUtf8().constData()); -- } else -- snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path, -- path_get_slash(usr_path), checked_path.toUtf8().constData()); -+ } else { -+ if ((strlen(usr_path) + strlen(path_get_slash(usr_path)) + checked_path.length()) > (MAX_IMAGE_PATH_LEN - 1)) -+ fatal("removeMissingImages(): Combined absolute path length > %i\n", MAX_IMAGE_PATH_LEN - 1); -+ else -+ snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path, -+ path_get_slash(usr_path), checked_path.toUtf8().constData()); -+ } - path_normalize(temp); - - QString qstr = QString::fromUtf8(temp);
