diff --git a/Ports/brogue/patches/0001-Install-the-game-data-to-usr-local.patch b/Ports/brogue/patches/0001-Install-the-game-data-to-usr-local.patch new file mode 100644 index 0000000000..518ce59544 --- /dev/null +++ b/Ports/brogue/patches/0001-Install-the-game-data-to-usr-local.patch @@ -0,0 +1,23 @@ +From c0fa4cf699ff2f02d9f976deed689d968093313c Mon Sep 17 00:00:00 2001 +From: nooga +Date: Sat, 15 May 2021 01:21:59 +0200 +Subject: [PATCH 1/2] Install the game data to /usr/local + +--- + config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.mk b/config.mk +index b33967b..9655958 100644 +--- a/config.mk ++++ b/config.mk +@@ -1,5 +1,5 @@ + # Where to look for game data files (found in 'bin'). Must be without trailing slashes! +-DATADIR := . ++DATADIR := /usr/local/share/games/brogue + + # Include terminal support. Requires ncurses + TERMINAL := NO +-- +2.36.1 + diff --git a/Ports/brogue/patches/0002-Use-pkg-config-for-SDL2.patch b/Ports/brogue/patches/0002-Use-pkg-config-for-SDL2.patch new file mode 100644 index 0000000000..f8c59c6fc1 --- /dev/null +++ b/Ports/brogue/patches/0002-Use-pkg-config-for-SDL2.patch @@ -0,0 +1,25 @@ +From f74e17de5c426ae49522008cb5b5d24571345630 Mon Sep 17 00:00:00 2001 +From: nooga +Date: Sat, 15 May 2021 01:21:59 +0200 +Subject: [PATCH 2/2] Use pkg-config for SDL2 + +--- + config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.mk b/config.mk +index 9655958..0ce2e55 100644 +--- a/config.mk ++++ b/config.mk +@@ -7,7 +7,7 @@ TERMINAL := NO + # Include graphical support. Requires SDL2 and SDL2_image + GRAPHICS := YES + # Path to sdl2-config script +-SDL_CONFIG := sdl2-config ++SDL_CONFIG := pkg-config sdl2 + + # Select web brogue mode. Requires POSIX system. + WEBBROGUE := NO +-- +2.36.1 + diff --git a/Ports/brogue/patches/ReadMe.md b/Ports/brogue/patches/ReadMe.md index 29527c4be3..f76f84ebb5 100644 --- a/Ports/brogue/patches/ReadMe.md +++ b/Ports/brogue/patches/ReadMe.md @@ -1,5 +1,12 @@ -# Patches for brogue +# Patches for brogue on SerenityOS + +## `0001-Install-the-game-data-to-usr-local.patch` + +Install the game data to /usr/local + + +## `0002-Use-pkg-config-for-SDL2.patch` + +Use pkg-config for SDL2 -## `config.patch` -Switches the DATADIR to the installed directory. diff --git a/Ports/brogue/patches/config.patch b/Ports/brogue/patches/config.patch deleted file mode 100644 index 8397770fdf..0000000000 --- a/Ports/brogue/patches/config.patch +++ /dev/null @@ -1,22 +0,0 @@ -:100644 100644 0000000000 0000000000 M config.mk.orig - -diff --git a/config.mk.orig b/config.mk -index b33967bf2c..d2b07a8ade 100644 ---- a/config.mk.orig -+++ b/config.mk -@@ -1,5 +1,5 @@ - # Where to look for game data files (found in 'bin'). Must be without trailing slashes! --DATADIR := . -+DATADIR := /usr/local/share/games/brogue - - # Include terminal support. Requires ncurses - TERMINAL := NO -@@ -7,7 +7,7 @@ TERMINAL := NO - # Include graphical support. Requires SDL2 and SDL2_image - GRAPHICS := YES - # Path to sdl2-config script --SDL_CONFIG := sdl2-config -+SDL_CONFIG := pkg-config sdl2 - - # Select web brogue mode. Requires POSIX system. - WEBBROGUE := NO