handle no fd patch for 3.12

Author: pmp-p

scripts/emsdk-fetch.sh

@@ -53,6 +53,7 @@ then
         ALL="$ALL struct_info libfetch zlib bzip2"
         ALL="$ALL libpng libjpeg freetype harfbuzz"
         ALL="$ALL sdl2 sdl2_mixer sdl2_gfx sdl2_ttf"
+        ALL="$ALL libsqlite3"
 
         echo "
         * building third parties libraries for emsdk ( can take time ... )

support/__EMSCRIPTEN__.overlay/pygame/wasm_patches.py

@@ -44,6 +44,18 @@ async def fire_event():
 
 pygame.time.set_timer = patch_set_timer
 
+# ====================================================================
+# pygame.quit is too hard on gc, and re-importing pygame is problematic
+# if interpreter is not fully renewed.
+# so just clear screen cut music and hope for the best.
+
+def pygame_quit():
+    pygame.mixer.music.stop()
+    pygame.display.update()
+
+pygame.quit = pygame_quit
+
+
 
 # ====================================================================
 print("\n\n")

support/__EMSCRIPTEN__.sh

@@ -8,7 +8,10 @@ then
     echo __EMSCRIPTEN__ support already added
 else
     pushd src/cpython
-
+    if echo $PYBUILD |grep -q 3.12$
+    then
+        echo 3.12 does not need patching for interactive FD
+    else
     patch -p1 <<END
 diff --git a/Parser/pegen_errors.c b/Parser/pegen_errors.c
 index 489699679633e..78266f712c05c 100644
@@ -24,7 +27,7 @@ index 489699679633e..78266f712c05c 100644
      char *cur_line = p->tok->fp_interactive ? p->tok->interactive_src_start : p->tok->str;
      if (cur_line == NULL) {
 END
-
+    fi
 
     # fix the main startup to it gets a minimal kernel for wasm
     cat > Programs/python.c <<END

support/cross/__EMSCRIPTEN__.py

@@ -217,10 +217,10 @@ def fix_preload_table():
     global prelist, preloadedWasm, preloadedImages, preloadedAudios
 
     if embed.counter() < 0:
-        pdb("asset manager not ready 0>", embed.counter())
-        aio.defer(fix_preload_table, deadline=60)
+        pdb("220: asset manager not ready 0>", embed.counter())
+        aio.defer(fix_preload_table, (), {}, delay=60)
     else:
-        pdb("all assets were ready at", embed.counter())
+        pdb("223: all assets were ready at", embed.counter())
 
     for (
         src,
@@ -314,12 +314,12 @@ def runmain(py):
                         # __main__.setup()
                         # aio.steps.append(__main__.loop)
 
-                print(f"320: running {sys.argv[0]}.py as main (deferred)")
+                print(f"317: running main.py for {sys.argv[0]} (deferred)")
                 aio.defer(runmain, ["main.py"], {})
             else:
                 pdb(f"no main found for {sys.argv[0]} in {ROOTDIR}")
 
-            aio.defer(embed.prompt,(),{},2000)
+            aio.defer(embed.prompt, (), {}, delay=2000)
 
         # C should unlock aio loop when preload count reach 0.
 
@@ -333,7 +333,7 @@ def fix_preload_table_apk():
         # unlock embed looper because no preloading
         embed.run()
 
-    aio.defer(fix_preload_table_apk, deadline=1000)
+    aio.defer(fix_preload_table_apk, (), {}, delay=1000)
 
     # go pods !
     aio.started = True

support/cross/aio/__init__.py

@@ -145,12 +145,12 @@ def overloaded(i, *attrs):
 sys.modules["asyncio"] = __import__(__name__)
 
 
-def defer(fn, argv=(), kw={}, deadline=0, framerate=60):
+def defer(fn, argv=(), kw={}, delay=0, framerate=60):
     global ticks, oneshots
     # FIXME: set ticks + deadline for alarm
     oneshots.append(
         [
-            ticks + int(deadline / framerate),
+            ticks + int(delay / framerate),
             fn,
             argv,
             kw,
@@ -283,8 +283,11 @@ def run(coro, *, debug=False):
     if coro is not None:
         task = loop.create_task(coro)
         _set_task_name(task, coro.__name__)
-        if debug:
-            pdb("251: task [", coro.__name__, "] added")
+        if __EMSCRIPTEN__ and ("pygame" in sys.modules):
+            if not aio.cross.simulator:
+                pdb("280: window_resize")
+                aio.defer(__EMSCRIPTEN__.window.window_resize, (), {}, delay=100)
+            pdb("290: task [", coro.__name__, "] added")
     elif debug:
         pdb("253:None coro called, just starting loop")
 
@@ -339,7 +342,7 @@ def __exit__(ec):
             loop.close()
         try:
             aio.recycle.cleanup()
-            aio.defer(embed.prompt, (), {}, 300)
+            aio.defer(embed.prompt, (), {}, delay=300)
         except:
             pass
 
@@ -378,7 +381,7 @@ def prompt_request():
     try:
         embed.prompt_request()
     except:
-        aio.defer(embed.prompt, (), {}, 100)
+        aio.defer(embed.prompt, (), {}, delay=100)
 
 
 class after:

support/pythonrc.py

@@ -276,7 +276,7 @@ def exec(cls, cmd, *argv, **env):
                     print("a program is already running, using 'stop' cmd before retrying")
                     cls.stop()
                     pgzrun = None
-                    aio.defer(cls.exec,(cmd,*argv),env, 500)
+                    aio.defer(cls.exec,(cmd,*argv),env, delay=500)
 
                 else:
                     execfile(cmd)
@@ -303,8 +303,8 @@ def stop(cls, *argv, **env):
             # pgzrun will reset to None next exec
             if not pgzrun:
                 # pgzrun does its own cleanup call
-                aio.defer(aio.recycle.cleanup, (), {}, 500)
-                aio.defer(embed.prompt, (), {}, 800)
+                aio.defer(aio.recycle.cleanup, (), {}, delay=500)
+                aio.defer(embed.prompt, (), {}, delay=800)
 
     def _process_args(argv, env):
         catch = True
@@ -403,13 +403,18 @@ def browser_open_new_tab(url):
     webbrowser.open_new = browser_open_new
     webbrowser.open_new_tab = browser_open_new_tab
 
+    # merge emscripten browser module here ?
+    # https://rdb.name/panda3d-webgl.md.html#supplementalmodules/asynchronousloading
+    #
+
+
 # ======================================================
 
 def ESC(*argv):
     for arg in argv:
         sys.__stdout__.write(chr(27),arg, sep="", endl="")
 
-# import pygame
+import pygame
 pgzrun = None
 
 if __WASM__ and __EMSCRIPTEN__ and __EMSCRIPTEN__.is_browser:
@@ -427,7 +432,6 @@ async def jsp(prom):
 else:
     pdb("TODO: js sim")
 
-
 if os.path.isfile('/data/data/custom.py'):
     execfile('/data/data/custom.py')