add assimp and emsdk fix 18941

Author: pmp-p

README.md

@@ -3,77 +3,12 @@ Tooling for building CPython and various packages (either third parties support
 n WebAssembly
 
 
-example building from within own pygame git clone tree on ubuntu 22.04 or linux mint :
-```bash
-#!/bin/bash
-# update system
-sudo apt-get update
-sudo apt-get install -y git bash python3-pip curl lz4 pv
-sudo mkdir -p /opt/python-wasm-sdk && sudo chown $(whoami) /opt/python-wasm-sdk
+see https://github.com/pygame-community/pygame-ce/blob/main/.github/workflows/build-emsdk.yml
+for how to use it
 
+or use as a cross compiler, after being unpacked in /opt/python-wasm-sdk, from within
+a source module distribution :
 
+eg `/opt/python-wasm-sdk/python3-wasm setup.py bdist_wheel`
 
-if [ -d ../pygame ]
-then
-    echo " using local tree"
-else
-    git clone https://github.com/pygame/pygame
-    cd pygame
-fi
 
-
-# in github CI, current working dir would now be /home/runner/pygame/pygame.
-if [ -f setup.py ]
-then
-    echo "cannot find pygame source code"
-else
-    # update cython
-    if [ -f ../dev ]
-    then
-        echo "  * not upgrading cython"
-    else
-        pip3 install git+https://github.com/cython/cython.git --user --upgrade
-    fi
-
-    # update source tree
-    git clean -f
-    git pull
-
-    mkdir -p /opt/python-wasm-sdk
-
-    # sdk
-    if [ -f /opt/python-wasm-sdk/python3-wasm ]
-    then
-        echo "  * not upgrading python-wasm-sdk"
-    else
-        echo "  * using cached python-wasm-sdk archive"
-
-        if [ -f ../python-wasm-sdk-stable.tar.lz4 ]
-        then
-#            time tar xfvjP ../python-wasm-sdk-stable.tar.bz2 \
-#             | pv -f -c -p -l -s 20626 >/dev/null
-            time tar xfvP ../python-wasm-sdk-stable.tar.lz4 --use-compress-program=lz4 \
-             | pv -f -c -p -l -s 20626 >/dev/null
-        else
-            curl -sL --retry 5 https://github.com/pygame-web/python-wasm-sdk/releases/download/0.2.0/python-wasm-sdk-stable.tar.bz2 \
-             | tar xvPj \
-             | pv -f -c -p -l -s 20626 >/dev/null
-        fi
-    fi
-
-    # build pygame
-    touch $(find |grep pxd$)
-    python3 setup.py config cython >/dev/null
-
-    /opt/python-wasm-sdk/python3-wasm setup.py -config -auto -sdl2 >/dev/null
-
-    # /opt/python-wasm-sdk/python3-wasm setup.py build
-    EMCC_CFLAGS="-fPIC -I/opt/python-wasm-sdk/devices/emsdk/usr/include/SDL2 -s USE_SDL=2" /opt/python-wasm-sdk/python3-wasm setup.py build -j1
-
-
-    mkdir -p dist
-    # get static lib
-    SYS_PYTHON=python3 /opt/python-wasm-sdk/emsdk/upstream/emscripten/emar rcs dist/libpygame.a $(find build/temp.wasm32-*/|grep o$)
-
-fi
-```

scripts/cpython-build-emsdk.sh

@@ -13,9 +13,6 @@
 
 export PYTHON_FOR_BUILD=${PYTHON_FOR_BUILD:-${HPY}}
 
-# remove old compiler wrapper to avoid conflicts
-[ -f $HOST_PREFIX/bin/cc ] && rm $HOST_PREFIX/bin/cc
-
 . ./scripts/emsdk-fetch.sh
 
 REBUILD_WASM=${REBUILD_WASMPY:-false}
@@ -264,9 +261,10 @@ sed -i 's|-g0|-g3|g' ${SDKROOT}/prebuilt/emsdk/${PYBUILD}/_sysconfigdata__emscri
 # python setup.py install --single-version-externally-managed --root=/
 # pip3 install .
 
-ln -sf ${SDKROOT}/emsdk/upstream/emscripten/emcc $HOST_PREFIX/bin/cc
 
-chmod +x $HOST_PREFIX/bin/cc
+# cmake usually wants cc
+ln ${SDKROOT}/emsdk/upstream/emscripten/emcc ${SDKROOT}/emsdk/upstream/emscripten/cc
+ln ${SDKROOT}/emsdk/upstream/emscripten/emcc.py ${SDKROOT}/emsdk/upstream/emscripten/cc.py
 
 cat > ${PYTHONPYCACHEPREFIX}/.nanorc <<END
 set tabsize 4
@@ -288,10 +286,12 @@ export PYBUILD=\${PYBUILD:-$PYBUILD}
 export PYMAJOR=\$(echo -n \$PYBUILD|cut -d. -f1)
 export PYMINOR=\$(echo -n \$PYBUILD|cut -d. -f2)
 
-export CARGO_HOME=\${CARGO_HOME:-/opt/python-rust-sdk}
-export RUSTUP_HOME=\${RUSTUP_HOME:-/opt/python-rust-sdk}
+export CARGO_HOME=\${CARGO_HOME:-${SDKROOT}}
+export RUSTUP_HOME=\${RUSTUP_HOME:-${SDKROOT}}
 export PATH=\${CARGO_HOME}/bin:\$PATH
 
+export PANDA_PRC_DIR=${SDKROOT}/support
+
 export EMSDK_QUIET=1
 
 if [[ ! -z \${EMSDK+z} ]]
@@ -360,13 +360,12 @@ END
 
 chmod +x $HOST_PREFIX/bin/python3-wasm
 
+cp -f $HOST_PREFIX/bin/python3-wasm ${SDKROOT}/
+
 # TODO: FIXME:
-echo "368 cannot use python3-wasm as python3 for setup.py in pygame build" 1>&2
+echo "366: cannot use python3-wasm as python3 for setup.py in pygame build" 1>&2
 ln -sf $HOST_PREFIX/bin/python${PYBUILD} $HOST_PREFIX/bin/python3
 
-cp -f $HOST_PREFIX/bin/python3-wasm ${ROOT}/
-
-
 HPFX=./devices/$(arch)/usr/lib/python${PYBUILD}
 TPFX=./devices/emsdk/usr/lib/python${PYBUILD}
 

scripts/emsdk-fetch.sh

@@ -25,10 +25,13 @@ then
                     echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/17956"
                     wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/17956.diff
                     patch -p1 < 17956.diff
+                    echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/18941"
+                    wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/18941.diff
+                    patch -p1 < 18941.diff
                 popd
 
-                wget https://raw.githubusercontent.com/paradust7/minetest-wasm/main/emsdk_emcc.patch
-                patch -p1 < emsdk_emcc.patch
+#                wget https://raw.githubusercontent.com/paradust7/minetest-wasm/main/emsdk_emcc.patch
+#                patch -p1 < emsdk_emcc.patch
 
                 # https://github.com/paradust7/minetest-wasm/blob/main/emsdk_dirperms.patch
                 patch -p1 <<END

sources.wasm/assimp.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+
+
+. ${CONFIG:-config}
+
+export ASSIMP="assimpjs-wasm"
+
+
+if [ -f assimp.patched ]
+then
+    echo "
+        already prepared $PREFIX
+    "
+else
+    git clone --recursive https://github.com/pmp-p/$ASSIMP
+    pushd $ASSIMP
+
+    # patch -p1 <<END END
+
+    touch ../assimp.patched
+    popd
+fi
+
+
+if [ -f $PREFIX/lib/libassimp.a ]
+then
+    echo "
+        already built in $PREFIX/lib/libassimp.a
+    "
+else
+    . $ROOT/scripts/emsdk-fetch.sh
+
+    mkdir -p $ROOT/build/assimp
+    pushd $ROOT/build/assimp
+    emmake cmake $ROOT/src/$ASSIMP -DCMAKE_INSTALL_PREFIX=$PREFIX -DBUILD_SHARED_LIBS=OFF
+    emmake make install
+    popd
+fi
+
+cd $SDKROOT

support/__EMSCRIPTEN__.embed/cpython.diff

@@ -1,5 +1,5 @@
---- Python-3.11.0b1/Modules/readline.c	2022-05-07 00:56:26.000000000 +0200
-+++ Python-3.11.0b1-plus/Modules/readline.c	2022-05-21 22:57:01.680634385 +0200
+--- Python-3.11.2/Modules/readline.c	2023-02-07 14:37:51.000000000 +0100
++++ Python-3.11.2-wasm/Modules/readline.c	2023-03-03 16:18:08.616667021 +0100
 @@ -1326,7 +1326,9 @@
          int has_input = 0, err = 0;
 
@@ -11,9 +11,9 @@
 
              /* [Bug #1552726] Only limit the pause if an input hook has been
                 defined.  */
---- Python-3.11.0b1/Python/sysmodule.c	2022-05-07 00:56:26.000000000 +0200
-+++ Python-3.11.0b1-plus/Python/sysmodule.c	2022-05-21 22:58:12.873024434 +0200
-@@ -48,7 +48,7 @@
+--- Python-3.11.2/Python/sysmodule.c	2023-02-07 14:37:51.000000000 +0100
++++ Python-3.11.2-wasm/Python/sysmodule.c	2023-03-03 16:18:08.616667021 +0100
+@@ -49,7 +49,7 @@
  extern const char *PyWin_DLLVersionString;
  #endif
 
@@ -22,7 +22,7 @@
  #include <emscripten.h>
  #endif
 
-@@ -2692,7 +2692,7 @@
+@@ -2748,7 +2748,7 @@
      return NULL;
  }
 
@@ -31,7 +31,7 @@
 
  PyDoc_STRVAR(emscripten_info__doc__,
  "sys._emscripten_info\n\
-@@ -2928,7 +2928,7 @@
+@@ -2988,7 +2988,7 @@
          }
      }
 
@@ -40,7 +40,7 @@
      if (EmscriptenInfoType == NULL) {
          EmscriptenInfoType = PyStructSequence_NewType(&emscripten_info_desc);
          if (EmscriptenInfoType == NULL) {
-@@ -3183,7 +3183,7 @@
+@@ -3243,7 +3243,7 @@
  #endif
          _PyStructSequence_FiniType(&Hash_InfoType);
          _PyStructSequence_FiniType(&AsyncGenHooksType);

support/__EMSCRIPTEN__.sh

@@ -19,11 +19,9 @@ else
         echo 3.12 does not need patching for interactive FD
     else
         [ -f "Parser/pegen_errors.c" ] && patch -p1 <<END
-diff --git a/Parser/pegen_errors.c b/Parser/pegen_errors.c
-index 489699679633e..78266f712c05c 100644
---- a/Parser/pegen_errors.c
-+++ b/Parser/pegen_errors.c
-@@ -245,7 +245,7 @@ get_error_line_from_tokenizer_buffers(Parser *p, Py_ssize_t lineno)
+--- Python-3.11.2/Parser/pegen_errors.c	2023-02-07 14:37:51.000000000 +0100
++++ Python-3.11.2-wasm/Parser/pegen_errors.c	2023-03-03 16:18:08.672666445 +0100
+@@ -249,7 +249,7 @@
       * (multi-line) statement are stored in p->tok->interactive_src_start.
       * If not, we're parsing from a string, which means that the whole source
       * is stored in p->tok->str. */