mesa3d: renamed to mesa and updated to 21.2.3

diff --git a/mesa3d/.footprint b/mesa/.footprint
similarity index 85%
rename from mesa3d/.footprint
rename to mesa/.footprint
index 51ac8302ce722b9fbc9850e5e5cf2f1e4b880c07..c78d903b475a35ef18503782912ab963858bbf85 100644 (file)
--- a/mesa3d/.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
@@ -18,15 +15,15 @@ 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/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
@@ -54,17 +51,17 @@ 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
-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
+-rwxr-xr-x     root/root       usr/lib/libvulkan_lvp.so
 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
 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.armv7l.json

diff --git a/mesa/.signature b/mesa/.signature
new file mode 100644 (file)
index 0000000..37daf8a
--- /dev/null
+++ b/mesa/.signature
@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/xorg-arm.pub
+RWSYHFoJug2wQj96WJ6bpDnrI3gGtU3l8sv4nwNsABeo5EYKJC5dnE1CM9iEJejBjl+IdwkRgVBYA8kv/JsdRPFcwXweWMqO8Ac=
+SHA256 (Pkgfile) = b931e881790b1536c7963ba6b9babd4746c30fa4b94580c4738267f0a4cb869f
+SHA256 (.footprint) = c7ad39ec8794bc402579082aa83d5472448db737eff359282bca9f9b6a860fb8
+SHA256 (mesa-21.2.3.tar.xz) = 7245284a159d2484770e1835a673e79e4322a9ddf43b17859668244946db7174

diff --git a/mesa/Pkgfile b/mesa/Pkgfile
new file mode 100644 (file)
index 0000000..2060818
--- /dev/null
+++ b/mesa/Pkgfile
@@ -0,0 +1,51 @@
+# Description: Mesa 3D Graphics Library
+# URL: http://www.mesa3d.org
+# 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 llvm python3-mako xorg-libxdamage xorg-libxrandr xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm
+# Optional: libva libvdpau wayland-protocols
+
+name=mesa
+version=21.2.3
+release=1
+source=(https://archive.mesa3d.org/$name-$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 \
+    --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
+
+  # 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 (file)
index 7436849..0000000
--- a/mesa3d/.signature
+++ /dev/null
@@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/xorg-arm.pub
-RWSYHFoJug2wQjm+s8Rc9MToayiIiYadey5anAvPKvOgJlGC4YRUab0PE9Sd3A+nmcQYRITZCn3LdgwGaXXjpfmUlQhN004uSAg=
-SHA256 (Pkgfile) = 956b2f6974510db5b1b0a5f46cd30b767fc1fdd5fed35136b75d869cc6d56af8
-SHA256 (.footprint) = 1942b6127aaa58b3f835e51cc5a4c189eb3e82be1e2886383b9403f52d5a14bc
-SHA256 (mesa-20.1.7.tar.xz) = 4de9dd0cb2ca367606cada421db62fbf6d276dfd533e522bfab6001ff9aba288

diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile
deleted file mode 100644 (file)
index d6075cf..0000000
--- a/mesa3d/Pkgfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Description: Mesa 3D Graphics Library
-# URL: http://www.mesa3d.org
-# 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 libvdpau libglvnd llvm xorg-libxdamage xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm python3-mako
-
-name=mesa3d
-version=20.1.7
-release=1
-source=(ftp://ftp.freedesktop.org/pub/mesa/mesa-$version.tar.xz)
-
-build() {
-  cd mesa-$version
-
-  meson build --prefix=/usr \
-              --sysconfdir=/etc \
-              -Dllvm=true \
-              -Dgbm=true \
-              -Dgles1=true \
-              -Dgles2=true \
-              -Dosmesa=gallium \
-              -Dgallium-xa=true \
-              -Dshared-llvm=true \
-              -Dplatforms=x11,drm \
-              -Dgallium-drivers=swrast,freedreno,lima,kmsro,vc4,v3d \
-              -Dglvnd=true  
-
-
-
-        DESTDIR=$PKG ninja -C build -j ${JOBS:-1} install
-
-  # indirect rendering symlink
-  ln -s libGLX_mesa.so.0 $PKG/usr/lib/libGLX_indirect.so.0
-}