diff --git a/recipes-games/maelstrom/maelstrom/0001-Use-pkg-config-to-find-sdl.patch b/recipes-games/maelstrom/maelstrom/0001-Use-pkg-config-to-find-sdl.patch index d016027..bc9ef9f 100644 --- a/recipes-games/maelstrom/maelstrom/0001-Use-pkg-config-to-find-sdl.patch +++ b/recipes-games/maelstrom/maelstrom/0001-Use-pkg-config-to-find-sdl.patch @@ -9,26 +9,19 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller ---- - configure.in | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) -diff --git a/configure.in b/configure.in -index 0170f4b..a6f76ac 100644 ---- a/configure.in -+++ b/configure.in -@@ -47,10 +47,7 @@ AC_SUBST(INETLIB) +diff -Nurd Maelstrom-3.0.7/configure.in Maelstrom-3.0.7/configure.in +--- Maelstrom-3.0.7/configure.in 2021-02-04 19:17:55.000000000 +0200 ++++ Maelstrom-3.0.7/configure.in 2022-08-24 23:12:31.161825755 +0300 +@@ -47,10 +47,7 @@ dnl Check for SDL - SDL_VERSION=1.2.0 --AM_PATH_SDL($SDL_VERSION, + SDL_VERSION=2.0.14 +-AM_PATH_SDL2($SDL_VERSION, - :, - AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) -) -+PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION], [HAVE_SDL=yes], [AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])]) ++PKG_CHECK_MODULES([SDL], [sdl2 >= $SDL_VERSION], [HAVE_SDL=yes], [AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])]) CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" --- -2.20.1 - diff --git a/recipes-games/maelstrom/maelstrom/0003-Fix-install-dir.patch b/recipes-games/maelstrom/maelstrom/0003-Fix-install-dir.patch deleted file mode 100644 index 808da00..0000000 --- a/recipes-games/maelstrom/maelstrom/0003-Fix-install-dir.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b051343fcac17227369bc4c7e0b0b00811500e24 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 12 Feb 2019 15:06:01 +0100 -Subject: [PATCH] Fix install dir -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [Configuration] - -Signed-off-by: Andreas Müller ---- - Makefile.am | 2 +- - configure.in | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 4a9e949..a3194fc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -65,7 +65,7 @@ DIST_SUBDIRS = $(SUBDIRS) Images Docs - - # Special install rule for the game - install: -- make install_gamedata target=@GAME_INSTALLDIR@ -+ make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@ - - install_gamedata: - sh mkinstalldirs $(target)/ -diff --git a/configure.in b/configure.in -index a6f76ac..e158dd2 100644 ---- a/configure.in -+++ b/configure.in -@@ -105,6 +105,7 @@ case "$target" in - GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE" - ;; - esac -+GAME_INSTALLDIR="\$(datadir)/$PACKAGE" - AC_SUBST(GAME_INSTALLDIR) - CFLAGS="$CFLAGS -DLIBDIR=\\\"$GAME_INSTALLDIR\\\"" - --- -2.20.1 - diff --git a/recipes-games/maelstrom/maelstrom/0004-Maelstrom-3.0.6-setgid.patch b/recipes-games/maelstrom/maelstrom/0004-Maelstrom-3.0.6-setgid.patch index 9d533b1..47a53bb 100644 --- a/recipes-games/maelstrom/maelstrom/0004-Maelstrom-3.0.6-setgid.patch +++ b/recipes-games/maelstrom/maelstrom/0004-Maelstrom-3.0.6-setgid.patch @@ -13,22 +13,16 @@ Upstream-Status: Pending [1] https://src.fedoraproject.org/cgit/rpms/Maelstrom.git/tree/Maelstrom-3.0.6-setgid.patch Signed-off-by: Andreas Müller ---- - main.cpp | 8 +++++ - scores.cpp | 87 ++++++++++++++++++++++++++++++++++-------------------- - scores.h | 1 + - 3 files changed, 64 insertions(+), 32 deletions(-) -diff --git a/main.cpp b/main.cpp -index 7728c0b..851cf01 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -170,12 +170,20 @@ int main(int argc, char *argv[]) +diff -Nurd Maelstrom-3.0.7/main.cpp Maelstrom-3.0.7/main.cpp +--- Maelstrom-3.0.7/main.cpp 2021-02-04 18:50:27.000000000 +0200 ++++ Maelstrom-3.0.7/main.cpp 2022-08-24 22:46:23.571071218 +0300 +@@ -170,12 +170,20 @@ /* Command line flags */ int doprinthigh = 0; int speedtest = 0; + gid_t gid; - Uint32 video_flags = SDL_SWSURFACE; + Uint32 video_flags = SDL_WINDOW_FULLSCREEN_DESKTOP; /* Normal variables */ SDL_Event event; @@ -44,10 +38,9 @@ index 7728c0b..851cf01 100644 #ifndef __WIN95__ /* The first thing we do is calculate our checksum */ (void) checksum(); -diff --git a/scores.cpp b/scores.cpp -index 1633e8f..c8b53b5 100644 ---- a/scores.cpp -+++ b/scores.cpp +diff -Nurd Maelstrom-3.0.7/scores.cpp Maelstrom-3.0.7/scores.cpp +--- Maelstrom-3.0.7/scores.cpp 2021-02-06 07:35:46.000000000 +0200 ++++ Maelstrom-3.0.7/scores.cpp 2022-08-24 22:53:05.896048770 +0300 @@ -4,6 +4,8 @@ */ @@ -57,7 +50,7 @@ index 1633e8f..c8b53b5 100644 #include #include #endif -@@ -15,11 +17,11 @@ +@@ -15,7 +17,7 @@ #include "load.h" #include "dialog.h" @@ -66,11 +59,6 @@ index 1633e8f..c8b53b5 100644 #define NUM_SCORES 10 // Do not change this! /* Everyone can write to scores file if defined to 0 */ --#define SCORES_PERMMASK 0 -+#define SCORES_PERMMASK 002 - - #define CLR_DIALOG_WIDTH 281 - #define CLR_DIALOG_HEIGHT 111 @@ -27,10 +29,31 @@ Bool gNetScores = 0; Scores hScores[NUM_SCORES]; @@ -100,12 +88,12 @@ index 1633e8f..c8b53b5 100644 + void LoadScores(void) { -- LibPath path; +- SavePath path; - SDL_RWops *scores_src; int i; /* Try to load network scores, if we can */ -@@ -44,50 +67,50 @@ void LoadScores(void) +@@ -44,50 +67,50 @@ } memset(&hScores, 0, sizeof(hScores)); @@ -135,7 +123,7 @@ index 1633e8f..c8b53b5 100644 void SaveScores(void) { -- LibPath path; +- SavePath path; - SDL_RWops *scores_src; int i; -#ifdef unix @@ -184,10 +172,9 @@ index 1633e8f..c8b53b5 100644 } /* Just show the high scores */ -diff --git a/scores.h b/scores.h -index 4126260..4716751 100644 ---- a/scores.h -+++ b/scores.h +diff -Nurd Maelstrom-3.0.7/scores.h Maelstrom-3.0.7/scores.h +--- Maelstrom-3.0.7/scores.h 1998-07-14 04:50:17.000000000 +0300 ++++ Maelstrom-3.0.7/scores.h 2022-08-24 22:44:34.517672737 +0300 @@ -2,6 +2,7 @@ // Functions from scores.cc extern void LoadScores(void); @@ -196,6 +183,3 @@ index 4126260..4716751 100644 extern int ZapHighScores(void); extern int GetStartLevel(void); extern void PrintHighScores(void); --- -2.20.1 - diff --git a/recipes-games/maelstrom/maelstrom/0005-SDL_FrameBuf.cpp-Fix-build-for-64Bit-targets.patch b/recipes-games/maelstrom/maelstrom/0005-SDL_FrameBuf.cpp-Fix-build-for-64Bit-targets.patch deleted file mode 100644 index 8765fc1..0000000 --- a/recipes-games/maelstrom/maelstrom/0005-SDL_FrameBuf.cpp-Fix-build-for-64Bit-targets.patch +++ /dev/null @@ -1,37 +0,0 @@ -From da490238ae606cc4dcb704fb739d3e6f523b1976 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 27 Oct 2020 19:50:25 +0100 -Subject: [PATCH] SDL_FrameBuf.cpp: Fix build for 64Bit targets -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Stolen from [1] - -[1] https://src.fedoraproject.org/rpms/Maelstrom/blob/master/f/Maelstrom-3.0.6-64bit.patch - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - screenlib/SDL_FrameBuf.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/screenlib/SDL_FrameBuf.cpp b/screenlib/SDL_FrameBuf.cpp -index d1e087f..430e903 100644 ---- a/screenlib/SDL_FrameBuf.cpp -+++ b/screenlib/SDL_FrameBuf.cpp -@@ -848,8 +848,8 @@ FrameBuf:: AddDirtyRect(SDL_Rect *rect) - for ( i=0; i