From 57b75097b96a92705cb4a9b2ed5ce8ab63e34c7d Mon Sep 17 00:00:00 2001 From: SolDev69 <40839581+SolDev69@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:33:45 +0000 Subject: [PATCH] re-add kmsro, use android strict why the fuck is it failing --- .github/workflows/pojav-gallium.yml | 5 ++--- src/gallium/targets/osmesa/meson.build | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pojav-gallium.yml b/.github/workflows/pojav-gallium.yml index 43cf1b8d26e..cce8358d624 100644 --- a/.github/workflows/pojav-gallium.yml +++ b/.github/workflows/pojav-gallium.yml @@ -48,9 +48,8 @@ jobs: --prefix=/tmp/mesa \ --cross-file "build-crossfile" \ -Dplatforms=android \ - -Dplatform-sdk-version=26 \ + -Dplatform-sdk-version=25 \ -Dandroid-stub=true \ - -Dandroid-strict=false \ -Dllvm=disabled \ -Dxlib-lease=disabled \ -Degl=disabled \ @@ -59,7 +58,7 @@ jobs: -Dopengl=true \ -Dosmesa=true \ -Dvulkan-drivers= \ - -Dgallium-drivers=freedreno,zink,swrast,panfrost \ + -Dgallium-drivers=freedreno,zink,swrast,panfrost,kmsro \ -Dfreedreno-kmds=kgsl \ -Dshared-glapi=false \ -Dbuildtype=release diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index 1bd6972d601..f4b7a8efaf4 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -55,7 +55,7 @@ libosmesa = shared_library( libmesa, libgallium, libws_null, osmesa_link_with, ], dependencies : [ - dep_ws2_32, dep_selinux, dep_thread, dep_clock, dep_unwind, driver_freedreno, dep_libdrm, driver_zink, driver_swrast, driver_panfrost + dep_ws2_32, dep_selinux, dep_thread, dep_clock, dep_unwind, driver_freedreno, dep_libdrm, driver_zink, driver_swrast, driver_panfrost, driver_kmsro ], name_prefix : host_machine.system() == 'windows' ? '' : [], # otherwise mingw will create libosmesa.dll soversion : '',