sync 3d mouse patch

Author: pmp-p

config

@@ -118,6 +118,11 @@ do
     fi
 done
 
+# ================ aosp ===================
+
+AOSP_NDK=25.2.9519653
+
+
 
 # this is python used for emsdk : ${SYS_PYTHON} -> ${EMSDK_PYTHON}
 for py in 10 9 8 7

python-wasi-sdk.sh

@@ -22,7 +22,7 @@ then
     nimsdk=${nimsdk:-false}
 else
     emsdk=false
-    BUILDS=3.12
+    BUILDS=3.13
     wasisdk=true
     nimsdk=true
 fi

python-wasm-sdk.sh

@@ -22,7 +22,7 @@ then
     nimsdk=${nimsdk:-false}
 else
     emsdk=false
-    BUILDS=3.12
+    BUILDS=3.13
     wasisdk=true
     nimsdk=true
 fi

scripts/cpython-build-emsdk-deps.sh

@@ -44,6 +44,7 @@ cd $ROOT
 
 # https://download.osgeo.org/libtiff/tiff-4.3.0.tar.gz
 # http://code.google.com/intl/en-US/speed/webp/index.html
+# https://github.com/webmproject/libwebp/tags
 
 ALL="-fPIC -s USE_SDL=2 -sUSE_LIBPNG -sUSE_LIBJPEG $CPPFLAGS"
 CNF="emconfigure ./configure --prefix=$PREFIX --with-pic --disable-shared --host $(clang -dumpmachine)"
@@ -116,7 +117,7 @@ then
 "  1>&2
 else
     #[ -d SDL_image ] || git clone https://github.com/libsdl-org/SDL_image
-    if [ -d SDL2_image-2.6.1 ]
+    if [ -d SDL2_${SDL_IMG} ]
     then
         echo "
             * build SDL2_image from release

scripts/cpython-build-emsdk-prebuilt.sh

@@ -9,9 +9,8 @@ PIP="${SDKROOT}/python3-wasm -m pip"
 
 # all needed for PEP722/723, hpy, cffi modules and wheel building
 
-# pip  pip-24.0 broken
 for module in typing_extensions mypy_extensions pyproject-metadata \
- setuptools build wheel pyparsing packaging setuptools_scm \
+ setuptools build wheel pyparsing packaging hatchling setuptools_scm \
  git+https://github.com/python-cffi/cffi meson-python git+https://github.com/pypa/installer
 do
     $PIP install --force $module

scripts/cpython-build-emsdk.sh

@@ -65,8 +65,17 @@ else
 #TODO: check if export PATH=${HOST_PREFIX}/bin:$PATH is really set to avoid system python with different bytecode
 #and no loder lib-dynload in the way.
 
+    if echo $PYBUILD|grep 13$
+    then
+        GIL="--disable-gil"
+    else
+        GIL=""
+    fi
+
+
     EMCC_CFLAGS="-O0 -g0 -fPIC" CFLAGS="-O0 -g0 -fPIC" CC=${SDKROOT}/emsdk/upstream/emscripten/emcc \
-     emconfigure $ROOT/src/libffi/configure --host=wasm32-bi-emscripten\
+     emconfigure $ROOT/src/libffi/configure --host=wasm32-bi-emscripten \
+     $GIL \
       --prefix=$PREFIX --enable-static --disable-shared --disable-dependency-tracking\
       --disable-builddir --disable-multi-os-directory --disable-raw-api --disable-docs
 

scripts/cpython-build-host-deps.sh

@@ -14,3 +14,8 @@ $HPIP install --upgrade pip
 # 3.12 and git deprecated setuptools bundling.
 $HPIP install --upgrade setuptools
 
+
+# probably lot of pip install made in cpython-build-emsdk-prebuilt.sh
+# should only go here in host python
+
+# TODO

scripts/emsdk-fetch.sh

@@ -56,8 +56,10 @@ then
                 echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/20442 fix mouse position for 3D canvas"
 
                 pushd upstream/emscripten
-                wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/20442.diff
-                patch -p1 < 20442.diff
+                # wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/20442.diff
+                # patch -p1 < 20442.diff
+                wget https://patch-diff.githubusercontent.com/raw/pmp-p/emscripten/pull/2.diff
+                patch -p1 < 2.diff
                 popd
 
                 # https://github.com/paradust7/minetest-wasm/blob/main/emsdk_dirperms.patch