Merge branch '3.6' into 3.7

9 files changed, 28 insertions, 32 deletions

diff --git a/libdrm/.footprint b/libdrm/.footprint
index 674f912a..a4ca61e7 100644
--- a/libdrm/.footprint
+++ b/libdrm/.footprint
@@ -43,8 +43,6 @@ drwxr-xr-x	root/root	usr/include/libdrm/nouveau/nvif/
 -rw-r--r--	root/root	usr/include/libdrm/via_drm.h
 -rw-r--r--	root/root	usr/include/libdrm/virtgpu_drm.h
 -rw-r--r--	root/root	usr/include/libdrm/vmwgfx_drm.h
-drwxr-xr-x	root/root	usr/include/libkms/
--rw-r--r--	root/root	usr/include/libkms/libkms.h
 -rw-r--r--	root/root	usr/include/libsync.h
 -rw-r--r--	root/root	usr/include/xf86drm.h
 -rw-r--r--	root/root	usr/include/xf86drmMode.h
@@ -64,16 +62,12 @@ lrwxrwxrwx	root/root	usr/lib/libdrm_nouveau.so.2 -> libdrm_nouveau.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib/libdrm_radeon.so -> libdrm_radeon.so.1
 lrwxrwxrwx	root/root	usr/lib/libdrm_radeon.so.1 -> libdrm_radeon.so.1.0.1
 -rwxr-xr-x	root/root	usr/lib/libdrm_radeon.so.1.0.1
-lrwxrwxrwx	root/root	usr/lib/libkms.so -> libkms.so.1
-lrwxrwxrwx	root/root	usr/lib/libkms.so.1 -> libkms.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libkms.so.1.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libdrm.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libdrm_amdgpu.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libdrm_intel.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libdrm_nouveau.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libdrm_radeon.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/libkms.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/libdrm/
 -rw-r--r--	root/root	usr/share/libdrm/amdgpu.ids
diff --git a/libdrm/.signature b/libdrm/.signature
index fbe3ef09..8515243d 100644
--- a/libdrm/.signature
+++ b/libdrm/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndNzB85DpmXiS2Pa+vjTJXRg3CgHgbcWh37Q98CrxQaDon4wME697HPOALoRPQbWZdauNeb1Oz8C2Ybdeg1sNhQA=
-SHA256 (Pkgfile) = d49ce5ec9a5b5db70f77550ab5b5c36c5c9a290d47b11bb7c99e67743d4f8a4e
-SHA256 (.footprint) = c6dc07ce7fe377b8a3d62908bcb09696e9366d1831adaba084d3c8db6e1454d0
-SHA256 (libdrm-2.4.110.tar.xz) = eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737
+RWTSGWF5Q7TndMFB0gVgldbDag+upnOLKJZdimYMJD4cniT2cIv/EeN7axUfQMf7cMgqk11YNcFezMcqC6jGPlNQYxMaQEgwOQU=
+SHA256 (Pkgfile) = c144d5cb373fb507e901eed170aaf6a4587e93fb811246153ce64e43ce08f24b
+SHA256 (.footprint) = 9c34397a9d89ba2cce5de09a4c7e00c8729b84120058b3a84b5b00e329ed8833
+SHA256 (libdrm-2.4.111.tar.xz) = 1ad7164f77424de6f4ecba7c262bde196a214c6e19a6fbf497f0815f4d7ab2a9
diff --git a/libdrm/Pkgfile b/libdrm/Pkgfile
index ff47f09f..f0d34367 100644
--- a/libdrm/Pkgfile
+++ b/libdrm/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: xorg-libpciaccess
 
 name=libdrm
-version=2.4.110
+version=2.4.111
 release=1
 source=(https://dri.freedesktop.org/libdrm/libdrm-$version.tar.xz)
 
diff --git a/mesa-demos/.signature b/mesa-demos/.signature
index ad7086b5..f0d60e61 100644
--- a/mesa-demos/.signature
+++ b/mesa-demos/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndACbe5OeszT0F4xwrsiSVxMT1gmSsU0aVm8gpjW7YIK3AHUFN0NtQBaeFuizTt7As1n0tH/229DYh8Y+qh+XRAI=
-SHA256 (Pkgfile) = 0f758468a2af60946b2bb1cfd13ceb82d2402549991d020dea08239345295d94
+RWTSGWF5Q7TndLJuyd/PpuegrBVL2CSPalsyrZ4Z17CfDJVIEUM9gg7NeOAfHgNaZrr4gY1aKmdWlNqq0MBsC+P1nq2u9g2jaAY=
+SHA256 (Pkgfile) = e4947ab34c6c45fe1f76a8499a56d5aa3a4051d18eb33a82413a5e17bafb08fc
 SHA256 (.footprint) = a328423b6004ca0d68a4ede62c70b950fc7e488a771c89630cf8f10a868bd341
-SHA256 (mesa-demos-8.4.0.tar.bz2) = 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d
+SHA256 (mesa-demos-8.5.0.tar.bz2) = cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1
diff --git a/mesa-demos/Pkgfile b/mesa-demos/Pkgfile
index cca26eca..e1fdc952 100644
--- a/mesa-demos/Pkgfile
+++ b/mesa-demos/Pkgfile
@@ -1,20 +1,22 @@
 # Description: Mesa 3D demos
 # URL: https://www.mesa3d.org/
 # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu
-# Depends on: glew glu
+# Depends on: glew glu meson ninja
 
 name=mesa-demos
-version=8.4.0
+version=8.5.0
 release=1
-source=(https://archive.mesa3d.org/demos/$name-$version.tar.bz2)
+source=(https://archive.mesa3d.org/demos/$version/$name-$version.tar.bz2)
 
 build() {
-	cd $name-$version
-
-	./configure --prefix=/usr
-
-	make -C src/xdemos/ glxinfo glxgears
-
+	meson setup build $name-$version \
+		--prefix=/usr \
+		--buildtype=plain \
+		--wrap-mode nodownload \
+		-D b_lto=true \
+		-D b_pie=true \
+		-D osmesa=disabled
+	meson compile -C build -j ${JOBS:-1}
 	install -d $PKG/usr/bin
-	install -m 0755 -t $PKG/usr/bin src/xdemos/glx{gears,info}
+	install -m 0755 -t $PKG/usr/bin build/src/xdemos/glx{gears,info}
 }
diff --git a/mesa/.signature b/mesa/.signature
index 19150b78..7d13c3cb 100644
--- a/mesa/.signature
+++ b/mesa/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndH0SXYGsInj3vXy2mo6KxzGYC2X4bBDLt/LxQJJicF5m72ILxDKxT0GsiqY7ITZYOHHms7Y5KE89Rl+RJTb/BwY=
-SHA256 (Pkgfile) = 7861741878e4ec67b2cb3d5b7d7942c7aa7c92b6474f7fe09d5a446826b8824e
+RWTSGWF5Q7TndE6qFaULQkUJItf2+kQWt6l4XyqfyDjcpi/XyThGQiPCyMncTzMKgJpLefggp1kYEQTdfgc6hlj6sXEGotoE7wA=
+SHA256 (Pkgfile) = 3e9c3113485ba688462226adb8430607118879f38151902daeccc8785ffbf762
 SHA256 (.footprint) = 3730189691884ab819d74ba20afa35a994a4bea01e5192373a83700a03dddbce
-SHA256 (mesa-22.0.4.tar.xz) = c7971f58fa826e474617cda53250c6600fce60994b9fac5b641522e21f471ed4
+SHA256 (mesa-22.1.1.tar.xz) = 46940865ffe794db73ac2bc7ab7ff2570042a0b61a8ac43ca1688863e2bc0ef1
diff --git a/mesa/Pkgfile b/mesa/Pkgfile
index dfee1033..7cbfc1b3 100644
--- a/mesa/Pkgfile
+++ b/mesa/Pkgfile
@@ -5,7 +5,7 @@
 # Optional: libva libvdpau wayland-protocols
 
 name=mesa
-version=22.0.4
+version=22.1.1
 release=1
 source=(https://archive.mesa3d.org/$name-$version.tar.xz)
 
diff --git a/xorg-xwayland/.signature b/xorg-xwayland/.signature
index 8e9d7342..7147b34e 100644
--- a/xorg-xwayland/.signature
+++ b/xorg-xwayland/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndBDTQYRqEhGkvujaAYIxLaYk3gX/yTWLHFo3hwPp1ZN/1ZMsde/xy3wb6JOEc0M0Sck+3RGUbkYsQqka+iy/sAs=
-SHA256 (Pkgfile) = 285709bd773919e0f051488dd862415b7b420f0a3adfd2f0da4aafdcebfe7649
+RWTSGWF5Q7TndEgG4IEvCWM8p+RXwoA05uFsyPbHRKn3fwcALP2ISxLqKYROZu++/8uR/HKipgLdPzjjqczEMOGUJU2od7QFDAw=
+SHA256 (Pkgfile) = 2b25aa3299b8fbfde5a0c13686c0d339b3d6907d3fa6d0a108b3c5157c2f9e99
 SHA256 (.footprint) = a0f710b525178b1c96a2165cdd68d98915bc2bcecc4cc68be00ff7a105fb25d8
-SHA256 (xwayland-22.1.1.tar.xz) = f5d0e0ba37e19bb87c62f61da5970bd204939f2120620964bed4cc8495baa657
+SHA256 (xwayland-22.1.2.tar.xz) = 743c4d56cfc0818755e2281d625d51860b41a473c641e179649a4f41776d1fca
diff --git a/xorg-xwayland/Pkgfile b/xorg-xwayland/Pkgfile
index bce909b6..2d0e3083 100644
--- a/xorg-xwayland/Pkgfile
+++ b/xorg-xwayland/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: dbus egl-wayland xorg-server
 
 name=xorg-xwayland
-version=22.1.1
+version=22.1.2
 release=1
 source=(https://xorg.freedesktop.org/releases/individual/xserver/xwayland-$version.tar.xz)