Final commit before tagging 6.7.1 release.

Updated 6.7.1 build for recent Visual Studio changes.
More fixes to changelog.
2024-01-12 15:51:34 -03:30 · 2024-01-12 15:48:27 -03:30 · 2024-01-05 22:00:39 -03:30 · 2024-01-05 21:56:29 -03:30 · 2024-01-05 21:47:27 -03:30 · 2024-01-05 21:46:50 -03:30
16 changed files with 81 additions and 50 deletions
--- a/Announce.txt
+++ b/Announce.txt
@ -9,7 +9,7 @@
     SSSS     ttt  eeeee llll llll  aaaaa
 ===========================================================================
-                Release 6.7 for Linux, macOS and Windows
+                Release 6.7.1 for Linux, macOS and Windows
 ===========================================================================
 The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@ -21,22 +21,22 @@ all of your favourite Atari 2600 games again!  Stella was originally
 developed for Linux by Bradford W. Mott, however, it has been ported to a
 number of other platforms and is currently maintained by Stephen Anthony.
-This is the 6.7 release of Stella for Linux, macOS and Windows.  The
+This is the 6.7.1 release of Stella for Linux, macOS and Windows.  The
 distributions currently available are:
  * Binaries for Windows 7/8/10/11 :
-      Stella-6.7-win32.exe   (32-bit EXE installer)
+      Stella-6.7.1-win32.exe   (32-bit EXE installer)
-      Stella-6.7-x64.exe     (64-bit EXE installer)
+      Stella-6.7.1-x64.exe     (64-bit EXE installer)
-      Stella-6.7-windows.zip (32/64 bit versions)
+      Stella-6.7.1-windows.zip (32/64 bit versions)
  * Binary distribution for macOS 10.7 and above :
-      Stella-6.7-macos.dmg (ARM M1 and 64-bit Intel)
+      Stella-6.7.1-macos.dmg (ARM M1 and 64-bit Intel)
  * Binary distribution for 64-bit Ubuntu :
-      stella_6.7-1_amd64.deb
+      stella_6.7.1-1_amd64.deb
  * Source code distribution for all platforms :
-      stella-6.7-src.tar.xz
+      stella-6.7.1-src.tar.xz
 Distribution Site
--- a/Changes.txt
+++ b/Changes.txt
@ -12,6 +12,17 @@
                              Release History
 ===========================================================================
 6.7 to 6.7.1 (January 15, 2024)
  * Fixed broken mouse and Stelladaptor input for Driving Controller.
  * For UNIX systems: Now defaults to using system-installed libsqlite3
    when available, and fixes delay on exiting app experienced on some
    systems.
 -Have fun!
 6.6 to 6.7 (June 13, 2022)
  * IMPORTANT NOTES:
@ -79,8 +90,6 @@
    (thanks go to RomHunter for his tireless research in this area).
    Related to this, updated the snapshot collection.
 -Have fun!
 6.5.3 to 6.6 (November 16, 2021)
--- a/8
+++ b/8
@ -207,7 +207,6 @@ Optional Features:
  --disable-png
  --enable-zip           enable/disable ZIP file support [enabled]
  --disable-zip
  --use-system-sqlite    use libsqlite3 installed on system [disabled]
  --enable-windowed      enable/disable windowed rendering modes [enabled]
  --disable-windowed
  --enable-shared        build shared binary [enabled]
@ -254,7 +253,6 @@ for ac_option in $@; do
      --disable-png)            _build_png=no        ;;
      --enable-zip)             _build_zip=yes       ;;
      --disable-zip)            _build_zip=no        ;;
      --use-system-sqlite)      _build_sqlite3=no    ;;
      --enable-windowed)        _build_windowed=yes  ;;
      --disable-windowed)       _build_windowed=no   ;;
      --enable-shared)          _build_static=no     ;;
@ -665,9 +663,9 @@ fi
 #
 # Check for sqlite3
 #
 _libsqlite3=no
 echocheck "libsqlite3"
-if test "$_build_sqlite3" = no ; then
+if test "$_build_sqlite3" = yes ; then
  _libsqlite3=no
  cat > $TMPC << EOF
 #include <stdio.h>
 #include <sqlite3.h>
@ -676,7 +674,7 @@ EOF
  cc_check $LDFLAGS $CXXFLAGS `pkg-config --libs sqlite3` && _libsqlite3=yes
  if test "$_libsqlite3" = yes ; then
-    echo "$_libsqlite3 (WIP, not complete)"
+    echo "$_libsqlite3"
  else
    echo "built-in"
    _build_sqlite3=yes
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
 stella (6.7.1) stable; urgency=high
  * Version 6.7.1 release
 -- Stephen Anthony <sa666666@gmail.com>  Mon, 15 Jan 2024 17:09:59 -0230
 stella (6.7) stable; urgency=high
  * Version 6.7 release
--- a/docs/debugger.html
+++ b/docs/debugger.html
@ -15,7 +15,7 @@
 <body>
  <center><b><font size="7">Stella</font></b></center>
-  <center><h4><b>Release 6.7</b></h4></center>
+  <center><h4><b>Release 6.7.1</b></h4></center>
  <center><h1><b>Integrated Debugger</b></h1></center>
  <center><h4><b>(a work in progress)</b></h4></center>
  <br>
--- a/docs/index.html
+++ b/docs/index.html
@ -21,7 +21,7 @@
    <img src="graphics/stella_icon.png">
    <h2><b>A multi-platform Atari 2600 VCS emulator</b></h2>
-    <h4><b>Release 6.7</b></h4>
+    <h4><b>Release 6.7.1</b></h4>
    <br>
    <h2><b>User's Guide</b></h2>
--- a/docs/index_r77.html
+++ b/docs/index_r77.html
@ -58,7 +58,7 @@
  <center><h1>Stella for RetroN 77</h1></center>
  <center><h2>Atari 2600 VCS emulator</h2></center>
-  <center>Release 6.7</center>
+  <center>Release 6.7.1</center>
  <center><h2>Quick Navigation Guide</h2></center>
  <br/>
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@ -18,7 +18,7 @@
 #ifndef VERSION_HXX
 #define VERSION_HXX
-#define STELLA_VERSION "6.7"
+#define STELLA_VERSION "6.7.1"
-#define STELLA_BUILD "7293"
+#define STELLA_BUILD "7298"
 #endif
--- a/src/common/repository/sqlite/SqliteDatabase.cxx
+++ b/src/common/repository/sqlite/SqliteDatabase.cxx
@ -70,6 +70,7 @@ void SqliteDatabase::initialize()
  }
  exec("PRAGMA journal_mode=WAL");
  exec("PRAGMA synchronous=1");
  switch (sqlite3_wal_checkpoint_v2(myHandle, nullptr, SQLITE_CHECKPOINT_TRUNCATE, nullptr, nullptr)) {
    case SQLITE_OK:
--- a/src/emucore/Driving.cxx
+++ b/src/emucore/Driving.cxx
@ -8,7 +8,7 @@
 //  SS  SS   tt   ee      ll   ll  aa  aa
 //   SSSS     ttt  eeeee llll llll  aaaaa
 //
-// Copyright (c) 1995-2022 by Bradford W. Mott, Stephen Anthony
+// Copyright (c) 1995-2023 by Bradford W. Mott, Stephen Anthony
 // and the Stella Team
 //
 // See the file "License.txt" for information on usage and redistribution of
@ -114,16 +114,23 @@ void Driving::updateControllerAxes()
 {
  // Digital events (from keyboard or joystick hats & buttons)
  const int d_axis = myEvent.get(myXAxisValue);
  const Int32 oldCounterHires = myCounterHires;
-  if(myEvent.get(myCCWEvent) != 0 || d_axis < -16384)
+  if(myEvent.get(myCCWEvent) != 0 && myLastCCWEvent == 0)
    myCounterHires = ((myGrayIndex + 4) * 256.0F) / SENSITIVITY - 1; // set to end of previous counter interval
  else if(myEvent.get(myCWEvent) != 0 && myLastCWEvent == 0)
    myCounterHires = ((myGrayIndex + 1) * 256.0F) / SENSITIVITY;     // set to begin of next counter interval
  else if(myEvent.get(myCCWEvent) != 0 || d_axis < -16384)
    myCounterHires -= 64;
  else if(myEvent.get(myCWEvent) != 0 || d_axis > 16384)
    myCounterHires += 64;
  myLastCCWEvent = myEvent.get(myCCWEvent);
  myLastCWEvent = myEvent.get(myCWEvent);
  // Analog events (from joystick axes)
  const int a_axis = myEvent.get(myAnalogEvent);
-  if( abs(a_axis) > Controller::analogDeadZone())
+  if(abs(a_axis) > Controller::analogDeadZone())
  {
    /* a_axis is in -2^15 to +2^15-1; adding 1 when non-negative and
       dividing by 2^9 gives us -2^6 to +2^6, which gives us the same
@ -132,13 +139,15 @@ void Driving::updateControllerAxes()
    myCounterHires += (a_axis/512) + (a_axis >= 0);
  }
-  // Only consider the lower-most bits (corresponding to pins 1 & 2)
+  if(oldCounterHires != myCounterHires)
-  myGrayIndex = static_cast<Int32>((myCounterHires / 256.0F) * SENSITIVITY) & 0b11;
+    // Only consider the lower-most bits (corresponding to pins 1 & 2)
    myGrayIndex = static_cast<Int32>((myCounterHires / 256.0F) * SENSITIVITY) & 0b11;
 }
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Driving::updateMouseAxes()
 {
  const Int32 oldCounter = myCounter;
  static constexpr int MJ_Threshold = 2;
  // Mouse motion and button events
@ -171,6 +180,8 @@ void Driving::updateMouseAxes()
        ++myCounter;
    }
  }
  if(myCounter != oldCounter)
    myGrayIndex = (myCounter >> 2) & 0b11;
 }
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -199,6 +210,7 @@ void Driving::updateStelladaptorAxes()
    // simulated gray codes generated by PC keyboard or PC joystick
    // Must be rounded into the middle of the myCounter interval!
    myCounter = (myGrayIndex + 0.5F) * 4.0F / SENSITIVITY;
    myCounterHires = myCounter * 256.0F / 4.0F;
  }
 }
--- a/src/emucore/Driving.hxx
+++ b/src/emucore/Driving.hxx
@ -8,7 +8,7 @@
 //  SS  SS   tt   ee      ll   ll  aa  aa
 //   SSSS     ttt  eeeee llll llll  aaaaa
 //
-// Copyright (c) 1995-2022 by Bradford W. Mott, Stephen Anthony
+// Copyright (c) 1995-2023 by Bradford W. Mott, Stephen Anthony
 // and the Stella Team
 //
 // See the file "License.txt" for information on usage and redistribution of
@ -95,7 +95,13 @@ class Driving : public Controller
    Int32 myCounter{0};
    // Higher resolution counter for analog (non-Stelladaptor) inputs
-    uInt32 myCounterHires{0};
+    Int32 myCounterHires{0};
    // Previous digital CCW event
    Int32 myLastCCWEvent{0};
    // Previous digital CW event
    Int32 myLastCWEvent{0};
    // Index into the gray code table
    uInt32 myGrayIndex{0};
--- a/src/gui/WhatsNewDialog.cxx
+++ b/src/gui/WhatsNewDialog.cxx
@ -66,12 +66,7 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent,
    add(ypos, "added MovieCart support");
    add(ypos, "added weblinks for many games");
  }
-  add(ypos, "extensively redesigned and enhanced file launcher");
+  add(ypos, "fixed broken mouse and Stelladaptor input for Driving Controller");
  add(ypos, "added automatic emulation pause when focus is lost");
  add(ypos, "added option to toggle autofire mode");
  add(ypos, "improved controller mappings for Paddles and Driving controllers");
  add(ypos, "added another oddball TIA glitch option for score mode color");
  add(ypos, "enhanced support for CDFJ+ bankswitching type");
  add(ypos, ELLIPSIS + " (for a complete list see 'docs/Changes.txt')");
 #endif
--- a/src/macos/Info-Stella.plist
+++ b/src/macos/Info-Stella.plist
@ -45,7 +45,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.7</string>
+	<string>6.7.1</string>
 	<key>CFBundleName</key>
 	<string>Stella</string>
 	<key>CFBundlePackageType</key>
@ -53,7 +53,7 @@
 	<key>CFBundleSignature</key>
 	<string>StLa</string>
 	<key>CFBundleVersion</key>
-	<string>6.7</string>
+	<string>6.7.1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSMinimumSystemVersionByArchitecture</key>
--- a/src/unix/stella.spec
+++ b/src/unix/stella.spec
@ -1,5 +1,5 @@
 %define name    stella
-%define version 6.7
+%define version 6.7.1
 %define rel     1
 %define enable_sound 1
@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %_datadir/icons/large/%{name}.png
 %changelog
 * Mon Jan 15 2024 Stephen Anthony <sa666666@gmail.com> 6.7.1-1
 - Version 6.7.1 release
 * Mon Jun 13 2022 Stephen Anthony <sa666666@gmail.com> 6.7-1
 - Version 6.7 release
--- a/src/windows/Stella.vcxproj
+++ b/src/windows/Stella.vcxproj
@ -52,54 +52,54 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <EnableASAN>false</EnableASAN>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <EnableASAN>true</EnableASAN>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup>
    <XPDeprecationWarning>false</XPDeprecationWarning>
--- a/src/windows/stella.rc
+++ b/src/windows/stella.rc
@ -36,8 +36,8 @@ IDI_ICON                ICON                    "stella.ico"
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,7,0,0
+ FILEVERSION 6,7,1,0
- PRODUCTVERSION 6,7,0,0
+ PRODUCTVERSION 6,7,1,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -55,12 +55,12 @@ BEGIN
            VALUE "Comments", "The multi-platform Atari 2600 emulator.  Stella is released under the GPLv2."
            VALUE "CompanyName", "The Stella Team (https://stella-emu.github.io)"
            VALUE "FileDescription", "Stella"
-            VALUE "FileVersion", "6.7"
+            VALUE "FileVersion", "6.7.1"
            VALUE "InternalName", "Stella"
            VALUE "LegalCopyright", "Copyright (c) 1995-2022 The Stella Team"
            VALUE "OriginalFilename", "Stella.exe"
            VALUE "ProductName", "Stella"
-            VALUE "ProductVersion", "6.7"
+            VALUE "ProductVersion", "6.7.1"
        END
    END
    BLOCK "VarFileInfo"
Author	SHA1	Message	Date
Stephen Anthony	bbef85b3da	Final commit before tagging 6.7.1 release.	2024-01-12 15:51:34 -03:30
Stephen Anthony	37a9b6ea41	Updated 6.7.1 build for recent Visual Studio changes.	2024-01-12 15:48:27 -03:30
Stephen Anthony	af4196c049	More fixes to changelog.	2024-01-05 22:00:39 -03:30
Stephen Anthony	1909c1f20f	Updates for upcoming 6.7.1 release.	2024-01-05 21:56:29 -03:30
Stephen Anthony	c387e7c8c2	Add driving controller fixes for 6.7.1 release.	2024-01-05 21:47:27 -03:30
Stephen Anthony	853c0927c5	Default to using system-wide libsqlite3 on Linux/UNIX systems. Fix for slow exit from app in this mode is now fixed.	2024-01-05 21:46:50 -03:30