3.1.69.8bi

pygame-web · Oct 15, 2024 · 7ff9dba · 7ff9dba
1 parent 07bae75
commit 7ff9dba
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
        BUILDS: 3.12 3.13 3.14
-       EMFLAVOUR: tot
+       EMFLAVOUR: latest
 
     steps:
     - uses: actions/[email protected]

diff --git a/python-wasi-sdk.sh b/python-wasi-sdk.sh
@@ -197,7 +197,7 @@ END
                     if $CI
                     then
                         pushd /
-                        tar -cpR $SDKROOT \
+                        tar  \
  --exclude=${SDKROOT}/devices/*/usr/bin/*3.1* \
  --exclude=${SDKROOT}/devices/*/usr/lib/python3.1? \
  --exclude=${SDKROOT}/devices/*/usr/include/python3.1? \
@@ -207,7 +207,7 @@ END
  --exclude=${SDKROOT}/sources.* \
  --exclude=${SDKROOT}/build \
  --exclude=${SDKROOT}/src \
-  > /tmp/sdk/emsdk.tar
+ -cpR $SDKROOT > /tmp/sdk/emsdk.tar
 
                         date "+%d-%m-%4Y" > /tmp/sdk/emsdk.version
                         popd
@@ -240,9 +240,6 @@ END
                 ==========================================================        " 1>&2
 
                 rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports*
-                rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports/sdl2/SDL-*
-                rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports
-                rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports-builds
                 rm -rf ${SDKROOT}/emsdk/upstream/emscripten/tests
 
             else
@@ -296,7 +293,10 @@ END
 
         # pack extra build scripts
         pushd /
-            tar -cpPRz ${SDKROOT}/scripts/emsdk-extra.sh ${SDKROOT}/sources.extra/* > /tmp/sdk/sdk-extra.tar.gz
+            tar -cpPRz \
+             ${SDKROOT}/scripts/emsdk-extra.sh \
+             ${SDKROOT}/scripts/emsdk-fetch.sh \
+             ${SDKROOT}/sources.extra/* > /tmp/sdk/sdk-extra.tar.gz
 
             # pack sdl as minimal prebuilt tar, and use lz4 compression on it
             . ${SDKROOT}/scripts/pack-sdk.sh

diff --git a/python-wasm-sdk.sh b/python-wasm-sdk.sh
@@ -197,7 +197,7 @@ END
                     if $CI
                     then
                         pushd /
-                        tar -cpR $SDKROOT \
+                        tar  \
  --exclude=${SDKROOT}/devices/*/usr/bin/*3.1* \
  --exclude=${SDKROOT}/devices/*/usr/lib/python3.1? \
  --exclude=${SDKROOT}/devices/*/usr/include/python3.1? \
@@ -207,7 +207,7 @@ END
  --exclude=${SDKROOT}/sources.* \
  --exclude=${SDKROOT}/build \
  --exclude=${SDKROOT}/src \
-  > /tmp/sdk/emsdk.tar
+ -cpR $SDKROOT > /tmp/sdk/emsdk.tar
 
                         date "+%d-%m-%4Y" > /tmp/sdk/emsdk.version
                         popd
@@ -240,9 +240,6 @@ END
                 ==========================================================        " 1>&2
 
                 rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports*
-                rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports/sdl2/SDL-*
-                rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports
-                rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports-builds
                 rm -rf ${SDKROOT}/emsdk/upstream/emscripten/tests
 
             else
@@ -296,7 +293,10 @@ END
 
         # pack extra build scripts
         pushd /
-            tar -cpPRz ${SDKROOT}/scripts/emsdk-extra.sh ${SDKROOT}/sources.extra/* > /tmp/sdk/sdk-extra.tar.gz
+            tar -cpPRz \
+             ${SDKROOT}/scripts/emsdk-extra.sh \
+             ${SDKROOT}/scripts/emsdk-fetch.sh \
+             ${SDKROOT}/sources.extra/* > /tmp/sdk/sdk-extra.tar.gz
 
             # pack sdl as minimal prebuilt tar, and use lz4 compression on it
             . ${SDKROOT}/scripts/pack-sdk.sh

diff --git a/scripts/emsdk-fetch.sh b/scripts/emsdk-fetch.sh
@@ -2,8 +2,9 @@
 
 if [[ -z ${EMSDK+z} ]]
 then
-
-    . ${CONFIG:-config}
+    pushd ${SDKROOT}
+        . ${CONFIG:-config}
+    popd
 
     if [ -d emsdk ]
     then
@@ -22,7 +23,6 @@ then
                 ./emsdk install ${EMFLAVOUR:-latest}
                 ./emsdk activate ${EMFLAVOUR:-latest}
 
-
                 pushd upstream/emscripten
                     echo "FIXME: applying stdio* are not const"
                     sed -i 's|extern FILE \*const|extern FILE \*|g' cache/sysroot/include/stdio.h
@@ -172,7 +172,7 @@ END
 
     export EMSDK_PYTHON=$SYS_PYTHON
 
-    if [ -f emsdk/.complete ]
+    if [ -f $EMSDK/.complete ]
     then
         echo "
         * emsdk prereq ok

diff --git a/scripts/pack-sdk.sh b/scripts/pack-sdk.sh
@@ -11,7 +11,7 @@ pushd /
 mkdir -p /tmp/sdk
 tar -cpPR \
     ${SDKROOT}/config \
-    ${SDKROOT}/*-cc \
+    ${SDKROOT}/emsdk-cc \
     ${SDKROOT}/python3-was? \
     ${SDKROOT}/wasm32-*-shell.sh \
     ${SDKROOT}/*sdk \

diff --git a/sources.extra/7000-gdal.sh b/sources.extra/7000-gdal.sh
@@ -88,7 +88,10 @@ int iconv_close(iconv_t);
 END
     fi
 
-    GDAL_PYTHON_BINDINGS_WITHOUT_NUMPY=1 emcmake cmake -DCMAKE_POSITION_INDEPENDENT_CODE=True -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX ${ROOT}/src/libgdal \
+    GDAL_PYTHON_BINDINGS_WITHOUT_NUMPY=1 emcmake cmake \
+ -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_C_FLAGS=-m32 \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_POSITION_INDEPENDENT_CODE=True -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX ${ROOT}/src/libgdal \
      -DPROJ_DIR=${PREFIX} -DPROJ_LIBRARY=${PREFIX}/lib/libproj.a -DPROJ_INCLUDE_DIR=${PREFIX}/include \
      -DACCEPT_MISSING_SQLITE3_MUTEX_ALLOC:BOOL=ON -DBUILD_PYTHON_BINDINGS=OFF