Merge pull request #22885 from craigcarnell/update/mesa-23.0.0

Update/mesa 23.0.1

4 files changed, 48 insertions, 38 deletions

diff --git a/tools/depends/target/libdrm/Makefile b/tools/depends/target/libdrm/Makefile
index 5ef6468997..29a364edcb 100644
--- a/tools/depends/target/libdrm/Makefile
+++ b/tools/depends/target/libdrm/Makefile
@@ -2,9 +2,9 @@ include ../../Makefile.include
 DEPS =../../Makefile.include Makefile ../../download-files.include
 
 LIBNAME=libdrm
-VERSION=2.4.102
+VERSION=2.4.115
 ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
-SHA512=386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c
+SHA512=0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd
 include ../../download-files.include
 
 MESON_BUILD_TYPE=release
@@ -18,21 +18,21 @@ CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson \
 	--prefix=$(PREFIX) \
 	--libdir=lib \
 	--buildtype=$(MESON_BUILD_TYPE) \
-	-Dlibkms=false \
-	-Dnouveau=false \
-	-Domap=false \
-	-Dexynos=false \
-	-Dtegra=false \
-	-Dintel=false \
-	-Dradeon=false \
-	-Damdgpu=false \
-	-Dvmwgfx=false \
-	-Dvc4=false \
-	-Dfreedreno=false \
-	-Detnaviv=false \
-	-Dcairo-tests=false \
-	-Dman-pages=false \
-	-Dvalgrind=false \
+	-Ddefault_library=shared \
+	-Dnouveau=disabled \
+	-Domap=disabled \
+	-Dexynos=disabled \
+	-Dtegra=disabled \
+	-Dintel=disabled \
+	-Dradeon=disabled \
+	-Damdgpu=disabled \
+	-Dvmwgfx=disabled \
+	-Dvc4=disabled \
+	-Dfreedreno=disabled \
+	-Detnaviv=disabled \
+	-Dcairo-tests=disabled \
+	-Dman-pages=disabled \
+	-Dvalgrind=disabled \
 	-Dfreedreno-kgsl=false \
 	-Dinstall-test-programs=false \
 	-Dudev=false
diff --git a/tools/depends/target/mesa/Makefile b/tools/depends/target/mesa/Makefile
index f69eea613e..4e88970452 100644
--- a/tools/depends/target/mesa/Makefile
+++ b/tools/depends/target/mesa/Makefile
@@ -2,9 +2,9 @@ include ../../Makefile.include
 DEPS =../../Makefile.include Makefile ../../download-files.include
 
 LIBNAME=mesa
-VERSION=20.1.7
+VERSION=23.0.1
 ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
-SHA512=5ff614c3f7568db7673cd2398615e5398c7f50093abdabd0730e07fe9c358310793fea3f130058110c9a2aa284c6efd207e1bdca3d1a1ba46fb18d76e34f361a
+SHA512=9bbe0ba0b1a16fe10b35b6aa3a821d96ab9c4ce4ad38056e2c32271e50b48fd5ef6e1a0babadded631f2b136dfb15acf0c41475d73ee28d132c861ce96517e24
 include ../../download-files.include
 
 MESON_BUILD_TYPE=release
@@ -16,8 +16,11 @@ endif
 ifeq ($(CPU), x86_64)
   MESA_GALLIUM_DRIVERS=iris
 else ifeq ($(CPU), $(filter $(CPU), arm aarch64))
-  MESA_GALLIUM_DRIVERS=kmsro,vc4
-  MESA_EXTRA=-Dplatforms=wayland,drm
+  MESA_GALLIUM_DRIVERS=kmsro,vc4,swrast,panfrost
+endif
+
+ifeq ($(RENDER_SYSTEM),gles)
+  MESA_EXTRA=-Dplatforms=wayland
 endif
 
 # configuration settings
@@ -28,22 +31,21 @@ CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson \
 	-Ddri-drivers= \
 	-Dgallium-drivers="$(MESA_GALLIUM_DRIVERS)" \
 	-Dgallium-extra-hud=false \
-	-Dgallium-xvmc=false \
 	-Dgallium-omx=disabled \
 	-Dgallium-nine=false \
 	-Dgallium-opencl=disabled \
 	-Dvulkan-drivers= \
 	-Dshader-cache=true \
-	-Dshared-glapi=true \
+	-Dshared-glapi=enabled \
 	-Dopengl=true \
-	-Dgbm=true \
-	-Degl=true \
+	-Dgbm=enabled \
+	-Degl=enabled \
 	-Dvalgrind=false \
 	-Dlibunwind=false \
 	-Dlmsensors=false \
 	-Dbuild-tests=false \
 	-Dselinux=false \
-	-Dosmesa=none \
+	-Dosmesa=false \
 	-Ddri3=false \
 	-Dglx=disabled \
 	-Dglvnd=false \
@@ -51,8 +53,8 @@ CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson \
 	-Dgallium-vdpau=false \
 	-Dgallium-va=false \
 	-Dgallium-xa=false \
-	-Dgles1=false \
-	-Dgles2=true \
+	-Dgles1=disabled \
+	-Dgles2=enabled \
 	$(MESA_EXTRA)
 
 ifeq ($(CROSS_COMPILING), yes)
diff --git a/tools/depends/target/wayland-protocols/Makefile b/tools/depends/target/wayland-protocols/Makefile
index c617c9a4b2..67781e81e2 100644
--- a/tools/depends/target/wayland-protocols/Makefile
+++ b/tools/depends/target/wayland-protocols/Makefile
@@ -3,10 +3,10 @@ DEPS =Makefile ../../download-files.include
 
 # lib name, version
 LIBNAME=wayland-protocols
-VERSION=1.20
+VERSION=1.24
 SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-SHA512=56c99b1534ca12e094c0ba1a7d38e7551d38dd7dea80d1a35ae4cd60e8b28ddbd8f00374394da871bbfc91aa3a42f77ebed7d62a8fe6165684a385f2028a1bf4
+ARCHIVE=$(SOURCE).tar.xz
+SHA512=4b1122517db56f48a5fafd4bd0cb7f94faef6fdd2d80e6cec17e5a6bafbaf2f5a71b958ed12e6d13965494885c209b2fb6dd8331487b39c6f251e71f1e770a15
 include ../../download-files.include
 
 ifeq ($(PLATFORM),)
@@ -24,12 +24,20 @@ else
 	DEPS += ../../Makefile.include
 endif
 
+MESON_BUILD_TYPE=release
+
+ifeq ($(DEBUG_BUILD), yes)
+  MESON_BUILD_TYPE=debug
+endif
+
 # configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX)
+CONFIGURE = $(PYTHON) $(MESON) $(NATIVEPREFIX)/bin/meson \
+	--prefix=$(PREFIX) \
+	--buildtype=$(MESON_BUILD_TYPE) \
+	-Dtests=false
 
 all: .installed-$(PLATFORM)
 
-
 $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
 ifeq ($(PREFIX),)
 	@echo
@@ -38,11 +46,11 @@ ifeq ($(PREFIX),)
 endif
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); $(AUTORECONF) -vif
-	cd $(PLATFORM); $(CONFIGURE)
+	cd $(PLATFORM); rm -rf build; mkdir -p build
+	cd $(PLATFORM); $(CONFIGURE) . build
 
 .installed-$(PLATFORM): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM) install
+	cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v install
 	ln -sf $(PREFIX)/share/pkgconfig/wayland-protocols.pc $(PREFIX)/lib/pkgconfig/wayland-protocols.pc
 	touch $@
 
diff --git a/tools/depends/target/wayland/Makefile b/tools/depends/target/wayland/Makefile
index 403b41578e..c079d9c1d6 100644
--- a/tools/depends/target/wayland/Makefile
+++ b/tools/depends/target/wayland/Makefile
@@ -3,10 +3,10 @@ DEPS =../../Makefile.include Makefile ../../download-files.include
 
 # lib name, version
 LIBNAME=wayland
-VERSION=1.17.0
+VERSION=1.18.0
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
-SHA512=c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946
+SHA512=e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
 include ../../download-files.include
 
 # configuration settings