tk/androidwish: actually disable OpenGL

Fixes #8370

dev-lang/tk/patches/tk-8.6.10.patchset

@@ -1,4 +1,4 @@
-From 0a9f983ba0dcb10cac6559810e0f8f70f30f26aa Mon Sep 17 00:00:00 2001
+From 64afbdd055993336fe6299e76ba3ea6b93976f85 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Wed, 17 Nov 2021 17:42:17 -0500
 Subject: Fixes for Haiku.
@@ -186,10 +186,10 @@ index e40eab2..e2ae821 100644
       * We need the SDL event handling run in the main thread,
       * which seems to be a Cocoa requirement. Therefore Tk_MainEx()
 -- 
-2.36.1
+2.43.2
 
 
-From e52458cf0424ef1318143c41cc816101ff6678b7 Mon Sep 17 00:00:00 2001
+From 57f044b7d6df6656226d5cf5745178e499caa00d Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Thu, 12 May 2022 14:20:59 +0200
 Subject: tk fails to find freetype's header ft2build.h
@@ -221,5 +221,52 @@ index 691c0cd..889c7f0
  { $as_echo "$as_me:$LINENO: result: $found_ft" >&5
  $as_echo "$found_ft" >&6; }
 -- 
-2.36.1
+2.43.2
+
+
+From e15ad2ac1ef61740ada5ff76598567c778e15c00 Mon Sep 17 00:00:00 2001
+From: PulkoMandy <pulkomandy@pulkomandy.tk>
+Date: Sun, 24 Mar 2024 16:54:29 +0100
+Subject: Disable framebuffer acceleration
+
+The code in SDL-TK tries very hard to disable OpenGL, but framebuffer
+acceleration is implemented with OpenGL and so it ends up being enabled
+anyways.
+
+diff --git a/sdl/SdlTkX.c b/sdl/SdlTkX.c
+index 78f102d..6c4489d 100644
+--- a/sdl/SdlTkX.c
++++ b/sdl/SdlTkX.c
+@@ -5723,6 +5723,9 @@ PerformSDLInit(int *root_width, int *root_height)
+     }
+ #endif
+     SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1");
++#ifdef __HAIKU__
++    SDL_SetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION, "0");
++#endif
+ retryInit:
+ #endif
+     if (SDL_Init(initMask) < 0) {
+@@ -5763,8 +5766,6 @@ fatal:
+ 	SdlTkX.arg_nogl = 1;
+ 	SdlTkX.arg_resizable = 1;
+ 	SdlTkX.arg_swcursor = 1;
+-	width = 800;
+-	height = 600;
+ #endif
+ 
+     /* Preset some defaults. */
+@@ -5800,10 +5801,8 @@ fatal:
+     if (SdlTkX.arg_noborder) {
+ 	videoFlags |= SDL_WINDOW_BORDERLESS;
+     }
+-#ifndef __HAIKU__
+     width = 1024;
+     height = 768;
+-#endif
+     /*
+      * Start the root window hidden since font init
+      * may take some time. At end of font init in
+-- 
+2.43.2
 

dev-lang/tk/tk-8.6.10.recipe

@@ -9,7 +9,7 @@ This package is based on UndroidWish, a SDL2-based Tk port."
 HOMEPAGE="https://www.androwish.org"
 COPYRIGHT="Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, and other parties"
 LICENSE="TCL"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="http://androwish.org/download/androwish-c48f047f5b.tar.gz"
 CHECKSUM_SHA256="4ecbc23193cb00b9fc34c0942e2327f0b6badbe587ab574b492780994707683d"
 SOURCE_DIR="androwish-c48f047f5b/jni/sdl2tk/"