[SCM] Atari 2600 Emulator for SDL & the X Window System branch, master, updated. debian/3.4.1-2-4-g124e4d4

Stephen Kitt steve at sk2.org
Thu Dec 29 23:10:44 UTC 2011 

The following commit has been merged in the master branch:
commit 124e4d42e0a2eb1dbf577d1fd23817e424486038
Author: Stephen Kitt <steve at sk2.org>
Date:   Thu Dec 29 23:57:01 2011 +0100

    Update description and manpage (notably, OpenGL-based TV effects are no longer supported).

diff --git a/debian/changelog b/debian/changelog
index 23d83a4..ce1405f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ stella (3.5-1) unstable; urgency=low
 
   * New upstream version.
   * Drop all patches, merged upstream.
+  * Update description and manpage (notably, OpenGL-based TV effects are
+    no longer supported).
 
- -- Stephen Kitt <steve at sk2.org>  Thu, 29 Dec 2011 23:36:59 +0100
+ -- Stephen Kitt <steve at sk2.org>  Thu, 29 Dec 2011 23:56:39 +0100
 
 stella (3.4.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 08d764d..8931b66 100644
--- a/debian/control
+++ b/debian/control
@@ -25,9 +25,7 @@ Description: Atari 2600 Emulator for SDL & the X Window System
   * support for real Atari 2600 controllers using the Stelladaptor or
     the 2600-daptor;
   * support for the speech portion of a real AtariVox device;
-  * support for Supercharger single-load and multi-load games;
-  * emulation of CRT TV features, including texturing, colour bleed,
-    RF noise and phosphor burn-off (requires OpenGL 2.0 and GLSL).
+  * support for Supercharger single-load and multi-load games.
  .
  An extensive debugger is included, with the Distella disassembler.
  .
diff --git a/debian/stella.6 b/debian/stella.6
index 878e33c..020539b 100644
--- a/debian/stella.6
+++ b/debian/stella.6
@@ -35,36 +35,14 @@ authentic look for NTSC, and 105 - 110 for PAL.
 .BR \-gl_fsmax " <" 1 | 0 >
 OpenGL mode only. Strech TIA image while in fullscreen mode.
 .TP
+.BR \-gl_vbo " <" 1 | 0 >
+OpenGL mode only. Use the Vertex Buffer Object extension, if
+available. This is enabled by default.
+.TP
 .BR \-gl_vsync " <" 1 | 0 >
 OpenGL mode only. Synchronize screen updates to the vertical blank
 period. This can result in smoother updates, and eliminate tearing.
 .TP
-.BR \-gl_texrect " <" 1 | 0 >
-OpenGL mode only. Enable GL_TEXTURE_RECTANGLE extension. This causes
-problems for some people using ATI video cards.
-.TP
-.BR \-tv_tex " <" off | normal | stag >
-OpenGL 2.0 mode only. Enable TV texturing. The GL_TEXTURE_RECTANGLE
-extension must be disabled for this to work correctly.
-.TP
-.BR \-tv_bleed " <" off | low | medium | high >
-OpenGL 2.0 mode only. Enable TV colour bleed emulation. A fast video
-card with at least 128MB RAM is required to use 'high'. The
-GL_TEXTURE_RECTANGLE extension must be disabled for this to work
-correctly.
-.TP
-.BR \-tv_noise " <" off | low | medium | high >
-OpenGL 2.0 mode only. Enable TV radio frequency noise emulation. A
-fast video card with at least 128MB RAM is required to use 'high'. The
-GL_TEXTURE_RECTANGLE extension must be disabled for this to work
-correctly.
-.TP
-.BR \-tv_phos " <" 1 | 0 >
-OpenGL 2.0 mode only. Enable phosphor effect of TV image. This is in
-addition to the currently emulated software phosphor effect. The
-GL_TEXTURE_RECTANGLE extension must be disabled for this to work
-correctly.
-.TP
 .BR \-tia_filter " <\fIfilter\fP>"
 Use the specified filter while in TIA/emulation mode. Currently, this
 can be \fBzoom\fP\fIZ\fP\fBx\fP, where \fIZ\fP is between 2 and 10
@@ -81,9 +59,6 @@ mode. If \fBauto\fP, let Stella decide which resolution to use.
 .BR \-center " <" 1 | 0 >
 Centers game window (if possible).
 .TP
-.BR \-grabmouse " <" 1 | 0 >
-Keeps the mouse in the game window in emulation mode.
-.TP
 .BR \-palette " <" standard | z26 | user >
 Sets the palette to either normal Stella, the one used in the \fBz26\fP
 emulator, or a user-defined palette.
@@ -136,11 +111,17 @@ experience sound issues.
 Use the specified cheatcode (see the \fICheat\fP section in the
 provided documentation for a description of cheatcodes).
 .TP
-.BR \-showinfo " <" 0 | 1 | 2 >
-Shows some application & game info on the commandline while Stella is
-running. Zero completely disables output (except for serious errors),
+.BR \-loglevel " <" 0 | 1 | 2 >
+Indicates level of logging to perform while the application is
+running. Zero completely disables logging (except for serious errors),
 while the remaining numbers show increasingly more detail.
 .TP
+.BR \-logtoconsole " <" 1 | 0 >
+Indicates that logged output should be printed to the
+console/commandline as it's being collected. An internal log will
+still be kept, and the amount of logging is still controlled
+by \fBloglevel\fP.
+.TP
 .BR \-joydeadzone " <\fInumber\fP>"
 Sets the joystick deadzone area for analog joysticks. Accepts a number
 from 0 - 29, and uses the formula 3200 + \fInumber\fP * 1000. So the
@@ -151,9 +132,14 @@ Allow all 4 directions on a joystick to be pressed
 simultaneously. Bumper Bash ignores this setting, and always allows
 all 4 directions.
 .TP
-.BR \-usemouse " <" 1 | 0 >
-Enable using the mouse for various controllers (paddle, driving,
-etc).
+.BR \-grabmouse " <" 1 | 0 >
+Keeps the mouse in the game window in emulation mode.
+.TP
+.BR \-mcontrol " <" auto | \fIXY\fP >
+Enable using the mouse axes for various controllers automatically
+(paddle, driving, etc), or specifically use each axis for a particular
+paddle. In the latter case, \fIXY\fP indicates how to use the X/Y axis
+(ie, \fB02\fP is paddle0/paddle2).
 .TP
 .BR \-dsense " <\fInumber\fP>"
 Sensitivity for emulation of paddles when using a digital device
@@ -184,18 +170,17 @@ saving a ROM state file.
 .BR \-stats " <" 1 | 0 >
 Overlay console info on the TIA image during emulation.
 .TP
-.BR \-audiofirst " <" 1 | 0 >
-Initialize the audio subsystem before video when emulating a ROM. This
-seems to be required when using ATI video cards in OpenGL mode in
-Windows. Since it doesn't hurt other systems, the default is 1.
-.TP
 .BR \-fastscbios " <" 1 | 0 >
 Disable Supercharger BIOS progress loading bars.
 .TP
-.BR \-ssdir " <\fIpath\fP>"
+.BR \-snapdir " <\fIpath\fP>"
 The directory to save snapshot files to.
 .TP
 .BR \-sssingle " <" 1 | 0 >
+Generate single snapshot instead of many, overwriting any previous
+snapshots.
+.TP
+.BR \-ss1x " <" 1 | 0 >
 Ignore any scaling applied to the TIA image, and save snapshot in
 unscaled (1x) mode.
 .TP
@@ -260,6 +245,9 @@ Set the full pathname of the ROM properties file.
 .BR \-eepromdir " <\fIdir\fP>"
 Set the directory in which to save EEPROM files.
 .TP
+.BR \-cfgdir " <\fIdir\fP>"
+Set the directory in which to access Distella config files.
+.TP
 .BR \-avoxport " <\fIname\fP>"
 Set the name of the serial port where an AtariVox is connected.
 .TP
@@ -280,6 +268,12 @@ Try to differentiate between code vs. data sections in the
 disassembler. See the \fIDebugger\fP section in the provided
 documentation for more information.
 .TP
+.BR \-gfxformat " <" 2 | 16 >
+Sets the base to use for displaying GFX sections in the disassembler.
+.TP
+.BR \-showaddr " <" 1 | 0 >
+Shows/hides opcode addresses in the disassembler.
+.TP
 .BR \-debuggerres " <\fIW\fP" x \fIH\fP>
 Set the size of the debugger window.
 .TP
@@ -301,6 +295,9 @@ Start the emulator with the left joystick button held down.
 .BR \-tiadriven " <" 1 | 0 >
 Set unused TIA pins to be randomly driven high or low on a read/peek.
 .TP
+.BR \-ramrandom " <" 1 | 0 >
+On reset, either randomize all RAM content, or zero it out instead.
+.TP
 .BR \-bs " <\fItype\fP>, " \-type " <\fItype\fP>"
 Set "Cartridge.Type" property. See the \fIGame Properties\fP section
 in the provided documentation for valid types.
@@ -352,6 +349,13 @@ Set "Display.Phosphor" property.
 .BR \-ppblend " <\fInumber\fI>"
 Set "Display.PPBlend" property, used for phosphor effect
 (0-100). Default is 77.
+.TP
+.BR \-thumb.trapfatal " <" true | false >
+The default of \fBtrue\fP allows the Thumb ARM emulation to throw an
+exception and enter the debugger on fatal errors. When disabled, such
+fatal errors are simply logged, and emulation continues. Do not use
+this unless you know exactly what you're doing, as it changes the
+behaviour as compared to real hardware.
 
 .SH KEYBOARD CONTROLS
 The Atari 2600 console controls and controllers are mapped to the

-- 
Atari 2600 Emulator for SDL & the X Window System

More information about the Pkg-games-commits mailing list