From 26096fcc477bd9d1e9b6f4405f4c785b1dd9a0e2 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Sat, 3 Feb 2018 19:29:27 -0330 Subject: [PATCH] Fixed some warnings, and updates for 5.1 release. --- Announce.txt | 22 +++++++++++----------- Changes.txt | 2 +- debian/changelog | 7 +++++++ src/emucore/FrameBuffer.cxx | 3 ++- src/gui/RadioButtonWidget.cxx | 3 ++- src/gui/Widget.cxx | 4 ++-- src/macosx/English.lproj/InfoPlist.strings | 4 ++-- src/macosx/Info-Stella.plist | 2 +- src/unix/stella.spec | 5 ++++- src/windows/stella.rc | 8 ++++---- 10 files changed, 36 insertions(+), 24 deletions(-) diff --git a/Announce.txt b/Announce.txt index 76fbbdd16..0e6c7b85d 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =========================================================================== - Release 5.0.2 for Linux, MacOSX and Windows + Release 5.1 for Linux, MacOSX and Windows =========================================================================== The Atari 2600 Video Computer System (VCS), introduced in 1977, was the @@ -21,30 +21,30 @@ 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 5.0.2 release of Stella for Linux, Mac OSX and Windows. The +This is the 5.1 release of Stella for Linux, Mac OSX and Windows. The distributions currently available are: * Binaries for Windows XP_SP3(*)/Vista/7/8/10 : - Stella-5.0.2-win32.exe (32-bit EXE installer) - Stella-5.0.2-x64.exe (64-bit EXE installer) - Stella-5.0.2-windows.zip (32/64 bit versions) + Stella-5.1-win32.exe (32-bit EXE installer) + Stella-5.1-x64.exe (64-bit EXE installer) + Stella-5.1-windows.zip (32/64 bit versions) (*) Note: Support for Windows XP is problematic on some systems, and will probably be discontinued in a future release. * Binary distribution for MacOS X 10.7 and above : - Stella-5.0.2-macosx.dmg (64-bit Intel) + Stella-5.1-macosx.dmg (64-bit Intel) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : - stella_5.0.2-1_i386.deb - stella_5.0.2-1_amd64.deb + stella_5.1-1_i386.deb + stella_5.1-1_amd64.deb * Binary distribution in 32-bit & 64-bit RPM format : - stella-5.0.2-2.i386.rpm - stella-5.0.2-2.x86_64.rpm + stella-5.1-2.i386.rpm + stella-5.1-2.x86_64.rpm * Source code distribution for all platforms : - stella-5.0.2-src.tar.xz + stella-5.1-src.tar.xz Distribution Site diff --git a/Changes.txt b/Changes.txt index d7e0a91df..0ae80694d 100644 --- a/Changes.txt +++ b/Changes.txt @@ -1,4 +1,4 @@ -5.0.2 to 5.1: (January xx, 2018) +5.0.2 to 5.1: (February 4, 2018) * Thumbulator support is not conditional any more. diff --git a/debian/changelog b/debian/changelog index aa1c262eb..250f3a179 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (5.1-1) stable; urgency=high + + * Version 5.1 release + + -- Stephen Anthony Sun, 4 Feb 2018 17:09:59 -0230 + + stella (5.0.2-1) stable; urgency=high * Version 5.0.2 release diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx index 87a27b89f..8c3176903 100644 --- a/src/emucore/FrameBuffer.cxx +++ b/src/emucore/FrameBuffer.cxx @@ -390,7 +390,8 @@ void FrameBuffer::drawFrameStats() string bsinfo = info.BankSwitch + (myOSystem.settings().getBool("dev.settings") ? "| Developer" : ""); // draw shadowed text - color = myOSystem.console().tia().scanlinesLastFrame() != myLastScanlines ? kDbgColorRed : myStatsMsg.color; + color = myOSystem.console().tia().scanlinesLastFrame() != myLastScanlines ? + uInt32(kDbgColorRed) : myStatsMsg.color; std::snprintf(msg, 30, "%3u", myOSystem.console().tia().scanlinesLastFrame()); myStatsMsg.surface->drawString(font(), msg, xPos, YPOS, myStatsMsg.w, color, TextAlign::Left, 0, true, kBGColor); diff --git a/src/gui/RadioButtonWidget.cxx b/src/gui/RadioButtonWidget.cxx index ddd69d564..4ef05c40e 100644 --- a/src/gui/RadioButtonWidget.cxx +++ b/src/gui/RadioButtonWidget.cxx @@ -222,7 +222,8 @@ void RadioButtonWidget::drawWidget(bool hilite) s.drawBitmap(radio_img_outercircle, _x, _y + _boxY, kShadowColor, 14, 14); // Draw the inner bounding circle with enabled color - s.drawBitmap(radio_img_innercircle, _x + 2, _y + _boxY + 2, isEnabled() ? _bgcolor : kColor, 10, 10); + s.drawBitmap(radio_img_innercircle, _x + 2, _y + _boxY + 2, + isEnabled() ? _bgcolor : uInt32(kColor), 10, 10); // draw state if(_state) diff --git a/src/gui/Widget.cxx b/src/gui/Widget.cxx index 8c1850226..e0a35a0fd 100644 --- a/src/gui/Widget.cxx +++ b/src/gui/Widget.cxx @@ -656,8 +656,8 @@ void CheckboxWidget::drawWidget(bool hilite) if(_drawBox) s.box(_x, _y + _boxY, 14, 14, kColor, kShadowColor); // Do we draw a square or cross? - s.fillRect(_x + 2, _y + _boxY + 2, 10, 10, _changed ? kDbgChangedColor - : isEnabled() ? _bgcolor : kColor); + s.fillRect(_x + 2, _y + _boxY + 2, 10, 10, _changed ? uInt32(kDbgChangedColor) + : isEnabled() ? _bgcolor : uInt32(kColor)); if(_state) s.drawBitmap(_img, _x + 3, _y + _boxY + 3, isEnabled() ? kCheckColor : kShadowColor); #else diff --git a/src/macosx/English.lproj/InfoPlist.strings b/src/macosx/English.lproj/InfoPlist.strings index 9d601a273..ea21784d0 100755 --- a/src/macosx/English.lproj/InfoPlist.strings +++ b/src/macosx/English.lproj/InfoPlist.strings @@ -1,8 +1,8 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Stella"; -CFBundleShortVersionString = "Stella version 5.0.2"; -CFBundleGetInfoString = "Stella version 5.0.2"; +CFBundleShortVersionString = "Stella version 5.1"; +CFBundleGetInfoString = "Stella version 5.1"; NSHumanReadableCopyright = "Stella MacOS X version by Stephen Anthony and Mark Grebe."; "Atari 2600 Cartridge File" = "Atari 2600 Cartridge File"; diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist index f7725edb1..3127800e8 100644 --- a/src/macosx/Info-Stella.plist +++ b/src/macosx/Info-Stella.plist @@ -53,7 +53,7 @@ CFBundleSignature StLa CFBundleVersion - 5.0.2 + 5.1 LSApplicationCategoryType public.app-category.games LSMinimumSystemVersionByArchitecture diff --git a/src/unix/stella.spec b/src/unix/stella.spec index 67b6ffae7..8034789ea 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -1,5 +1,5 @@ %define name stella -%define version 5.0.2 +%define version 5.1 %define rel 1 %define enable_sound 1 @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog +* Sun Feb 04 2018 Stephen Anthony 5.1-1 +- Version 5.1 release + * Sun Aug 20 2017 Stephen Anthony 5.0.2-1 - Version 5.0.2 release diff --git a/src/windows/stella.rc b/src/windows/stella.rc index 3cc0f30ec..57c0a4282 100755 --- a/src/windows/stella.rc +++ b/src/windows/stella.rc @@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 5,0,2,0 - PRODUCTVERSION 5,0,2,0 + FILEVERSION 5,1,0,0 + PRODUCTVERSION 5,1,0,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", "5.0.2" + VALUE "FileVersion", "5.1" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2018 The Stella Team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "5.0.2" + VALUE "ProductVersion", "5.1" END END BLOCK "VarFileInfo"