OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: meson -> Meson

Browse Source 
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19191>
This commit is contained in:
Erik Faye-Lund
2022-10-19 16:06:16 +02:00
committed by Marge Bot
parent 635bf6339d
commit 1298c5df69
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/android.rst
View File

@@ -8,14 +8,14 @@ Android NDK.
The Android.mk build system has proven to be hard to maintain, as one The Android.mk build system has proven to be hard to maintain, as one
needs a built Android tree to build against, and it has never been needs a built Android tree to build against, and it has never been
tested in CI. The meson build system flow is frequently used by tested in CI. The Meson build system flow is frequently used by
Chrome OS developers for building and testing Android drivers. Chrome OS developers for building and testing Android drivers.
Building using the Android NDK Building using the Android NDK
------------------------------ ------------------------------
Download and install the NDK using whatever method you normally would. Download and install the NDK using whatever method you normally would.
Then, create your meson cross file to use it, something like this Then, create your Meson cross file to use it, something like this
``~/.local/share/meson/cross/android-aarch64`` file:: ``~/.local/share/meson/cross/android-aarch64`` file::
[binaries] [binaries]
@@ -25,7 +25,7 @@ Then, create your meson cross file to use it, something like this
c_ld = 'lld' c_ld = 'lld'
cpp_ld = 'lld' cpp_ld = 'lld'
strip = 'NDKDIR/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip' strip = 'NDKDIR/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip'
# Android doesn't come with a pkg-config, but we need one for meson to be happy not # 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 # 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 # directory we get to populate with any .pc files we want to add for Android
pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=NDKDIR/pkgconfig', '/usr/bin/pkg-config'] pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=NDKDIR/pkgconfig', '/usr/bin/pkg-config']

2
docs/drivers/panfrost.rst
View File

@@ -70,7 +70,7 @@ Although Mali hardware is usually paired with an Arm CPU, Panfrost is portable C
code and should work on any Linux machine. In particular, you can test the code and should work on any Linux machine. In particular, you can test the
compiler on shader-db on an Intel desktop. compiler on shader-db on an Intel desktop.
To build Mesa with Panfrost drm-shim, configure meson with To build Mesa with Panfrost drm-shim, configure Meson with
``-Dgallium-drivers=panfrost`` and ``-Dtools=drm-shim``. See the above ``-Dgallium-drivers=panfrost`` and ``-Dtools=drm-shim``. See the above
building section for a full invocation. The drm-shim binary will be built to building section for a full invocation. The drm-shim binary will be built to
``build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so``. ``build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so``.