From a9e761648b1f877b80396ab12720769529b443dd Mon Sep 17 00:00:00 2001 From: SolDev69 Date: Sat, 9 Dec 2023 17:28:54 -0500 Subject: [PATCH] more patches this probs won't compile --- .github/workflows/ios.yml | 15 +++++++++++++++ ios-aarch64 | 19 +++++++++++++++++++ ios-drm-aarch64 | 19 +++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 ios-aarch64 create mode 100644 ios-drm-aarch64 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 53548860a91..837c719c5ad 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -16,6 +16,21 @@ jobs: ln -s vulkan_ios.pc vulkan.pc brew install meson pkg-config 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 meson setup "build-ios-aarch64" \ --prefix=/tmp/asahi \ --cross-file "ios-aarch64" \ diff --git a/ios-aarch64 b/ios-aarch64 new file mode 100644 index 00000000000..44718d915e0 --- /dev/null +++ b/ios-aarch64 @@ -0,0 +1,19 @@ +[binaries] + +ar = 'ar' +c = ['ccache', 'clang', '-O3', '-DVK_USE_PLATFORM_IOS_MVK', '-DVK_USE_PLATFORM_METAL_EXT', '-DVK_ENABLE_BETA_EXTENSIONS', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk', '-miphoneos-version-min=12.0', '-fPIC'] +cpp = ['ccache', 'clang++', '-O3', '-DVK_USE_PLATFORM_IOS_MVK', '-DVK_USE_PLATFORM_METAL_EXT', '-DVK_ENABLE_BETA_EXTENSIONS', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk', '-miphoneos-version-min=12.0', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] +c_ld = 'ld' +cpp_ld = 'ld' +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'] + +[host_machine] +# or linux? +system = 'darwin' +cpu_family = 'arm' +cpu = 'armv8' +endian = 'little' diff --git a/ios-drm-aarch64 b/ios-drm-aarch64 new file mode 100644 index 00000000000..1fff7231112 --- /dev/null +++ b/ios-drm-aarch64 @@ -0,0 +1,19 @@ +[binaries] + +ar = 'ar' +c = ['ccache', 'clang', '-O3', '-DVK_USE_PLATFORM_IOS_MVK', '-DVK_USE_PLATFORM_METAL_EXT', '-DVK_ENABLE_BETA_EXTENSIONS', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk', '-miphoneos-version-min=12.0', '-fPIC'] +cpp = ['ccache', 'clang++', '-O3', '-DVK_USE_PLATFORM_IOS_MVK', '-DVK_USE_PLATFORM_METAL_EXT', '-DVK_ENABLE_BETA_EXTENSIONS', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk', '-miphoneos-version-min=12.0', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] +c_ld = 'ld' +cpp_ld = 'ld' +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=/Users/runner/work/freedreno-gallium-mesa/freedreno-gallium-mesa', 'pkg-config'] + +[host_machine] +# or linux? +system = 'darwin' +cpu_family = 'arm' +cpu = 'armv8' +endian = 'little'