mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-28 01:44:22 -07:00
Code Issues Packages Projects Releases Activity

merge master

Browse Source
This commit is contained in:
Valerio
2025-10-26 11:14:52 +01:00
parent 4c10faedbd 3b43627f38
commit 5a226e463a
711 changed files with 38016 additions and 22461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/unix/assets/86Box.spec
View File

@@ -15,7 +15,7 @@
%global romver 4.1
Name: 86Box
Version: 6.0
Version: 5.2
Release: 1%{?dist}
Summary: Classic PC emulator
License: GPLv2+
@@ -121,5 +121,5 @@ popd
%{_datadir}/%{name}/roms
%changelog
* Sat Aug 31 Jasmine Iwanek <jriwanek[AT]gmail.com> 6.0-1
* Sat Aug 31 Jasmine Iwanek <jriwanek[AT]gmail.com> 5.2-1
- Bump release

2
src/unix/assets/net.86box.86Box.metainfo.xml
View File

@@ -11,7 +11,7 @@
</categories>
<launchable type="desktop-id">net.86box.86Box.desktop</launchable>
<releases>
<release version="6.0" date="2025-09-14"/>
<release version="5.2" date="2025-09-18"/>
</releases>
<content_rating type="oars-1.1" />
<description>

2
src/unix/dummy_cdrom_ioctl.c
View File

@@ -8,8 +8,6 @@
*
* Win32 CD-ROM support via IOCTL.
*
*
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>,
* Miran Grca, <mgrca8@gmail.com>
*

16
src/unix/unix.c
View File

@@ -408,11 +408,19 @@ path_append_filename(char *dest, const char *s1, const char *s2)
int
plat_dir_check(char *path)
{
struct stat dummy;
if (stat(path, &dummy) < 0) {
struct stat stats;
if (stat(path, &stats) < 0)
return 0;
}
return S_ISDIR(dummy.st_mode);
return S_ISDIR(stats.st_mode);
}
int
plat_file_check(const char *path)
{
struct stat stats;
if (stat(path, &stats) < 0)
return 0;
return !S_ISDIR(stats.st_mode);
}
int

3
src/unix/unix_cdrom.c
View File

@@ -8,15 +8,12 @@
*
* Handle the platform-side of CDROM/RDisk/MO drives.
*
*
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2016-2018 Miran Grca.
* Copyright 2017-2018 Fred N. van Kempen.
*/
#include <stdio.h>
#include <stdint.h>
#include <string.h>

22
src/unix/unix_serial_passthrough.c
View File

@@ -1,21 +1,19 @@
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
* This file is part of the 86Box distribution.
*
* Definitions for platform specific serial to host passthrough
* Definitions for platform specific serial to host passthrough
*
* Authors: Andreas J. Reichel <webmaster@6th-dimension.com>,
* Jasmine Iwanek <jasmine@iwanek.co.uk>
*
* Authors: Andreas J. Reichel <webmaster@6th-dimension.com>,
* Jasmine Iwanek <jasmine@iwanek.co.uk>
*
* Copyright 2021 Andreas J. Reichel.
* Copyright 2021-2025 Jasmine Iwanek.
* Copyright 2021 Andreas J. Reichel.
* Copyright 2021-2025 Jasmine Iwanek.
*/
#ifndef __APPLE__
# define _XOPEN_SOURCE 500
# define _DEFAULT_SOURCE 1