claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into cdrom_changes

Browse Source
This commit is contained in:
OBattler
2025-02-12 03:21:41 +01:00
parent ae597c2e46 0884f8d732
commit 1168d2d002
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.ci/build.sh
View File

@@ -542,11 +542,12 @@ then
sudo sed -i -e 's/configure.env-append MAKE=/configure.env-append VULKAN_SDK=${prefix} MAKE=/g' "$qt5_portfile"
fi
# Patch openal-soft to use 1.23.1 on all targets instead of 1.24.1 on >=10.15 only,
# Patch openal-soft to use 1.23.1 on all targets instead of 1.24.2 on >=10.13 only,
# to prevent a symlink mismatch from having different versions on x86_64 and arm64.
# See: https://github.com/macports/macports-ports/commit/9b4903fc9c76769d476079e404c9a3b8a225f8aa
# https://github.com/macports/macports-ports/commit/788deb64dc0695e8d04afb32ed904947f2a7591b
openal_portfile="$macports/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/audio/openal-soft/Portfile"
sudo sed -i -e 's/if {${os.platform} ne "darwin" || ${os.major} >= 19}/if {0}/g' "$openal_portfile"
sudo sed -i -e 's/if {${os.platform} ne "darwin" ||/if {0 \&\&/g' "$openal_portfile"
# Patch wget to remove libproxy support, as it depends on shared-mime-info which
# fails to build for a 10.13 target, which we have to do despite wget only being

2
src/device/serial_passthrough.c
View File

@@ -260,7 +260,7 @@ static const device_config_t serial_passthrough_config[] = {
.name = "host_serial_path",
.description = "Host Serial Device",
.type = CONFIG_SERPORT,
.default_string = NULL,
.default_string = "",
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },

2
src/scsi/scsi_t128.c
View File

@@ -616,7 +616,6 @@ const device_t scsi_t128_device = {
.config = t128_config
};
const device_t scsi_t228_device = {
.name = "Trantor T228",
.internal_name = "t228",
@@ -624,7 +623,6 @@ const device_t scsi_t228_device = {
.local = 0,
.init = t128_init,
.close = t128_close,
.close = t128_close,
.reset = NULL,
.available = t128_available,
.speed_changed = NULL,