Merge remote-tracking branch 'origin/3.6' into 3.7

2022-04-23 11:43:44 +02:00 · 2022-04-23 11:43:44 +02:00 · 07f2965062
commit 07f2965062
parent 43cceadd41 b6a40265a3
13 changed files with 38 additions and 33 deletions
--- a/libinput/.signature
+++ b/libinput/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndMhaRVKQahIyjJxa7lkdmhzPoqZI5i7Ui7fJini2RFE7VowfaVSyUZf4x1KE7muY3p9snaISKjGhYQLG2udyQQc=
-SHA256 (Pkgfile) = 1e5a7bfc70d0a5b17e18d1705c152a1d36faba7a1bf29b17c1d389c211f4ee6f
+RWTSGWF5Q7TndLi/edvHvprrIddzJti9315/zHTHrH3MDzlv0mEpb6G96+BTD8e2NUPG0Kx4XWuPxL53us7yP61PV8f6USOyJw0=
+SHA256 (Pkgfile) = 0604dfcc51b6ba83132608c313839642677613f49dc576eeff37560f3ee4d4aa
 SHA256 (.footprint) = c021fb4a467a01a57d49be8ef7c3f9efa5ec3c600c4dc99c9857afa3304fa261
-SHA256 (libinput-1.20.0.tar.bz2) = 6c1f97892a7d599f97349e5e7c1239901fe00edcd4f6289f410034d5dc06cc85
+SHA256 (libinput-1.20.1.tar.bz2) = 08c003f724f361ed21f4dfbfe755a6c115b85385f1418907bb98f185457273f0
--- a/libinput/Pkgfile
+++ b/libinput/Pkgfile
@ -5,7 +5,7 @@
 # Optional: wayland-protocols

 name=libinput
-version=1.20.0
+version=1.20.1
 release=1
 source=(https://gitlab.freedesktop.org/libinput/libinput/-/archive/$version/$name-$version.tar.bz2)

--- a/mesa/.footprint
+++ b/mesa/.footprint
@ -13,6 +13,7 @@ drwxr-xr-x	root/root	usr/include/GL/internal/
 -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/crocus_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/iris_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/kms_swrast_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/nouveau_dri.so
@ -59,6 +60,7 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 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
+-rw-r--r--	root/root	usr/share/drirc.d/00-radv-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
--- a/mesa/.signature
+++ b/mesa/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndBG315gXrHwjgaSKBaVkzD6JjkYZ72FyCDM+3CA2DeJg/H0iEqTAaElqQJPl8c9q5Vxdh9PL/SqxystjGLNyeAY=
-SHA256 (Pkgfile) = 0bbd0c6f35c7cd43d6f7a590c2dcc8cf2c21999bc3a69860af7dcd6b77534a81
-SHA256 (.footprint) = f24da92356ab367ec3a56002060f5172250ef9517d625f7aec9aa43a738e65c9
-SHA256 (mesa-22.0.1.tar.xz) = c05f9682c54560b36e0afa70896233fc73f1ed715e10d1a028b0eb84fd04426f
+RWTSGWF5Q7TndLqIQz1SL3yqY+aYmK6XgtJawi5gJ/it7Qs8OK01GrIgnvrN8kvH64bEVKenMJxXV6btCua12xpIf9cqhbnuKQA=
+SHA256 (Pkgfile) = 5ca2f1f145f2ca85d467df5f9f77dad9ddfa7c4e3323355ba9700976fbd65d05
+SHA256 (.footprint) = 3730189691884ab819d74ba20afa35a994a4bea01e5192373a83700a03dddbce
+SHA256 (mesa-22.0.2.tar.xz) = df4fa560dcce6680133067cd15b0505fc424ca703244ce9ab247c74d2fab6885
--- a/mesa/Pkgfile
+++ b/mesa/Pkgfile
@ -5,8 +5,8 @@
 # Optional: libva libvdpau wayland-protocols

 name=mesa
-version=22.0.1
-release=1
+version=22.0.2
+release=2
 source=(https://archive.mesa3d.org/$name-$version.tar.xz)

 build() {
@ -34,7 +34,7 @@ build() {
 		-D glx=dri \
 		-D osmesa=true \
 		-D gallium-xa=enabled \
-		-D gallium-drivers=r300,r600,svga,swrast,radeonsi,nouveau,iris,virgl \
+		-D gallium-drivers=r300,r600,svga,swrast,radeonsi,nouveau,iris,virgl,crocus \
 		-D platforms=${PKGMK_MESA_PLATFORMS#,} \
 		-D shared-glapi=enabled \
 		-D vulkan-drivers=amd,intel \
--- a/xorg-xauth/.signature
+++ b/xorg-xauth/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndK740SLlcKgM/Xi2LUjxdciWJEx78cqjoNlnstNu+yCto+Qk1p2J0UDDe+A+rhQ+6uJ6Uugqx9kB/MwKRtO1Ow0=
-SHA256 (Pkgfile) = ec614f86375758e6c3e28272f14e5a51b97013e4d4164016f9ce04332e105d25
+RWTSGWF5Q7TndCDiEi/XGwRuUZ3iWvjSh/JM0CXcoyCa2ksM3I1zKpgGz4mqE2cl2JBF2Dn4a8K/97PTuiWADbMW1X/7LBJczgg=
+SHA256 (Pkgfile) = c7150f61d3ad2e7c82f479078a0e646bd628c99c62da7e03a80a710933d4e551
 SHA256 (.footprint) = cd1829624890d24527f43e1a3e61b312c9319f6c9ce5f979c537deb90b212d80
-SHA256 (xauth-1.1.1.tar.bz2) = 164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92
+SHA256 (xauth-1.1.2.tar.xz) = 78ba6afd19536ced1dddb3276cba6e9555a211b468a06f95f6a97c62ff8ee200
--- a/xorg-xauth/Pkgfile
+++ b/xorg-xauth/Pkgfile
@ -4,9 +4,9 @@
 # Depends on: xorg-server

 name=xorg-xauth
-version=1.1.1
+version=1.1.2
 release=1
-source=(https://www.x.org/releases/individual/app/xauth-$version.tar.bz2)
+source=(https://www.x.org/releases/individual/app/xauth-$version.tar.xz)

 build() {
 	cd xauth-$version
--- a/xorg-xdpyinfo/.signature
+++ b/xorg-xdpyinfo/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndER2pm4D4CRilVIFNZEVkqWpk3J/yOdJQ6KLy8ZeYl3eo6RZsa/XYTuHTF7Bz+fN1+zV2kA+icNLWbo+1oTRlwE=
-SHA256 (Pkgfile) = 7033402ded1780f8f7c79d60b1a02afbe4868abfcff1b27c9b957e51faa43156
+RWTSGWF5Q7TndPcKqS+WRUsATsw5vq9EYQztUkwlFriFMyGlHq2v/5NaTtHZlqeKLxPw0jpg4kPtmj65CRyEI3b+UOPhXrl/vwM=
+SHA256 (Pkgfile) = e085046e4628151edd54252b3f0d08871b8d72ae5bb3eb058fd2040e5b3ba8fd
 SHA256 (.footprint) = aaabe16e46a2db1dd72629e8512b80b266030b60ede32beb5cbb775886ca2db2
-SHA256 (xdpyinfo-1.3.2.tar.bz2) = 30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51
+SHA256 (xdpyinfo-xdpyinfo-1.3.3.tar.bz2) = d0d3f088b0bd0bc1c968099f055e0d1be53eb57a834d46c09baea70f851d3e7b
--- a/xorg-xdpyinfo/Pkgfile
+++ b/xorg-xdpyinfo/Pkgfile
@ -4,13 +4,14 @@
 # Depends on: xorg-libdmx xorg-libxcomposite xorg-libxinerama xorg-libxrender xorg-libxtst xorg-libxxf86dga xorg-libxxf86misc xorg-libxxf86vm

 name=xorg-xdpyinfo
-version=1.3.2
-release=2
-source=(https://www.x.org/releases/individual/app/xdpyinfo-$version.tar.bz2)
+version=1.3.3
+release=1
+source=(https://gitlab.freedesktop.org/xorg/app/xdpyinfo/-/archive/xdpyinfo-$version/xdpyinfo-xdpyinfo-$version.tar.bz2)

 build() {
-	cd xdpyinfo-$version
+	cd xdpyinfo-xdpyinfo-$version

+	autoreconf -v --install
 	./configure --prefix=/usr

 	make
--- a/xorg-xf86-video-dummy/.signature
+++ b/xorg-xf86-video-dummy/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndAKk4424/pjWZ8nsRtCPVqqd045uzUnt8wsgf987Qu5dNmwLEnSth2/4tvRi0Wbi2dDpSt7ebhTKK44ge6z8pgA=
-SHA256 (Pkgfile) = 42bc3f92646a03b127f5fb919a749833205768b8eee80e4f0ae04cc96f41d1d5
+RWTSGWF5Q7TndHJxXiW+wWfQkHQQsY4GkSabSIuI34uQyocGE7Nxs3gLyzr16RAxZZ0Kvvu4nNNPDhp8/u1VLJeI/du7fpIWYg8=
+SHA256 (Pkgfile) = 006a47e96e0c62bafffaaf5f214a242bdaf9428e71d88e5bc9735e21dfa0c6d2
 SHA256 (.footprint) = eb906926a6b8efd0829290407aacd66382da5dc7b3445ca7c9d748b34e0c412c
-SHA256 (xf86-video-dummy-0.3.8.tar.bz2) = 3712bb869307233491e4c570732d6073c0dc3d99adfdb9977396a3fdf84e95b9
+SHA256 (xf86-video-dummy-xf86-video-dummy-0.4.0.tar.bz2) = baa19e19b0b3b913fb2f7f8bb8217cb42abde44f2e4cdf75e22d30ed20245292
--- a/xorg-xf86-video-dummy/Pkgfile
+++ b/xorg-xf86-video-dummy/Pkgfile
@ -4,12 +4,14 @@
 # Depends on: xorg-server

 name=xorg-xf86-video-dummy
-version=0.3.8
+version=0.4.0
 release=1
-source=(https://www.x.org/releases/individual/driver/xf86-video-dummy-$version.tar.bz2)
+source=(https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/-/archive/xf86-video-dummy-$version/xf86-video-dummy-xf86-video-dummy-$version.tar.bz2)

 build() {
-	cd xf86-video-dummy-$version
+	cd xf86-video-dummy-xf86-video-dummy-$version
+
+	autoreconf -v --install
 	./configure --prefix=/usr

 	make
--- a/xorg-xorgproto/.signature
+++ b/xorg-xorgproto/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndALGVpKOiGUD/LMCi0P4MpiWU2XXzJCNB6C/SR8Qj8i61BD5wnoG9fTFP4DemtdKR7zgifcGF0QTbT9YvPwSfQY=
-SHA256 (Pkgfile) = ae304b6b9070ce0b7cf81664f90ef94e43963ff3d53ea7c47bbdcf9a0a049841
+RWTSGWF5Q7TndMh+eKDQkMhms7vSE3SUM1/l2oub2k3IbvW+RS7aZJe18NEK0EIvtozgPF9vpWqiGIbs0EVDKKb9lJXYK7mz3Q0=
+SHA256 (Pkgfile) = 58070fb6a50da47fd256421b4b54a23ebe287a0cbe45cd96443882bc21577f57
 SHA256 (.footprint) = d08a8b0084764d3239a543411b7e5fcb59df5115bac4200d42d500840d389b3c
-SHA256 (xorgproto-2021.5.tar.bz2) = aa2f663b8dbd632960b24f7477aa07d901210057f6ab1a1db5158732569ca015
+SHA256 (xorgproto-2022.1.tar.bz2) = 1d2dcc66963f234d2c1e1f8d98a0d3e8725149cdac0a263df4097593c48bc2a6
--- a/xorg-xorgproto/Pkgfile
+++ b/xorg-xorgproto/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: meson ninja

 name=xorg-xorgproto
-version=2021.5
+version=2022.1
 release=1
 source=(https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$version.tar.bz2)