From: Victor Martinez <pitillo@ono.com>
Date: Wed, 10 Mar 2021 09:02:31 +0000 (+0100)
Subject: mesa3d renamed to mesa and updated to 20.3.4
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=3e0cd2771d422c8f149c59ae7539282c0141bb31;p=ports%2Fxorg-arm64.git

mesa3d renamed to mesa and updated to 20.3.4
---

diff --git a/mesa3d/.footprint b/mesa/.footprint
similarity index 92%
rename from mesa3d/.footprint
rename to mesa/.footprint
index 51ac830..4b2b0df 100644
--- a/mesa3d/.footprint
+++ b/mesa/.footprint
@@ -18,12 +18,14 @@ drwxr-xr-x	root/root	usr/lib/dri/
 -rwxr-xr-x	root/root	usr/lib/dri/hx8357d_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/ili9225_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/ili9341_dri.so
+-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/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
@@ -54,6 +56,7 @@ lrwxrwxrwx	root/root	usr/lib/libgbm.so.1 -> libgbm.so.1.0.0
 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
@@ -68,3 +71,6 @@ drwxr-xr-x	root/root	usr/share/drirc.d/
 drwxr-xr-x	root/root	usr/share/glvnd/
 drwxr-xr-x	root/root	usr/share/glvnd/egl_vendor.d/
 -rw-r--r--	root/root	usr/share/glvnd/egl_vendor.d/50_mesa.json
+drwxr-xr-x	root/root	usr/share/vulkan/
+drwxr-xr-x	root/root	usr/share/vulkan/icd.d/
+-rw-r--r--	root/root	usr/share/vulkan/icd.d/lvp_icd.aarch64.json
diff --git a/mesa/.signature b/mesa/.signature
new file mode 100644
index 0000000..cb10e48
--- /dev/null
+++ b/mesa/.signature
@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/xorg-arm64.pub
+RWQK42WfXMUBTPgeAnGK7d8x8c9BGB8Uu0kTsB1jO7lsUxrl+m4Fk+Ez2jfROsw9RRGdlsbpAVNv5AIs/yT7lgdTVUxq3zCAswI=
+SHA256 (Pkgfile) = ba3e7fcce0b4de92402bb528c067d9855d046c2a3f367f050f3a333845bdebe1
+SHA256 (.footprint) = f298d7bf846d9683a4308357698fd0552ac78760518e825d6e32402c50993413
+SHA256 (mesa-20.3.4.tar.xz) = dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084
diff --git a/mesa3d/Pkgfile b/mesa/Pkgfile
similarity index 77%
rename from mesa3d/Pkgfile
rename to mesa/Pkgfile
index b521f78..c2e2bad 100644
--- a/mesa3d/Pkgfile
+++ b/mesa/Pkgfile
@@ -3,17 +3,19 @@
 # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: elfutils libdrm libglvnd libvdpau llvm python3-mako xorg-libxdamage xorg-libxrandr xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm
+# Optional: libva
 
-name=mesa3d
-version=20.2.4
+name=mesa
+version=20.3.4
 release=1
 source=(ftp://ftp.freedesktop.org/pub/mesa/mesa-$version.tar.xz)
 
 build() {
-  cd mesa-$version
 
-  meson build --prefix=/usr \
+  meson setup build mesa-$version \
+              --prefix=/usr \
               --sysconfdir=/etc \
+              --buildtype=plain \
               -Dllvm=true \
               -Dgbm=true \
               -Dgles1=true \
@@ -21,13 +23,12 @@ build() {
               -Dosmesa=gallium \
               -Dgallium-xa=true \
               -Dshared-llvm=true \
-              -Dplatforms=x11,drm \
+              -Dplatforms=x11 \
               -Dgallium-drivers=swrast,freedreno,lima,kmsro,vc4,v3d \
               -Dglvnd=true  
 
-
-
-        DESTDIR=$PKG ninja -C build -j ${JOBS:-1} install
+  meson compile -C build -j ${JOBS:-1}
+  DESTDIR=$PKG meson install -C build
 
   # indirect rendering symlink
   ln -s libGLX_mesa.so.0 $PKG/usr/lib/libGLX_indirect.so.0
diff --git a/mesa3d/.signature b/mesa3d/.signature
deleted file mode 100644
index f04afd0..0000000
--- a/mesa3d/.signature
+++ /dev/null
@@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/xorg-arm64.pub
-RWQK42WfXMUBTCrlSedD7VEPgQyG1TCYVJXd+OSZfSG8kHMJMDxpYJjJfZ+CvnH8De5pdg1eFphIK/+OeU19PxMLskoMXNSA+wM=
-SHA256 (Pkgfile) = 1f70cf351d8c3d2326231f983a798ec3c107b2328a5c1d0f8817b59ab05ddede
-SHA256 (.footprint) = 1942b6127aaa58b3f835e51cc5a4c189eb3e82be1e2886383b9403f52d5a14bc
-SHA256 (mesa-20.2.4.tar.xz) = 0572dc6015d2e1c50f67823edd16855ae9b6feded0a1470598404e75e64aa092