From 5f5dec6e99d2441a00a0a8572ede5f12f4318bfe Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 30 Mar 2026 15:27:33 -0600 Subject: [PATCH] [gpu] Wire D3D11 into CI cross-build - Add --direct3d flag to hb-gpu via gpu-output.hh - Download GLFW prebuilt for MinGW in build-win.sh - Add libglew-mingw-w64-dev to CI packages - Enable -Dgpu=enabled in cross-build - hb-gpu.exe ships in the Windows zip with D3D11 support Co-Authored-By: Claude Opus 4.6 (1M context) --- .ci/build-win.sh | 35 ++++++++++++++++++++++++++ .github/workflows/crossbuild-mingw.yml | 4 +-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/.ci/build-win.sh b/.ci/build-win.sh index 685d2c5be..fc33b2151 100755 --- a/.ci/build-win.sh +++ b/.ci/build-win.sh @@ -10,10 +10,44 @@ fi ARCH=$1 shift +if [ "$ARCH" = "64" ]; then + TRIPLET=x86_64-w64-mingw32 +else + TRIPLET=i686-w64-mingw32 +fi + BUILD=build-win${ARCH} INSTALL=install-win${ARCH} DIST=harfbuzz-win${ARCH} +# Install GLFW for MinGW if not already present +if [ ! -f /usr/${TRIPLET}/include/GLFW/glfw3.h ]; then + GLFW_VER=3.4 + GLFW_ZIP=glfw-${GLFW_VER}.bin.WIN${ARCH}.zip + if [ ! -f /tmp/${GLFW_ZIP} ]; then + wget -q -O /tmp/${GLFW_ZIP} "https://github.com/glfw/glfw/releases/download/${GLFW_VER}/${GLFW_ZIP}" + fi + GLFW_DIR=$(mktemp -d) + unzip -q /tmp/${GLFW_ZIP} -d ${GLFW_DIR} + GLFW_ROOT=${GLFW_DIR}/glfw-${GLFW_VER}.bin.WIN${ARCH} + sudo mkdir -p /usr/${TRIPLET}/include/GLFW + sudo cp ${GLFW_ROOT}/include/GLFW/*.h /usr/${TRIPLET}/include/GLFW/ + sudo cp ${GLFW_ROOT}/lib-mingw-w64/libglfw3.a /usr/${TRIPLET}/lib/ + sudo mkdir -p /usr/${TRIPLET}/lib/pkgconfig + cat > /tmp/glfw3.pc << PCEOF +prefix=/usr/${TRIPLET} +includedir=\${prefix}/include +libdir=\${prefix}/lib +Name: GLFW +Version: ${GLFW_VER} +Libs: -L\${libdir} -lglfw3 +Libs.private: -lgdi32 +Cflags: -I\${includedir} +PCEOF + sudo cp /tmp/glfw3.pc /usr/${TRIPLET}/lib/pkgconfig/ + rm -rf ${GLFW_DIR} +fi + meson setup \ --buildtype=release \ --prefix="${PWD}/${BUILD}/${INSTALL}" \ @@ -33,6 +67,7 @@ meson setup \ -Dchafa=disabled \ -Dgdi=enabled \ -Ddirectwrite=enabled \ + -Dgpu=enabled \ ${BUILD} \ "$@" diff --git a/.github/workflows/crossbuild-mingw.yml b/.github/workflows/crossbuild-mingw.yml index 531a6d131..3ef308de4 100644 --- a/.github/workflows/crossbuild-mingw.yml +++ b/.github/workflows/crossbuild-mingw.yml @@ -20,10 +20,10 @@ jobs: include: - name: win32 ARCH: 32 - PACKAGES: g++-mingw-w64-i686 wine wine32 + PACKAGES: g++-mingw-w64-i686 wine wine32 libglew-mingw-w64-dev - name: win64 ARCH: 64 - PACKAGES: g++-mingw-w64-x86-64 wine wine64 wine32:i386 + PACKAGES: g++-mingw-w64-x86-64 wine wine64 wine32:i386 libglew-mingw-w64-dev steps: - name: Checkout