[Scummvm-git-logs] scummvm master -> db3f152ca629e41c2054488c94ab83a0f097f94a

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
db3f152ca6 MorphOS: disabled detectFramebufferSupport. added MorphOS doc


Commit: db3f152ca629e41c2054488c94ab83a0f097f94a
    https://github.com/scummvm/scummvm/commit/db3f152ca629e41c2054488c94ab83a0f097f94a
Author: BeWorld (36823759+BeWorld2018 at users.noreply.github.com)
Date: 2021-10-07T16:02:29+02:00

Commit Message:
MorphOS: disabled detectFramebufferSupport. added MorphOS doc

Changed paths:
  A doc/docportal/other_platforms/morphos.rst
    backends/platform/sdl/sdl.cpp
    doc/docportal/index.rst


diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index eb3b6302d1..b5f231c742 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -319,7 +319,7 @@ void OSystem_SDL::detectFramebufferSupport() {
 #if defined(USE_GLES2)
 	// Framebuffers are always available with GLES2
 	_supportsFrameBuffer = true;
-#elif !defined(AMIGAOS)
+#elif !defined(AMIGAOS) && !defined(__MORPHOS__)
 	// Spawn a 32x32 window off-screen with a GL context to test if framebuffers are supported
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_Window *window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 32, 32, SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN);
diff --git a/doc/docportal/index.rst b/doc/docportal/index.rst
index 2783bc11ef..2dde41fe79 100644
--- a/doc/docportal/index.rst
+++ b/doc/docportal/index.rst
@@ -170,6 +170,8 @@ We also have guides on how to get ScummVM running on a wide range of other platf
 
       :doc:`other_platforms/atari`
 
+      :doc:`other_platforms/morphos`
+
       :doc:`other_platforms/risc_os`
 
 
diff --git a/doc/docportal/other_platforms/morphos.rst b/doc/docportal/other_platforms/morphos.rst
new file mode 100644
index 0000000000..dd101bb3ac
--- /dev/null
+++ b/doc/docportal/other_platforms/morphos.rst
@@ -0,0 +1,72 @@
+=============================
+MorphOS
+=============================
+
+This page contains all the information you need to get ScummVM up and running on MorphOS.
+
+What you'll need
+===================
+
+- A system running MorphOS 3.15
+- SDL2 library installed, download last version : <https://www.morphos-storage.net/?find=SDL_2>
+
+Installing ScummVM
+=====================================
+
+ScummVM is available for download from the `ScummVM Downloads page <https://www.scummvm.org/downloads/>`_ or the `MorphOS Storage <https://www.morphos-storage.net/?find=scummvm>`_.
+
+Download and extract the ``.lha`` file.
+
+Transferring game files
+=========================
+
+For games on PC or Mac formatted discs, use the original platform to access the data files, and then transfer these to Amiga. Alternatively, if you have external hardware such as a Catweazel floppy disc controller, you might be able to use this to access the files.
+
+ScummVM for MorphOS has Cloud and LAN functionality, to help manage the transfer of files. See :doc:`../use_scummvm/connect_cloud` and :doc:`../use_scummvm/LAN`.
+
+See :doc:`../use_scummvm/game_files` for more information about game file requirements.
+
+Controls
+=================
+
+Controls can be manually configured in the :doc:`Keymaps tab <../settings/keymaps>`. See the :doc:`../use_scummvm/keyboard_shortcuts` page for common default keyboard shortcuts.
+
+
+Paths
+=======
+
+Saved games
+*******************
+``PROGDIR:saves``
+
+Configuration file
+**************************
+``PROGDIR:scummvm.ini``
+
+
+Settings
+==========
+
+For more information about Settings, see the Settings section of the documentation. Only platform-specific differences are listed here.
+
+Audio
+******
+
+Supported devices:
+- MT-32 emulator
+- FluidSynth (General MIDI emulator)
+- AdLib emulator
+- CAMD: The CAMD driver allows the use of MIDI hardware. Select CAMD as the :ref:`Preferred device <device>`.
+
+Supported audio file formats:
+- MP3
+- OGG
+- FLAC
+- Uncompressed audio
+
+Known issues
+==============
+
+Due to the big-endian nature of Amiga OS, there can sometimes be graphics and sounds issues with games. Check out the Platform Overview `wiki page <https://wiki.scummvm.org/index.php?title=Platforms/Overview>`_ for a list of compatible engines.
+
+If a game crashes and it's listed as compatible, report it as a :doc:`bug <../help/report_bugs>`.