From 7aaad8a7a8d8633ada339e041fd9abaaa1782768 Mon Sep 17 00:00:00 2001 From: lhw828 Date: Wed, 2 Aug 2023 15:04:58 +0800 Subject: [PATCH 1/4] freedink:bump to 109.6 --- games/freedink/DETAILS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games/freedink/DETAILS b/games/freedink/DETAILS index c862039dd06..8f47cdb7c9e 100644 --- a/games/freedink/DETAILS +++ b/games/freedink/DETAILS @@ -1,12 +1,12 @@ MODULE=freedink # Also check for freedink-data version. They are not always the same. - VERSION=108.4 + VERSION=109.6 SOURCE=${MODULE}-${VERSION}.tar.gz - SOURCE_URL=http://ftp.gnu.org/gnu/freedink/ - SOURCE_VFY=sha256:82cfb2e019e78b6849395dc4750662b67087d14f406d004f6d9e39e96a0c8521 + SOURCE_URL=https://ftp.gnu.org/gnu/freedink/ + SOURCE_VFY=sha256:5e0b35ac8f46d7bb87e656efd5f9c7c2ac1a6c519a908fc5b581e52657981002 WEB_SITE=http://www.gnu.org/software/freedink/index.html ENTERED=20130822 - UPDATED=20181225 + UPDATED=20230802 SHORT="A version of the Dink Smallwood game engine" cat < Date: Wed, 2 Aug 2023 15:07:32 +0800 Subject: [PATCH 2/4] freedink-data:bump to 1.08.20190120 --- games/freedink-data/DETAILS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games/freedink-data/DETAILS b/games/freedink-data/DETAILS index a4c60b4d757..368d12431ce 100644 --- a/games/freedink-data/DETAILS +++ b/games/freedink-data/DETAILS @@ -1,12 +1,12 @@ MODULE=freedink-data # Also check for freedink version. They are not always the same. - VERSION=1.08.20170409 + VERSION=1.08.20190120 SOURCE=${MODULE}-${VERSION}.tar.gz SOURCE_URL=https://ftp.gnu.org/gnu/freedink/ SOURCE_VFY=sha256:e1f1e23c7846bc74479610a65cc0169906e844c5193f0d83ba69accc54a3bdf5 WEB_SITE=https://www.gnu.org/software/freedink/index.html ENTERED=20130822 - UPDATED=20181225 + UPDATED=20230802 SHORT="A version of the Dink Smallwood game engine data" ARCHIVE=off cat < Date: Wed, 2 Aug 2023 15:08:46 +0800 Subject: [PATCH 3/4] fix hash --- games/freedink-data/DETAILS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/freedink-data/DETAILS b/games/freedink-data/DETAILS index 368d12431ce..f5022c716c7 100644 --- a/games/freedink-data/DETAILS +++ b/games/freedink-data/DETAILS @@ -3,7 +3,7 @@ VERSION=1.08.20190120 SOURCE=${MODULE}-${VERSION}.tar.gz SOURCE_URL=https://ftp.gnu.org/gnu/freedink/ - SOURCE_VFY=sha256:e1f1e23c7846bc74479610a65cc0169906e844c5193f0d83ba69accc54a3bdf5 + SOURCE_VFY=sha256:715f44773b05b73a9ec9b62b0e152f3f281be1a1512fbaaa386176da94cffb9d WEB_SITE=https://www.gnu.org/software/freedink/index.html ENTERED=20130822 UPDATED=20230802 From 28780bbf5374c7f649a9e19be178cb7d6a0ec862 Mon Sep 17 00:00:00 2001 From: Stephane Fontaine Date: Tue, 20 Aug 2024 03:18:42 -0400 Subject: [PATCH 4/4] freedink: fix build --- games/freedink/BUILD | 2 ++ games/freedink/DETAILS | 2 +- games/freedink/PRE_BUILD | 3 +++ .../patch.d/001-const_gfx_fonts.patch | 20 +++++++++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 games/freedink/PRE_BUILD create mode 100644 games/freedink/patch.d/001-const_gfx_fonts.patch diff --git a/games/freedink/BUILD b/games/freedink/BUILD index 1eae156385a..349cbc8d2f5 100644 --- a/games/freedink/BUILD +++ b/games/freedink/BUILD @@ -1 +1,3 @@ +OPTS+=" --disable-tests" + default_game_build diff --git a/games/freedink/DETAILS b/games/freedink/DETAILS index 8f47cdb7c9e..f0ba481fe7c 100644 --- a/games/freedink/DETAILS +++ b/games/freedink/DETAILS @@ -2,7 +2,7 @@ # Also check for freedink-data version. They are not always the same. VERSION=109.6 SOURCE=${MODULE}-${VERSION}.tar.gz - SOURCE_URL=https://ftp.gnu.org/gnu/freedink/ + SOURCE_URL=$GNU_URL/freedink/ SOURCE_VFY=sha256:5e0b35ac8f46d7bb87e656efd5f9c7c2ac1a6c519a908fc5b581e52657981002 WEB_SITE=http://www.gnu.org/software/freedink/index.html ENTERED=20130822 diff --git a/games/freedink/PRE_BUILD b/games/freedink/PRE_BUILD new file mode 100644 index 00000000000..de12ad6f5ac --- /dev/null +++ b/games/freedink/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && + +sedit 's@SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH@//&@' src/input.cpp diff --git a/games/freedink/patch.d/001-const_gfx_fonts.patch b/games/freedink/patch.d/001-const_gfx_fonts.patch new file mode 100644 index 00000000000..8b3224d9dfe --- /dev/null +++ b/games/freedink/patch.d/001-const_gfx_fonts.patch @@ -0,0 +1,20 @@ + src/gfx_fonts.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gfx_fonts.cpp b/src/gfx_fonts.cpp +index b00816e..2cedd8a 100644 +--- a/src/gfx_fonts.cpp ++++ b/src/gfx_fonts.cpp +@@ -293,10 +293,10 @@ void set_font_color(int no, int r, int g, int b) + */ + void setup_font(TTF_Font *font) + { +- char *familyname = TTF_FontFaceFamilyName(font); ++ const char *familyname = TTF_FontFaceFamilyName(font); + if(familyname) + log_info("The family name of the face in the font is: %s", familyname); +- char *stylename = TTF_FontFaceStyleName(font); ++ const char *stylename = TTF_FontFaceStyleName(font); + if(stylename) + log_info("The name of the face in the font is: %s", stylename); + log_info("The font max height is: %d", TTF_FontHeight(font));