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

Conflict resolution.

Browse Source
This commit is contained in:
OBattler
2023-09-21 20:44:44 +02:00
parent 6a97893cc8 491cdda458
commit 1fa5f7c406
406 changed files with 8810 additions and 5865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
# After a successful build, you can install the RPMs as follows:
# sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms*
%global romver 3.11
%global romver 4.0
Name: 86Box
Version: 4.1
@@ -27,11 +27,14 @@ Source1: https://github.com/86Box/roms/archive/refs/tags/v%{romver}.zip
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: extra-cmake-modules
BuildRequires: fluidsynth-devel
BuildRequires: freetype-devel
BuildRequires: gcc-c++
BuildRequires: libFAudio-devel
BuildRequires: libappstream-glib
BuildRequires: libatomic
BuildRequires: libevdev-devel
BuildRequires: libslirp-devel
BuildRequires: libxkbcommon-x11-devel
BuildRequires: libXi-devel
BuildRequires: ninja-build
@@ -118,5 +121,5 @@ popd
%{_datadir}/%{name}/roms
%changelog
* Sat Jul 29 2023 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.1-1
* Sat Aug 26 2023 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.1-1
- Bump release

7
src/unix/unix.c
View File

@@ -310,7 +310,7 @@ path_slash(char *path)
path_normalize(path);
}
char *
const char *
path_get_slash(char *path)
{
char *ret = "";
@@ -960,7 +960,10 @@ monitor_thread(void *param)
printf(
"%s v%s [%s] [%s, %s]\n\n"
"An emulator of old computers\n"
"Authors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, Tiseno100, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\n"
"Authors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), "
"Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), "
"Tiseno100, reenigne, and others.\n"
"With previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\n"
"Released under the GNU General Public License version 2 or later. See LICENSE for more information.\n",
EMU_NAME, EMU_VERSION_FULL, EMU_GIT_HASH, ARCH_STR, DYNAREC_STR);
} else if (strncasecmp(xargv[0], "fullscreen", 10) == 0) {

20
src/unix/unix_serial_passthrough.c
View File

@@ -45,9 +45,9 @@
#define LOG_PREFIX "serial_passthrough: "
int
plat_serpt_read(void *p, uint8_t *data)
plat_serpt_read(void *priv, uint8_t *data)
{
serial_passthrough_t *dev = (serial_passthrough_t *) p;
serial_passthrough_t *dev = (serial_passthrough_t *) priv;
int res;
struct timeval tv;
fd_set rdfds;
@@ -76,9 +76,9 @@ plat_serpt_read(void *p, uint8_t *data)
}
void
plat_serpt_close(void *p)
plat_serpt_close(void *priv)
{
serial_passthrough_t *dev = (serial_passthrough_t *) p;
serial_passthrough_t *dev = (serial_passthrough_t *) priv;
if (dev->mode == SERPT_MODE_HOSTSER) {
tcsetattr(dev->master_fd, TCSANOW, (struct termios *) dev->backend_priv);
@@ -118,9 +118,9 @@ plat_serpt_write_vcon(serial_passthrough_t *dev, uint8_t data)
}
void
plat_serpt_set_params(void *p)
plat_serpt_set_params(void *priv)
{
serial_passthrough_t *dev = (serial_passthrough_t *) p;
serial_passthrough_t *dev = (serial_passthrough_t *) priv;
if (dev->mode == SERPT_MODE_HOSTSER) {
struct termios term_attr;
@@ -188,9 +188,9 @@ plat_serpt_set_params(void *p)
}
void
plat_serpt_write(void *p, uint8_t data)
plat_serpt_write(void *priv, uint8_t data)
{
serial_passthrough_t *dev = (serial_passthrough_t *) p;
serial_passthrough_t *dev = (serial_passthrough_t *) priv;
switch (dev->mode) {
case SERPT_MODE_VCON:
@@ -297,9 +297,9 @@ open_host_serial_port(serial_passthrough_t *dev)
}
int
plat_serpt_open_device(void *p)
plat_serpt_open_device(void *priv)
{
serial_passthrough_t *dev = (serial_passthrough_t *) p;
serial_passthrough_t *dev = (serial_passthrough_t *) priv;
switch (dev->mode) {
case SERPT_MODE_VCON: