Explorar el Código

Ports/sdl12-compat: Update to version 1.2.56

Tim Schumacher hace 2 años
padre
commit
b288cd6976

+ 1 - 1
Ports/AvailablePorts.md

@@ -212,7 +212,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`ruby`](ruby/)                                     | Ruby                                                            | 3.0.4                    | https://www.ruby-lang.org/                                                     |
 | [`sam`](sam/)                                       | Software Automatic Mouth (SAM)                                  | c86ea39                  | https://github.com/vidarh/SAM                                                  |
 | [`scummvm`](scummvm/)                               | ScummVM                                                         | 2.6.0                    | https://www.scummvm.org/                                                       |
-| [`sdl12-compat`](sdl12-compat/)                     | SDL2 compatibility layer for SDL 1.2 games                      | 1.2.52                   | https://github.com/libsdl-org/sdl12-compat/                                    |
+| [`sdl12-compat`](sdl12-compat/)                     | SDL2 compatibility layer for SDL 1.2 games                      | 1.2.56                   | https://github.com/libsdl-org/sdl12-compat/                                    |
 | [`SDL2`](SDL2/)                                     | Simple DirectMedia Layer (SDL2)                                 | 2.24.0                   | https://github.com/libsdl-org/SDL                                              |
 | [`SDL2-GNUBoy`](SDL2-GNUBoy/)                       | SDL2 GNUBoy                                                     | 1.2.1                    | https://github.com/AlexOberhofer/SDL2-GNUBoy                                   |
 | [`SDL2_gfx`](SDL2_gfx/)                             | SDL2\_gfx (Graphics primitives add-on for SDL2)                 | 1.0.4                    | https://sourceforge.net/projects/sdl2gfx/                                      |

+ 11 - 7
Ports/sdl12-compat/package.sh

@@ -1,12 +1,16 @@
 #!/usr/bin/env -S bash ../.port_include.sh
-port=sdl12-compat
-version=1.2.52
+port='sdl12-compat'
+version='1.2.56'
 workdir=sdl12-compat-release-${version}
-useconfigure=true
-files="https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-${version}.tar.gz ${port}-${version}.tar.gz 5bd7942703575554670a8767ae030f7921a0ac3c5e2fd173a537b7c7a8599014"
-auth_type=sha256
-
-configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=${SERENITY_INSTALL_ROOT}/usr/local/" "-B./build")
+useconfigure='true'
+files="https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-${version}.tar.gz ${port}-${version}.tar.gz f62f3e15f95aade366ee6c03f291e8825c4689390a6be681535259a877259c58"
+auth_type='sha256'
+configopts=(
+    "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DCMAKE_INSTALL_PREFIX=${SERENITY_INSTALL_ROOT}/usr/local/"
+    "-B./build"
+)
 depends=("SDL2")
 
 configure() {

+ 8 - 8
Ports/sdl12-compat/patches/0001-Disable-forced-fullscreen-on-logical-scaling.patch

@@ -12,15 +12,15 @@ but disabling fullscreen at this point fixes the flickering.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
-index b3a411e..4d8001d 100644
+index 2dddc16937882f66c315f099f506704851b32d8e..57ace97794e7507d228f1dd076202d3aa22810c6 100644
 --- a/src/SDL12_compat.c
 +++ b/src/SDL12_compat.c
-@@ -5184,7 +5184,7 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags12)
-                 fullscreen_flags20 &= ~SDL_WINDOW_FULLSCREEN_DESKTOP;
-                 SDL20_SetWindowFullscreen(VideoWindow20, fullscreen_flags20);
-                 SDL20_SetWindowSize(VideoWindow20, width, height);
--                fullscreen_flags20 |= SDL_WINDOW_FULLSCREEN;
-+                /* fullscreen_flags20 |= SDL_WINDOW_FULLSCREEN; */
+@@ -5894,7 +5894,7 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags12)
                  SDL20_SetWindowFullscreen(VideoWindow20, fullscreen_flags20);
+                 SDL20_SetWindowSize(VideoWindow20, width, height);  /* not scaled_width, scaled_height */
+                 if (was_fullscreen) {
+-                    fullscreen_flags20 |= SDL_WINDOW_FULLSCREEN;
++                    /* fullscreen_flags20 |= SDL_WINDOW_FULLSCREEN; */
+                     SDL20_SetWindowFullscreen(VideoWindow20, fullscreen_flags20);
+                 }
              }
-         }