Merge branch '86Box:master' into rtconfig

Cacodemon345 · Mar 19, 2024 · 9d0523a · 9d0523a
2 parents 41dec3e + 11b645d
commit 9d0523a
Show file tree

Hide file tree

Showing 286 changed files with 20,401 additions and 7,019 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -94,7 +94,6 @@ jobs:
             rtmidi:p
             libslirp:p
             fluidsynth:p
-            libvncserver:p
 
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/cmake_linux.yml b/.github/workflows/cmake_linux.yml
@@ -80,7 +80,6 @@ jobs:
           libopenal-dev
           libslirp-dev
           libfluidsynth-dev
-          libvncserver-dev
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository

diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml
@@ -82,7 +82,6 @@ jobs:
           rtmidi
           openal-soft
           fluidsynth
-          libvncserver
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
@@ -104,7 +104,6 @@ jobs:
             rtmidi:p
             libslirp:p
             fluidsynth:p
-            libvncserver:p
             ${{ matrix.ui.packages }}
 
       - name: Checkout repository

diff --git a/.github/workflows/codeql_linux.yml b/.github/workflows/codeql_linux.yml
@@ -83,7 +83,6 @@ jobs:
           libopenal-dev
           libslirp-dev
           libfluidsynth-dev
-          libvncserver-dev
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository

diff --git a/.github/workflows/codeql_macos.yml b/.github/workflows/codeql_macos.yml
@@ -76,7 +76,6 @@ jobs:
           rtmidi
           openal-soft
           fluidsynth
-          libvncserver
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository

diff --git a/.github/workflows/codeql_windows_msys2.yml b/.github/workflows/codeql_windows_msys2.yml
@@ -61,9 +61,6 @@ jobs:
             new: on
             slug: -NDR
         ui:
-          - name: Win32 GUI
-            qt: off
-            static: on
           - name: Qt GUI
             qt: on
             static: off
@@ -110,7 +107,6 @@ jobs:
             rtmidi:p
             libslirp:p
             fluidsynth:p
-            libvncserver:p
             ${{ matrix.ui.packages }}
 
       - name: Checkout repository

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,7 +35,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 4.1
+    VERSION 4.1.1
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)
@@ -131,7 +131,6 @@ option(RTMIDI       "RtMidi"
 option(FLUIDSYNTH   "FluidSynth"                                                    ON)
 option(MUNT         "MUNT"                                                          ON)
 option(VNC          "VNC renderer"                                                  OFF)
-option(DINPUT       "DirectInput"                                                   OFF)
 option(CPPTHREADS   "C++11 threads"                                                 ON)
 option(NEW_DYNAREC  "Use the PCem v15 (\"new\") dynamic recompiler"                 OFF)
 option(MINITRACE    "Enable Chrome tracing using the modified minitrace library"    OFF)
@@ -155,6 +154,7 @@ cmake_dependent_option(ISAMEM_BRAT    "BocaRAM/AT"
 cmake_dependent_option(LASERXT        "VTech Laser XT"                              ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(OLIVETTI       "Olivetti M290"                               ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(OPEN_AT        "OpenAT"                                      ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(OPL4ML         "OPL4-ML daughterboard"                       ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(PAS16          "Pro Audio Spectrum 16"                       ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(SIO_DETECT     "Super I/O Detection Helper"                  ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(VGAWONDER      "ATI VGA Wonder (ATI-18800)"                  ON      "DEV_BRANCH"    OFF)

diff --git a/README.md b/README.md
@@ -31,7 +31,9 @@ Performance may vary depending on both host and guest configuration. Most emulat
 It is also recommended to use a manager application with 86Box for easier handling of multiple virtual machines.
 
 * [86Box Manager](https://github.com/86Box/86BoxManager) by [Overdoze](https://github.com/daviunic) (Windows only)
-* [Linbox-qt5](https://github.com/Dungeonseeker/linbox-qt5) by Dungeonseeker (Linux focused, should work on Windows though untested)
+* [86Box Manager X](https://github.com/RetBox/86BoxManagerX) by [xafero](https://github.com/xafero) (Cross platform Port of 86Box Manager using Avalonia)
+* [sl86](https://github.com/DDXofficial/sl86) by [DDX](https://github.com/DDXofficial) (Command-line 86Box machine manager written in Python)
+* [Linbox-qt5](https://github.com/Dungeonseeker/linbox-qt5) by [Dungeonseeker](https://github.com/Dungeonseeker/) (Linux focused, should work on Windows though untested)
 * [MacBox for 86Box](https://github.com/Moonif/MacBox) by [Moonif](https://github.com/Moonif) (MacOS only)
 
 It is also possible to use 86Box on its own with the `--vmpath`/`-P` command line option.

diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-86box (4.1) UNRELEASED; urgency=medium
+86box (4.1.1) UNRELEASED; urgency=medium
 
   * Bump release.
 
- -- Jasmine Iwanek <[email protected]>  Mon, 16 Oct 2023 20:24:46 +0200
+ -- Jasmine Iwanek <[email protected]>  Fri, 23 Feb 2024 07:23:12 +0100
diff --git a/src/86box.c b/src/86box.c
@@ -181,6 +181,7 @@ int      gfxcard[2]                             = { 0, 0 };       /* (C) graphic
 int      show_second_monitors                   = 1;              /* (C) show non-primary monitors */
 int      sound_is_float                         = 1;              /* (C) sound uses FP values */
 int      voodoo_enabled                         = 0;              /* (C) video option */
+int      lba_enhancer_enabled                   = 0;              /* (C) enable Vision Systems LBA Enhancer */
 int      ibm8514_standalone_enabled             = 0;              /* (C) video option */
 int      xga_standalone_enabled                 = 0;              /* (C) video option */
 uint32_t mem_size                               = 0;              /* (C) memory size (Installed on
@@ -1226,6 +1227,9 @@ pc_reset_hard_init(void)
         device_add(&postcard_device);
     if (unittester_enabled)
         device_add(&unittester_device);
+
+    if (lba_enhancer_enabled)
+        device_add(&lba_enhancer_device);
 
     if (IS_ARCH(machine, MACHINE_BUS_PCI)) {
         pci_register_cards();