Bump recipes to their latest upstream versions

.github/workflows/build-wheels.yml

@@ -13,6 +13,13 @@ on:
         description: "Packages (comma-separated, e.g. pillow:11.1.0,pydantic-core:2.33.2) — or 'ALL' to build/test every recipe"
         required: false
         default: "pydantic-core:2.33.2"
+      prebuild_recipes:
+        description: |
+          Comma-separated list of recipes (typically flet-lib*) to
+          build FIRST and seed into the matrix's dist/ for host-dep pip resolution
+          (e.g. flet-libgdal -> gdal).
+        required: false
+        default: ""
       python_build_run_id:
         description: |
           flet-dev/python-build Actions run-id whose artifacts to use as the
@@ -178,9 +185,11 @@ jobs:
         env:
           FORGE_ARCH: ${{ matrix.forge_arch }}
           FORGE_PACKAGES: ${{ matrix.forge_packages }}
+          PREBUILD_RECIPES: ${{ inputs.prebuild_recipes }}
           PLATFORM: ${{ matrix.platform }}
           PYTHON_BUILD_RUN_ID: ${{ inputs.python_build_run_id }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # used by `gh run download`
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PIP_FIND_LINKS: ${{ github.workspace }}/dist
         run: |
           set -euxo pipefail
 
@@ -198,6 +207,16 @@ jobs:
           # the canonical v<version> release.
           source ./setup.sh "$UV_PYTHON" "$PLATFORM"
 
+          # When prebuild_recipes is set, this step builds those recipes FIRST. Their wheels
+          # land in dist/ alongside the consumer wheels. PIP_FIND_LINKS points forge's
+          # host-dep pip resolution at dist/, so the consumer build below picks up the
+          # freshly-built libs over whatever pypi.flet.dev has published.
+          if [[ -n "${PREBUILD_RECIPES:-}" ]]; then
+            for lib in $(echo "$PREBUILD_RECIPES" | tr ',' ' '); do
+              forge "$FORGE_ARCH" "$lib"
+            done
+          fi
+
           IFS=' ' read -r -a packages <<< "$FORGE_PACKAGES"
           for package in "${packages[@]}"; do
             forge "$FORGE_ARCH" "$package"

recipes/aiohttp/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: aiohttp
-  version: 3.9.5
+  version: 3.14.0
 
 build:
-  number: 10
+  number: 1

recipes/argon2-cffi-bindings/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: argon2-cffi-bindings
-  version: 21.2.0
+  version: 25.1.0
 
 build:
-  number: 10
+  number: 1

recipes/bcrypt/meta.yaml

@@ -1,8 +1,8 @@
 package:
   name: bcrypt
-  version: 4.2.0
+  version: 5.0.0
 
 build:
-  number: 10
+  number: 1
   script_env:
     _PYTHON_SYSCONFIGDATA_NAME: '{sysconfigdata_name}'

recipes/bitarray/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: bitarray
-  version: 3.6.1
+  version: 3.8.1
 
 build:
-  number: 10
+  number: 1

recipes/blis/meta.yaml

@@ -1,9 +1,9 @@
 package:
   name: blis
-  version: 1.0.0
+  version: 1.3.3
 
 build:
-  number: 10
+  number: 1
 
 requirements:
   host:

recipes/blis/patches/mobile.patch

@@ -1,53 +1,45 @@
 diff --git a/blis/_src/frame/thread/bli_pthread.c b/blis/_src/frame/thread/bli_pthread.c
-index a099356..6d5fe03 100644
 --- a/blis/_src/frame/thread/bli_pthread.c
 +++ b/blis/_src/frame/thread/bli_pthread.c
-@@ -594,7 +594,7 @@ int bli_pthread_barrier_wait
- 	return 0;
- }
- 
--#elif defined(__APPLE__) || defined(_MSC_VER) // !defined(BLIS_DISABLE_SYSTEM)
-+#elif defined(__APPLE__) || defined(_MSC_VER) || defined(__ANDROID__) // !defined(BLIS_DISABLE_SYSTEM)
- 
- #include <errno.h>
-
+@@ -319,7 +319,7 @@
+
+ // -- pthread_barrier_*() --
+
+-#if defined(__APPLE__) || defined(_MSC_VER)
++#if defined(__APPLE__) || defined(_MSC_VER) || defined(__ANDROID__)
+
+ // For OS X and Windows, we define barriers ourselves in terms of the rest
+ // of the API, though for slightly different reasons: For Windows, we must
 diff --git a/blis/_src/include/linux-generic/blis.h b/blis/_src/include/linux-generic/blis.h
-index d5158ff..bf3fbe5 100644
 --- a/blis/_src/include/linux-generic/blis.h
 +++ b/blis/_src/include/linux-generic/blis.h
-@@ -1581,7 +1581,7 @@ typedef pthread_cond_t      bli_pthread_cond_t;
- typedef pthread_condattr_t  bli_pthread_condattr_t;
- typedef pthread_once_t      bli_pthread_once_t;
- 
+@@ -1537,7 +1537,7 @@ typedef pthread_cond_t         bli_pthread_cond_t;
+ typedef pthread_condattr_t     bli_pthread_condattr_t;
+ typedef pthread_once_t         bli_pthread_once_t;
+
 -#if defined(__APPLE__)
 +#if defined(__APPLE__) || defined(__ANDROID__)
- 
+
  // For OS X, we must define the barrier types ourselves since Apple does
  // not implement barriers in their variant of pthreads.
 diff --git a/setup.py b/setup.py
-index d0944c9..6b3c19e 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -21,6 +21,7 @@ import subprocess
+@@ -21,8 +21,13 @@
  import sys
  import platform
  import numpy
 +import sysconfig
-
-
- PLATFORM_TO_ARCH = {
-@@ -36,6 +37,10 @@ PLATFORM_TO_ARCH = {
-
+
  MOD_NAMES = ["blis.cy", "blis.py"]
- 
++
 +# Redirect the compiler to CC
 +os.environ["BLIS_ARCH"] = "generic"
 +os.environ["BLIS_COMPILER"] = os.environ["CC"]
-+
+
  print("BLIS_COMPILER?", os.environ.get("BLIS_COMPILER", "None"))
-
-
-@@ -220,6 +225,9 @@ class ExtensionBuilder(build_ext, build_ext_options):
+
+@@ -199,6 +204,9 @@
          objects = []
          platform_arch = platform + "-" + py_arch
          compiler = self.get_compiler_name()
@@ -57,12 +49,12 @@ index d0944c9..6b3c19e 100644
          with open(os.path.join(BLIS_DIR, "make", "%s.jsonl" % platform_arch)) as file_:
              env = {}
              for line in file_:
-@@ -255,6 +263,8 @@ class ExtensionBuilder(build_ext, build_ext_options):
+@@ -228,6 +236,8 @@
                  spec["flags"] = [
                      f for f in spec["flags"] if "visibility=hidden" not in f
                  ]
 +                if len(host_triplet) == 4 and host_triplet[0] == "ios":
 +                    spec["flags"].append(f"-mios-version-min={host_triplet[1]}")
-                 objects.append(self.build_object(env=env, **spec))
-         return objects
-
+                 # spec["flags"].append(
+                 #    "-D__cpuid=__cpuid_function"
+                 # )

recipes/brotli/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: Brotli
-  version: 1.1.0
+  version: 1.2.0
 
 build:
-  number: 10
+  number: 1

recipes/cffi/meta.yaml

@@ -1,9 +1,9 @@
 package:
   name: cffi
-  version: 1.17.1
+  version: 2.0.0
 
 build:
-  number: 10
+  number: 1
 
 requirements:
   host:

recipes/contourpy/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: contourpy
-  version: 1.3.1
+  version: 1.3.3
 
 requirements:
   build:
@@ -14,7 +14,7 @@ requirements:
 # {% endif %}
 
 build:
-  number: 10
+  number: 1
   backend-args:
     - -Csetup-args=--cross-file
     - -Csetup-args={MESON_CROSS_FILE}

recipes/fiona/meta.yaml

@@ -4,17 +4,23 @@ package:
 
 requirements:
   host:
-    - flet-libgdal 3.10.0
+    - flet-libgdal 3.13.1
 # {% if sdk != 'android' %}
     # iOS-only — see GDAL_LIBS comment below for the rationale.
     - openssl >=3.0.15
     - flet-libjpeg 3.0.90
 # {% endif %}
 
 build:
-  number: 10
+  # Same source version as pypi.flet.dev's fiona-1.10.1-10 wheel, but
+  # this rebuild links against flet-libgdal 3.13.1 (vs. the published
+  # wheel's 3.10.0). pip's wheel selection picks the higher build_tag
+  # per PEP 427 when name+version collide; the new wheel must outrank
+  # build 10 or downstream installs would silently keep the old
+  # libgdal-3.10-linked fiona and the gdal chain bump would be invisible.
+  number: 11
   script_env:
-    GDAL_VERSION: 3.10.0
+    GDAL_VERSION: 3.13.1
     GDAL_LIB_PATH: '{platlib}/opt/lib'
     GDAL_INCLUDE_PATH: '{platlib}/opt/include'
 # {% if sdk == 'android' %}

recipes/flet-libgdal/build.sh

@@ -26,6 +26,7 @@ if [ $CROSS_VENV_SDK == "android" ]; then
         -DGDAL_USE_OPENSSL=OFF \
         -DGDAL_USE_CURL=OFF \
         -DGDAL_USE_LIBXML2=OFF \
+        -DGDAL_USE_OPENMP=OFF \
         -DBUILD_APPS=OFF \
         -DBUILD_TESTING=OFF \
         -DBUILD_PYTHON_BINDINGS=OFF
@@ -48,8 +49,10 @@ else
         -DSQLite3_INCLUDE_DIR=$SDK_ROOT/usr/include \
         -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF \
         -DOGR_BUILD_OPTIONAL_DRIVERS=OFF \
+        -DGDAL_USE_OPENMP=OFF \
         -DBUILD_APPS=OFF \
-        -DBUILD_TESTING=OFF
+        -DBUILD_TESTING=OFF \
+        -DBUILD_PYTHON_BINDINGS=OFF
 fi
 
 cmake --build . -j $CPU_COUNT

recipes/flet-libgdal/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "3.10.0" %}
+{% set version = "3.13.1" %}
 
 package:
   name: flet-libgdal
@@ -8,10 +8,13 @@ source:
   url: https://github.com/OSGeo/gdal/releases/download/v{{ version }}/gdal-{{ version }}.tar.gz
 
 build:
-  number: 10
+  number: 1
 
 requirements:
   build:
     - cmake
   host:
-    - flet-libproj 9.5.0
+    - flet-libproj 9.5.0
+
+patches:
+  - mobile.patch

recipes/flet-libgdal/patches/mobile.patch

@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -221,6 +221,12 @@ endif()
+ endif()
+ set(ENV{MKL_ENABLE_INSTRUCTIONS} "SSE4_2")
+
++# Mobile cross-compile guard: GDAL 3.13 unconditionally probes for the
++# target Python interpreter even when -DBUILD_PYTHON_BINDINGS=OFF. Under
++# CMake 4.x that trips policy CMP0190 ("Interpreter and/or Compiler
++# components cannot be searched when CMAKE_CROSSCOMPILING_EMULATOR
++# variable is not specified"). Skip the block when bindings are off.
++if (BUILD_PYTHON_BINDINGS OR NOT DEFINED BUILD_PYTHON_BINDINGS)
+ if (Python_LOOKUP_VERSION)
+     set(Python_FIND_STRATEGY VERSION)
+     find_package(Python ${Python_LOOKUP_VERSION} EXACT COMPONENTS Interpreter Development NumPy)
+@@ -248,6 +254,7 @@ if (Python_Interpreter_FOUND)
+     endif ()
+   endif()
+ endif()
++endif()
+
+ # Restore previous value of MKL_ENABLE_INSTRUCTIONS
+ if(DEFINED BACKUP_ENV_VAR_MKL_ENABLE_INSTRUCTIONS)

recipes/flet-libgeos/meta.yaml

@@ -1,13 +1,13 @@
 package:
   name: flet-libgeos
-  version: 3.13.0
+  version: 3.13.1
 
 build:
-  number: 10
+  number: 1
 
 source:
-  url: http://download.osgeo.org/geos/geos-3.13.0.tar.bz2
+  url: http://download.osgeo.org/geos/geos-3.13.1.tar.bz2
 
 requirements:
   build:
-    - cmake
+    - cmake

recipes/flet-libopaque/meta.yaml

@@ -1,11 +1,11 @@
-{% set version = "0.99.8" %}
+{% set version = "1.0.1" %}
 
 package:
   name: flet-libopaque
   version: '{{ version }}'
 
 build:
-  number: 10
+  number: 1
 
 source:
   url: https://github.com/stef/libopaque/archive/refs/tags/v{{ version }}.tar.gz

recipes/gdal/meta.yaml

@@ -1,10 +1,14 @@
 package:
   name: gdal
-  version: 3.10.0
+  # Pinned to match `flet-libgdal` (the host C library). GDAL's Python
+  # bindings hard-require an exact major.minor match with libgdal —
+  # any bump here must come with flet-libgdal bumped to the same
+  # version, plus fiona / rasterio / pyogrio re-pinned in lockstep.
+  version: 3.13.1
 
 requirements:
   host:
-    - flet-libgdal 3.10.0
+    - flet-libgdal 3.13.1
 # {% if sdk == 'android' %}
     # libgdal links C++; the SWIG-generated _gdal.so loads via dlopen which
     # needs libc++_shared.so on Android.
@@ -16,9 +20,9 @@ requirements:
 # {% endif %}
 
 build:
-  number: 10
+  number: 1
   script_env:
-    GDAL_VERSION: 3.10.0
+    GDAL_VERSION: 3.13.1
     GDAL_PREFIX: '{platlib}/opt'
     GDAL_CFLAGS: ''
 # {% if sdk != 'android' %}