summaryrefslogtreecommitdiff
path: root/Ports
diff options
context:
space:
mode:
authorEWouters <6179932+EWouters@users.noreply.github.com>2022-04-01 04:59:20 +0200
committerBrian Gianforcaro <b.gianfo@gmail.com>2022-04-11 19:43:56 -0700
commitd89a58216d08f643d47f0115ec02806569fb7ac2 (patch)
tree1dcd47ad77518950fd9d065c8ff486bf7871d901 /Ports
parentd6ce3a842c437c5d1f95ede322150ffbf84a154c (diff)
downloadserenity-d89a58216d08f643d47f0115ec02806569fb7ac2.zip
Ports/pt2-clone: Update pt2-clone to version 1.43
Upgrade patches to git style, add ReadMe.md and remove from the list of ports missing descriptions.
Diffstat (limited to 'Ports')
-rw-r--r--Ports/AvailablePorts.md2
-rwxr-xr-xPorts/pt2-clone/package.sh4
-rw-r--r--Ports/pt2-clone/patches/0001-Remove-output-path-from-CMakeLists.patch24
-rw-r--r--Ports/pt2-clone/patches/0002-Hacky-Mouse.patch26
-rw-r--r--Ports/pt2-clone/patches/CMakeLists_outputpath.patch10
-rw-r--r--Ports/pt2-clone/patches/ReadMe.md13
-rw-r--r--Ports/pt2-clone/patches/hackyMouse.patch11
7 files changed, 66 insertions, 24 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index fdb724c212..04f6d0db73 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -171,7 +171,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`SDLPoP`](SDLPoP/) | Prince of Persia game | | https://github.com/NagyD/SDLPoP |
| [`sparsehash`](sparsehash/) | Google's C++ associative containers | 2.0.4 | https://github.com/sparsehash/sparsehash |
| [`printf`](printf/) | printf (OpenBSD) | 6.6 | https://github.com/ibara/libpuffy |
-| [`pt2-clone`](pt2-clone/) | ProTracker 2 clone | 1.28 | https://github.com/8bitbubsy/pt2-clone |
+| [`pt2-clone`](pt2-clone/) | ProTracker 2 clone | 1.43 | https://github.com/8bitbubsy/pt2-clone |
| [`pv`](pv/) | Pipe Viewer | 1.6.20 | http://www.ivarch.com/programs/pv.shtml |
| [`python3`](python3/) | Python | 3.10.3 | https://www.python.org/ |
| [`qt6-qtbase`](qt6-qtbase/) | Qt6 QtBase | 6.2.3 | https://qt.io |
diff --git a/Ports/pt2-clone/package.sh b/Ports/pt2-clone/package.sh
index 542e77a577..51e9e68026 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.28
+version=1.43
useconfigure=true
-files="https://github.com/8bitbubsy/pt2-clone/archive/v${version}.tar.gz v${version}.tar.gz a3ce83e326d94f1abf6dd75fb788fe508922818c08e6f988155df9ed288f180e"
+files="https://github.com/8bitbubsy/pt2-clone/archive/v${version}.tar.gz v${version}.tar.gz 760c1545105fbf3798fd101c6f213e0fd60943869023ef735f16f4b35221e007"
auth_type=sha256
configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
depends=("SDL2")
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
new file mode 100644
index 0000000000..20d471d7bf
--- /dev/null
+++ b/Ports/pt2-clone/patches/0001-Remove-output-path-from-CMakeLists.patch
@@ -0,0 +1,24 @@
+From cffb5fae8afd6a7272fd71665882b2b41b756d13 Mon Sep 17 00:00:00 2001
+From: EWouters <6179932+EWouters@users.noreply.github.com>
+Date: Tue, 5 Apr 2022 14:41:31 +0200
+Subject: [PATCH 1/2] Remove output path from CMakeLists
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b391653..0d42019 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -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"
+--
+2.32.0 (Apple Git-132)
+
diff --git a/Ports/pt2-clone/patches/0002-Hacky-Mouse.patch b/Ports/pt2-clone/patches/0002-Hacky-Mouse.patch
new file mode 100644
index 0000000000..1c44c848af
--- /dev/null
+++ b/Ports/pt2-clone/patches/0002-Hacky-Mouse.patch
@@ -0,0 +1,26 @@
+From eec08d29c64513c6ebba4af8a367c61aa7bfa1fa 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 2/2] 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 40527f5..0b73b9a 100644
+--- a/src/pt2_visuals.c
++++ b/src/pt2_visuals.c
+@@ -2416,7 +2416,7 @@ bool setupVideo(void)
+ SDL_ShowCursor(SDL_FALSE);
+
+ // 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;
+--
+2.32.0 (Apple Git-132)
+
diff --git a/Ports/pt2-clone/patches/CMakeLists_outputpath.patch b/Ports/pt2-clone/patches/CMakeLists_outputpath.patch
deleted file mode 100644
index b44fbf3ac6..0000000000
--- a/Ports/pt2-clone/patches/CMakeLists_outputpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pt2-clone-1.28/CMakeLists.txt 2021-01-01 20:48:32.000000000 +0100
-+++ pt2-clone-1.28D/CMakeLists.txt 2021-01-22 13:59:34.871852522 +0100
-@@ -3,7 +3,6 @@
- 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"
diff --git a/Ports/pt2-clone/patches/ReadMe.md b/Ports/pt2-clone/patches/ReadMe.md
new file mode 100644
index 0000000000..ca9c40a53f
--- /dev/null
+++ b/Ports/pt2-clone/patches/ReadMe.md
@@ -0,0 +1,13 @@
+# Patches for pt2-clone on SerenityOS
+
+## `0001-Remove-output-path-from-CMakeLists.patch`
+
+Remove output path from CMakeLists
+
+
+## `0002-Hacky-Mouse.patch`
+
+Hacky Mouse
+
+Set video.useDesktopMouseCoords to false.
+
diff --git a/Ports/pt2-clone/patches/hackyMouse.patch b/Ports/pt2-clone/patches/hackyMouse.patch
deleted file mode 100644
index 06c407b344..0000000000
--- a/Ports/pt2-clone/patches/hackyMouse.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pt2-clone-1.28/src/pt2_visuals.c 2021-01-22 17:55:51.038785767 +0100
-+++ pt2-clone-1.28/src/pt2_visuals.c.og 2021-01-22 17:55:12.287382000 +0100
-@@ -2426,7 +2426,7 @@
- SDL_ShowCursor(SDL_FALSE);
-
- // Workaround: SDL_GetGlobalMouseState() doesn't work with KMSDRM
-- video.useDesktopMouseCoords = true;
-+ video.useDesktopMouseCoords = false;
- const char *videoDriver = SDL_GetCurrentVideoDriver();
- if (videoDriver != NULL && strcmp("KMSDRM", videoDriver) == 0)
- video.useDesktopMouseCoords = true;