86Box: update to 5.1 (#25939)
This commit is contained in:
parent
932a74dea2
commit
df0e986105
@ -1,60 +0,0 @@
|
||||
From 1c9436c0f17cc5d479e033ae16501e69373567b8 Mon Sep 17 00:00:00 2001
|
||||
From: GH Cao <driver1998.ms@outlook.com>
|
||||
Date: Sun, 31 Aug 2025 00:50:18 +0800
|
||||
Subject: [PATCH] Fix building on MSYS2 with QT6
|
||||
|
||||
---
|
||||
src/qt/qt_mediahistorymanager.cpp | 2 +-
|
||||
src/qt/qt_mediamenu.cpp | 3 +--
|
||||
src/qt/qt_rendererstack.cpp | 4 ++++
|
||||
3 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/qt/qt_mediahistorymanager.cpp b/src/qt/qt_mediahistorymanager.cpp
|
||||
index 47ff7b4b5b0..ff9f1cf1c95 100644
|
||||
--- a/src/qt/qt_mediahistorymanager.cpp
|
||||
+++ b/src/qt/qt_mediahistorymanager.cpp
|
||||
@@ -381,7 +381,7 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history)
|
||||
|
||||
#ifdef Q_OS_WINDOWS
|
||||
if (new_fi.filePath().left(8) == "ioctl://")
|
||||
- file_exists = (GetDriveType(new_fi.filePath().right(2).toUtf8().data()) == DRIVE_CDROM);
|
||||
+ file_exists = (GetDriveTypeA(new_fi.filePath().right(2).toUtf8().data()) == DRIVE_CDROM);
|
||||
#endif
|
||||
|
||||
if (!file_exists) {
|
||||
diff --git a/src/qt/qt_mediamenu.cpp b/src/qt/qt_mediamenu.cpp
|
||||
index 465c561294b..b42812ad669 100644
|
||||
--- a/src/qt/qt_mediamenu.cpp
|
||||
+++ b/src/qt/qt_mediamenu.cpp
|
||||
@@ -31,7 +31,6 @@
|
||||
extern "C" {
|
||||
#ifdef Q_OS_WINDOWS
|
||||
#define BITMAP WINDOWS_BITMAP
|
||||
-#undef UNICODE
|
||||
#include <windows.h>
|
||||
#include <windowsx.h>
|
||||
#undef BITMAP
|
||||
@@ -176,7 +175,7 @@ MediaMenu::refresh(QMenu *parentMenu)
|
||||
it's a CDROM */
|
||||
for (const auto &letter : driveLetters) {
|
||||
auto drive = QString("%1:\\").arg(letter);
|
||||
- if (GetDriveType(drive.toUtf8().constData()) == DRIVE_CDROM)
|
||||
+ if (GetDriveTypeA(drive.toUtf8().constData()) == DRIVE_CDROM)
|
||||
menu->addAction(QIcon(":/settings/qt/icons/cdrom_host.ico"), tr("&Host CD/DVD Drive (%1:)").arg(letter), [this, i, letter] { cdromMount(i, 2, QString(R"(\\.\%1:)").arg(letter)); })->setCheckable(false);
|
||||
}
|
||||
menu->addSeparator();
|
||||
diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp
|
||||
index ade27d831b1..32b017b92d6 100644
|
||||
--- a/src/qt/qt_rendererstack.cpp
|
||||
+++ b/src/qt/qt_rendererstack.cpp
|
||||
@@ -62,6 +62,10 @@
|
||||
# include <CoreGraphics/CoreGraphics.h>
|
||||
#endif
|
||||
|
||||
+#ifdef Q_OS_WINDOWS
|
||||
+# include <windows.h>
|
||||
+#endif
|
||||
+
|
||||
extern "C" {
|
||||
#include <86box/86box.h>
|
||||
#include <86box/config.h>
|
||||
@ -3,7 +3,7 @@
|
||||
_realname=86box
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
pkgver=5.0
|
||||
pkgver=5.1
|
||||
pkgrel=1
|
||||
pkgdesc="An emulator for classic IBM PC clones (mingw-w64)"
|
||||
arch=('any')
|
||||
@ -34,19 +34,14 @@ makedepends=(
|
||||
"${MINGW_PACKAGE_PREFIX}-vulkan-headers"
|
||||
)
|
||||
source=("https://github.com/${_realname}/${_realname}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
|
||||
"0001-use-unix-install-layout.patch"
|
||||
"0002-buildfix.patch")
|
||||
sha256sums=('00899cb06eb5591df57756d13929a470e50d5d87bc219d1d1d36ae7bbe83a4bf'
|
||||
'9e45dc0600f2f04f87b0c0310a502b489f5de9162d7f7d58ab28dd2c1b35f713'
|
||||
'46f067c76b4aedff1d8114321a311aaf3f3f30a07de82cd0d527a488a70b4d64')
|
||||
"0001-use-unix-install-layout.patch")
|
||||
sha256sums=('942e9a2c8c8db3545eddf47854e8ac7585512060f41dbd7bb67b810f537b5eaa'
|
||||
'9e45dc0600f2f04f87b0c0310a502b489f5de9162d7f7d58ab28dd2c1b35f713')
|
||||
|
||||
prepare() {
|
||||
cd "${_realname}-${pkgver}"
|
||||
|
||||
patch -p1 -i "${srcdir}"/0001-use-unix-install-layout.patch
|
||||
|
||||
# https://github.com/86Box/86Box/pull/6109
|
||||
patch -p1 -i "${srcdir}"/0002-buildfix.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user