Merge remote-tracking branch 'upstream/master'

mahlemiut · Sep 21, 2024 · 9c5aa4e · 9c5aa4e
2 parents f623d02 + 7eabbf1
commit 9c5aa4e
Show file tree

Hide file tree

Showing 1,054 changed files with 38,456 additions and 16,046 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -58,7 +58,7 @@ jobs:
         ARCHOPTS: ${{ matrix.archopts }}
         SUBTARGET: ${{ matrix.subtarget }}
         TOOLS: 1
-      run: make -j2
+      run: make -j3
     - name: Validate
       run: ./${{ matrix.executable }} -validate
     - name: Reconcile driver list

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -56,7 +56,7 @@ jobs:
         ARCHOPTS: "-fuse-ld=lld"
         SUBTARGET: ${{ matrix.subtarget }}
         TOOLS: 1
-      run: make -j2
+      run: make -j3
     - name: Validate
       run: ./${{ matrix.executable }}.exe -validate
     - uses: actions/upload-artifact@master

diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="268"
-      android:versionName="0.268"
+      android:versionCode="269"
+      android:versionName="0.269"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/docs/source/commandline/commandline-all.rst b/docs/source/commandline/commandline-all.rst
@@ -3677,8 +3677,9 @@ Debugging Options
         Acts as a remote debugging server for the GNU debugger (GDB).  Only a
         small subset of the CPUs emulated by MAME are supported.  Use the
         :ref:`debugger_port <mame-commandline-debuggerport>` option to set the
-        listening port on the loopback interface.  Supported on all platforms
-        with TCP socket support.
+        listening port and the
+        :ref:`debugger_host <mame-commandline-debuggerhost>` option to set the
+        address to bind to.  Supported on all platforms with TCP socket support.
 
     Example:
         .. code-block:: bash
@@ -3732,11 +3733,26 @@ Debugging Options
 
             mame ibm_5150 -watchdog 30
 
+.. _mame-commandline-debuggerhost:
+
+**-debugger_host** *<address>*
+
+    Set the IP address to listen on to accept GDB connections when using the
+    GDB stub debugger module (see the
+    :ref:`debugger <mame-commandline-debugger>` option).
+
+    The default is ``localhost``.
+
+    Example:
+        .. code-block:: bash
+
+            mame rfjet -debug -debugger gdbstub -debugger_host 0.0.0.0
+
 .. _mame-commandline-debuggerport:
 
 **-debugger_port** *<port>*
 
-    Set the TCP port number to listen on for GDB connections when using the GDB
+    Set the TCP port number to accept GDB connections on when using the GDB
     stub debugger module (see the :ref:`debugger <mame-commandline-debugger>`
     option).
 

diff --git a/docs/source/commandline/commandline-index.rst b/docs/source/commandline/commandline-index.rst
@@ -298,6 +298,7 @@ Core Debugging Options
 | :ref:`debugscript <mame-commandline-debugscript>`
 | :ref:`[no]update_in_pause <mame-commandline-updateinpause>`
 | :ref:`watchdog <mame-commandline-watchdog>`
+| :ref:`debugger_host <mame-commandline-debuggerhost>`
 | :ref:`debugger_port <mame-commandline-debuggerport>`
 | :ref:`debugger_font <mame-commandline-debuggerfont>`
 | :ref:`debugger_font_size <mame-commandline-debuggerfontsize>`

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.268'
+version = '0.269'
 # The full version, including alpha/beta/rc tags.
-release = '0.268'
+release = '0.269'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/hash/apple2_cass.xml b/hash/apple2_cass.xml
@@ -2983,4 +2983,21 @@ To load and run a tape:
 		</part>
 	</software>
 
+	<software name="wheeldeal" supported="no">
+		<description>Wheeler Dealers</description>
+		<year>1978</year>
+		<publisher>Speakeasy Software</publisher>
+		<info name="programmer" value="Danielle Bunten Berry" />
+		<info name="usage" value="Requires a 16K Apple ][ or later. Shipped with special hardware controllers, but joystick or paddeles can be used by defining directional movement (not button press) to each player." />
+		<sharedfeat name="compatibility" value="A2,A2P,A2E,A2EE,A2C,A2GS" />
+		<!--Dump released: 2024-05-09-->
+		<!--simulation game-->
+		<part name="cass" interface="apple2_cass">
+			<feature name="part_id" value="Wheeler Dealers" />
+			<dataarea name="cass" size="6462138">
+				<rom name="wheeler dealers (1978) (speakeasy software, ltd.).wav" size="6462138" crc="83abeab4" sha1="5af05f91a712d5e2ccaa03606d269574405fecfa" />
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>