diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 47b1d968708..1cad813219c 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -281,7 +281,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`prboom-plus`](prboom-plus/) | PrBoom+ | 2.6.66 | https://prboom-plus.sourceforge.io/ | | [`printf`](printf/) | printf (OpenBSD) | 6.6 | https://github.com/ibara/libpuffy | | [`protobuf`](protobuf/) | Protocol Buffers | 36.2 | https://protobuf.dev/ | -| [`pt2-clone`](pt2-clone/) | ProTracker 2 clone | 1.63 | https://github.com/8bitbubsy/pt2-clone | +| [`pt2-clone`](pt2-clone/) | ProTracker 2 clone | 1.92 | https://github.com/8bitbubsy/pt2-clone | | [`pv`](pv/) | Pipe Viewer | 1.12.0 | http://www.ivarch.com/programs/pv.shtml | | [`python3`](python3/) | Python | 3.15.0 | https://www.python.org/ | | [`qemu`](qemu/) | QEMU | 11.1.2 | https://qemu.org | diff --git a/Ports/pt2-clone/package.sh b/Ports/pt2-clone/package.sh index 4dd64eac17b..10250af967b 100755 --- a/Ports/pt2-clone/package.sh +++ b/Ports/pt2-clone/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port='pt2-clone' -version='1.63' +version='1.92' files=( - "https://github.com/8bitbubsy/pt2-clone/archive/v${version}.tar.gz#3834da77ef5d84fcf0ff2531dbb21283aa62a8bcbbf46e55c7317f3ce1adfd47" + "https://github.com/8bitbubsy/pt2-clone/archive/v${version}.tar.gz#21a27f87f44aef6421f7cfa6fc9925e783dba88c6c2270c1170360639ed8d620" ) useconfigure='true' depends=( diff --git a/Ports/pt2-clone/patches/0001-Remove-output-path-from-CMakeLists.patch b/Ports/pt2-clone/patches/0001-Remove-output-path-from-CMakeLists.patch index 409f9e8f2af..7dfe085e8d9 100644 --- a/Ports/pt2-clone/patches/0001-Remove-output-path-from-CMakeLists.patch +++ b/Ports/pt2-clone/patches/0001-Remove-output-path-from-CMakeLists.patch @@ -8,14 +8,14 @@ Subject: [PATCH] Remove output path from CMakeLists 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70e74b6b6a032a95720eb956115383dee949677d..c631945566dd2bb84f4f92f8dfad1a6186492489 100644 +index d5c9ccf4e170dae5fbac520fb2ed4d8c4d56c4d9..fba8198c063edf108a9e93ec4a8670e55c13bbd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -5,7 +5,6 @@ project(pt2-clone) - option(EXTERNAL_LIBFLAC "use external(system) flac library" OFF) +@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.7) + project(pt2-clone) find_package(SDL2 REQUIRED) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${pt2-clone_SOURCE_DIR}/release/other/") - file(GLOB pt2-clone_SRC - "${pt2-clone_SOURCE_DIR}/src/*.c" + if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "GNU")) + add_compile_options(-O3) diff --git a/Ports/pt2-clone/patches/0002-Hacky-Mouse.patch b/Ports/pt2-clone/patches/0002-Hacky-Mouse.patch deleted file mode 100644 index 1df94855aea..00000000000 --- a/Ports/pt2-clone/patches/0002-Hacky-Mouse.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: EWouters <6179932+EWouters@users.noreply.github.com> -Date: Tue, 5 Apr 2022 14:55:01 +0200 -Subject: [PATCH] Hacky Mouse - -Set video.useDesktopMouseCoords to false. ---- - src/pt2_visuals.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pt2_visuals.c b/src/pt2_visuals.c -index 012a2d7e2b5acad85aeadff43938dc175c6772cb..dcc7bef94d884cffedd60e9f1153a72050caf017 100644 ---- a/src/pt2_visuals.c -+++ b/src/pt2_visuals.c -@@ -1980,7 +1980,7 @@ bool setupVideo(void) - } - - // Workaround: SDL_GetGlobalMouseState() doesn't work with KMSDRM/Wayland -- video.useDesktopMouseCoords = true; -+ video.useDesktopMouseCoords = false; - const char *videoDriver = SDL_GetCurrentVideoDriver(); - if (videoDriver != NULL && (strcmp("KMSDRM", videoDriver) == 0 || strcmp("wayland", videoDriver) == 0)) - video.useDesktopMouseCoords = false; diff --git a/Ports/pt2-clone/patches/ReadMe.md b/Ports/pt2-clone/patches/ReadMe.md index ca9c40a53fb..90f25173764 100644 --- a/Ports/pt2-clone/patches/ReadMe.md +++ b/Ports/pt2-clone/patches/ReadMe.md @@ -5,9 +5,3 @@ Remove output path from CMakeLists -## `0002-Hacky-Mouse.patch` - -Hacky Mouse - -Set video.useDesktopMouseCoords to false. -