From baae08e5ab53bd4e1fe473ce1694e9223522c5a1 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Mon, 20 Sep 2021 12:54:02 +0200
Subject: [PATCH] mesa: added check for wayland support. Thanks Tim

---
 mesa/.footprint | 10 ----------
 mesa/.signature |  6 +++---
 mesa/Pkgfile    | 41 ++++++++++++++++++++++++++++-------------
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/mesa/.footprint b/mesa/.footprint
index afc06a9..05ef207 100644
--- a/mesa/.footprint
+++ b/mesa/.footprint
@@ -8,9 +8,6 @@ drwxr-xr-x	root/root	usr/include/GL/internal/
 -rw-r--r--	root/root	usr/include/GL/internal/dri_interface.h
 -rw-r--r--	root/root	usr/include/GL/osmesa.h
 -rw-r--r--	root/root	usr/include/gbm.h
--rw-r--r--	root/root	usr/include/xa_composite.h
--rw-r--r--	root/root	usr/include/xa_context.h
--rw-r--r--	root/root	usr/include/xa_tracker.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/dri/
 -rwxr-xr-x	root/root	usr/lib/dri/armada-drm_dri.so
@@ -21,15 +18,12 @@ drwxr-xr-x	root/root	usr/lib/dri/
 -rwxr-xr-x	root/root	usr/lib/dri/imx-dcss_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/imx-drm_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/ingenic-drm_dri.so
--rwxr-xr-x	root/root	usr/lib/dri/kgsl_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/kms_swrast_dri.so
--rwxr-xr-x	root/root	usr/lib/dri/lima_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/mali-dp_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/mcde_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/mediatek_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/meson_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/mi0283qt_dri.so
--rwxr-xr-x	root/root	usr/lib/dri/msm_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/mxsfb-drm_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/pl111_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/repaper_dri.so
@@ -58,14 +52,10 @@ lrwxrwxrwx	root/root	usr/lib/libglapi.so -> libglapi.so.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so.0 -> libglapi.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libglapi.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libvulkan_lvp.so
-lrwxrwxrwx	root/root	usr/lib/libxatracker.so -> libxatracker.so.2
-lrwxrwxrwx	root/root	usr/lib/libxatracker.so.2 -> libxatracker.so.2.5.0
--rwxr-xr-x	root/root	usr/lib/libxatracker.so.2.5.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/dri.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gbm.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/osmesa.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/xatracker.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/drirc.d/
 -rw-r--r--	root/root	usr/share/drirc.d/00-mesa-defaults.conf
diff --git a/mesa/.signature b/mesa/.signature
index 80de8d8..a2afb60 100644
--- a/mesa/.signature
+++ b/mesa/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg-arm64.pub
-RWQK42WfXMUBTP54rbpEAl31epzgDMhwLBbUMWUaNV1EiAHqk8Gz/8+OS/qHxbUT6do77LJQv1h1T/wlqd/oRmCk69cTZIn1ZQE=
-SHA256 (Pkgfile) = 27d2ba2a8af1168dd9ce7fce5e74283af79cce02b3da27ac3a1f14a7ea8be5ad
-SHA256 (.footprint) = 5a044c99b37d860e9fa6c825fb5e6e9666bae755c0af6440bd3dcce50fadde8b
+RWQK42WfXMUBTAcbF4+1NkfQ5ER2GBSPGwHXAwsAf3L3ByApP6d4bn/AGBbULpD9l2lna1+sXtAMWa2/oyfFSYw2ivnfEy3a3A8=
+SHA256 (Pkgfile) = 8e1263683683130c68e7feb1fa6c707023785a7f2e04a29d2ccb0538bdc4d8c6
+SHA256 (.footprint) = 9ae52815c7034e51686fbdac07623ac55669f5bd65f54232cdf40bb1bd64b747
 SHA256 (mesa-21.2.1.tar.xz) = 2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787
diff --git a/mesa/Pkgfile b/mesa/Pkgfile
index bc734be..70a03fd 100644
--- a/mesa/Pkgfile
+++ b/mesa/Pkgfile
@@ -12,20 +12,35 @@ source=(ftp://ftp.freedesktop.org/pub/mesa/mesa-$version.tar.xz)
 
 build() {
 
+  prt-get isinst wayland-protocols && PKGMK_MESA_PLATFORMS+='wayland'
+  PKGMK_MESA_PLATFORMS+=',x11'
+
+  patch -Np1 -d mesa-$version -i $SRC/0001-Rip-out-VC4-forced-NEON.patch || true
+
   meson setup build mesa-$version \
-              --prefix=/usr \
-              --sysconfdir=/etc \
-              --buildtype=plain \
-              -Dllvm=true \
-              -Dgbm=true \
-              -Dgles1=true \
-              -Dgles2=true \
-              -Dosmesa=true \
-              -Dgallium-xa=true \
-              -Dshared-llvm=true \
-              -Dplatforms=x11 \
-              -Dgallium-drivers=swrast,freedreno,lima,kmsro,vc4,v3d \
-              -Dglvnd=true  
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --buildtype=plain \
+    --wrap-mode nodownload \
+    -D b_lto=false \
+    -D b_pie=false \
+    -D b_pch=false \
+    -D llvm=enabled \
+    -D shared-llvm=enabled \
+    -D platforms=${PKGMK_MESA_PLATFORMS#,} \
+    -D osmesa=true \
+    -D gallium-drivers=swrast,vc4,v3d \
+    -D gallium-xa=false \
+    -D gallium-xvmc=false \
+    -D shared-glapi=true \
+    -D dri-drivers="" \
+    -D dri3=enabled \
+    -D gbm=enabled \
+    -D gles1=disabled \
+    -D gles2=enabled \
+    -D glvnd=true \
+    -D glx=dri \
+    -D egl=enabled
 
   meson compile -C build -j ${JOBS:-1}
   DESTDIR=$PKG meson install -C build
-- 
2.26.2