diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 837c719c5ad..a79e6c14c03 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -14,23 +14,23 @@ jobs: - name: Build iOS run: | ln -s vulkan_ios.pc vulkan.pc - brew install meson pkg-config + brew install meson pkg-config libdrm pip3 install mako - git clone --depth 1 https://gitlab.freedesktop.org/mesa/drm.git - cd drm - meson setup "build-ios-drm" \ - --prefix=/tmp/drm-static \ - --cross-file "../ios-drm-aarch64" \ - -Ddefault_library=static \ - -Dintel=disabled \ - -Dradeon=disabled \ - -Damdgpu=disabled \ - -Dnouveau=disabled \ - -Dvmwgfx=disabled \ - -Dfreedreno=enabled \ - -Dvc4=disabled \ - -Detnaviv=disabled - ninja -C "build-ios-drm" install + # git clone --depth 1 https://gitlab.freedesktop.org/mesa/drm.git + # cd drm + # meson setup "build-ios-drm" \ + # --prefix=/tmp/drm-static \ + # --cross-file "../ios-drm-aarch64" \ + # -Ddefault_library=static \ + # -Dintel=disabled \ + # -Dradeon=disabled \ + # -Damdgpu=disabled \ + # -Dnouveau=disabled \ + # -Dvmwgfx=disabled \ + # -Dfreedreno=enabled \ + # -Dvc4=disabled \ + # -Detnaviv=disabled + # ninja -C "build-ios-drm" install meson setup "build-ios-aarch64" \ --prefix=/tmp/asahi \ --cross-file "ios-aarch64" \ diff --git a/ios-aarch64 b/ios-aarch64 index 44718d915e0..e7bd2bc5a5c 100644 --- a/ios-aarch64 +++ b/ios-aarch64 @@ -9,7 +9,8 @@ strip = 'strip' # Android doesn't come with a pkg-config, but we need one for meson to be happy not # finding all the optional deps it looks for. Use system pkg-config pointing at a # directory we get to populate with any .pc files we want to add for Android -pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=.:/tmp/drm-static/lib/pkgconfig', '/usr/bin/pkg-config'] +#pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=.:/tmp/drm-static/lib/pkgconfig', '/usr/bin/pkg-config'] +pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=/Users/runner/work/freedreno-gallium-mesa/freedreno-gallium-mesa', 'pkg-config'] [host_machine] # or linux?