mesa3d: updated to 19.1.5. Added lima support

diff --git a/mesa3d/.footprint b/mesa3d/.footprint
index 8c7469c02f5d39093ba73594f0a50b6869d80ef9..011f80df0378482e76e5cdb1d1353c2548ae138a 100644 (file)
--- a/mesa3d/.footprint
+++ b/mesa3d/.footprint
@@ -42,49 +42,38 @@ drwxr-xr-x  root/root       usr/lib/
 drwxr-xr-x     root/root       usr/lib/dri/
 -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/msm_dri.so
 -rwxr-xr-x     root/root       usr/lib/dri/swrast_dri.so
--rwxr-xr-x     root/root       usr/lib/libEGL.la
-lrwxrwxrwx     root/root       usr/lib/libEGL.so -> libEGL.so.1.0.0
-lrwxrwxrwx     root/root       usr/lib/libEGL.so.1 -> libEGL.so.1.0.0
--rwxr-xr-x     root/root       usr/lib/libEGL.so.1.0.0
--rwxr-xr-x     root/root       usr/lib/libGL.la
-lrwxrwxrwx     root/root       usr/lib/libGL.so -> libGL.so.1.2.0
-lrwxrwxrwx     root/root       usr/lib/libGL.so.1 -> libGL.so.1.2.0
--rwxr-xr-x     root/root       usr/lib/libGL.so.1.2.0
--rwxr-xr-x     root/root       usr/lib/libGLESv1_CM.la
-lrwxrwxrwx     root/root       usr/lib/libGLESv1_CM.so -> libGLESv1_CM.so.1.1.0
-lrwxrwxrwx     root/root       usr/lib/libGLESv1_CM.so.1 -> libGLESv1_CM.so.1.1.0
--rwxr-xr-x     root/root       usr/lib/libGLESv1_CM.so.1.1.0
--rwxr-xr-x     root/root       usr/lib/libGLESv2.la
-lrwxrwxrwx     root/root       usr/lib/libGLESv2.so -> libGLESv2.so.2.0.0
-lrwxrwxrwx     root/root       usr/lib/libGLESv2.so.2 -> libGLESv2.so.2.0.0
--rwxr-xr-x     root/root       usr/lib/libGLESv2.so.2.0.0
--rwxr-xr-x     root/root       usr/lib/libOSMesa.la
-lrwxrwxrwx     root/root       usr/lib/libOSMesa.so -> libOSMesa.so.8.0.0
+lrwxrwxrwx     root/root       usr/lib/libEGL_mesa.so -> libEGL_mesa.so.0
+lrwxrwxrwx     root/root       usr/lib/libEGL_mesa.so.0 -> libEGL_mesa.so.0.0.0
+-rwxr-xr-x     root/root       usr/lib/libEGL_mesa.so.0.0.0
+lrwxrwxrwx     root/root       usr/lib/libGLX_indirect.so.0 -> libGLX_mesa.so.0
+lrwxrwxrwx     root/root       usr/lib/libGLX_mesa.so -> libGLX_mesa.so.0
+lrwxrwxrwx     root/root       usr/lib/libGLX_mesa.so.0 -> libGLX_mesa.so.0.0.0
+-rwxr-xr-x     root/root       usr/lib/libGLX_mesa.so.0.0.0
+lrwxrwxrwx     root/root       usr/lib/libOSMesa.so -> libOSMesa.so.8
 lrwxrwxrwx     root/root       usr/lib/libOSMesa.so.8 -> libOSMesa.so.8.0.0
 -rwxr-xr-x     root/root       usr/lib/libOSMesa.so.8.0.0
--rwxr-xr-x     root/root       usr/lib/libgbm.la
-lrwxrwxrwx     root/root       usr/lib/libgbm.so -> libgbm.so.1.0.0
+lrwxrwxrwx     root/root       usr/lib/libgbm.so -> libgbm.so.1
 lrwxrwxrwx     root/root       usr/lib/libgbm.so.1 -> libgbm.so.1.0.0
 -rwxr-xr-x     root/root       usr/lib/libgbm.so.1.0.0
--rwxr-xr-x     root/root       usr/lib/libglapi.la
-lrwxrwxrwx     root/root       usr/lib/libglapi.so -> libglapi.so.0.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/libxatracker.la
-lrwxrwxrwx     root/root       usr/lib/libxatracker.so -> libxatracker.so.2.4.0
-lrwxrwxrwx     root/root       usr/lib/libxatracker.so.2 -> libxatracker.so.2.4.0
--rwxr-xr-x     root/root       usr/lib/libxatracker.so.2.4.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
 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/egl.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/gbm.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/gl.pc
--rw-r--r--     root/root       usr/lib/pkgconfig/glesv1_cm.pc
--rw-r--r--     root/root       usr/lib/pkgconfig/glesv2.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

diff --git a/mesa3d/.signature b/mesa3d/.signature
index a629a00d7b4b81095491c6dfc45953818716f7dd..7fe85dcdd5660780f8ea24e78dfce8f775abeccc 100644 (file)
--- a/mesa3d/.signature
+++ b/mesa3d/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg-arm64.pub
-RWQK42WfXMUBTIZDrT4hbiaLDgzf4rIYhAfDTXQgviwmgOkivMPqebjqc1FicbfKoyqEcQGPOsdIEvfJYSsA0YpvcZF2sRwYlwY=
-SHA256 (Pkgfile) = a8f5cd0dd844d9638fabb8b9ec5be35b7b54a9b53d700415555b02163a662e81
-SHA256 (.footprint) = 371a09e7fe9e71a1ba95b56f1ec3e43ceb2ec91bf5de81cd6cba64fa96c15d02
-SHA256 (mesa-18.3.6.tar.xz) = aaf17638dcf5a90b93b6389e152fdc9ef147768b09598f24d2c5cf482fcfc705
+RWQK42WfXMUBTOEmaCrjHavy416u6JKt0HCgVrX0oNvD2AEku6DzW7nXaaE/3VvSQx51S01ASLIHfJKaqTnrzhOBSpUncYqwTg4=
+SHA256 (Pkgfile) = 2f8a46531d8d4e48d9175311e7f4ef51edcfc3fe1c6dc5f46a5119752278a955
+SHA256 (.footprint) = 8e2b948f874ca6b15fb0a1d0a650e7e582cf8cc1cc78712e1c249b14074f5c96
+SHA256 (mesa-19.1.5.tar.xz) = 7b54e14e35c7251b171b4cf9d84cbc1d760eafe00132117db193454999cd6eb4

diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile
index 6a207eeb397257d05ff7782cf6fcf4bdbf02094e..4daa22056e7313d8820a87bd2be8d06b98266491 100644 (file)
--- a/mesa3d/Pkgfile
+++ b/mesa3d/Pkgfile
@@ -2,33 +2,33 @@
 # 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 llvm xorg-libxdamage xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm python-mako
+# Depends on: elfutils libdrm libvdpau libglvnd llvm xorg-libxdamage xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm python3-mako
 
 name=mesa3d
-version=18.3.6
+version=19.1.5
 release=1
 source=(ftp://ftp.freedesktop.org/pub/mesa/mesa-$version.tar.xz)
 
 build() {
   cd mesa-$version
 
-  ./configure --prefix=/usr \
-              --build=aarch64-unknown-linux-gnueabi \
+  meson build --prefix=/usr \
               --sysconfdir=/etc \
-              --disable-gallium-llvm \
-              --enable-gbm \
-              --enable-gles1 \
-              --enable-gles2 \
-              --enable-glx-tls \
-              --enable-osmesa \
-              --enable-texture-float \
-              --enable-xa \
-              --enable-llvm-shared-libs \
-              --disable-dependency-tracking \
-              --with-dri-drivers=swrast \
-              --with-gallium-drivers=swrast,freedreno \
-              --with-egl-platforms=x11,drm
+              -Dllvm=true \
+              -Dgbm=true \
+              -Dgles1=true \
+              -Dgles2=true \
+              -Dosmesa=gallium \
+              -Dgallium-xa=true \
+              -Dshared-llvm=true \
+              -Dplatforms=x11,drm \
+              -Dgallium-drivers=swrast,freedreno,lima \
+              -Dglvnd=true  
 
-  make
-  make DESTDIR=$PKG install
+
+
+        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
 }