From dbec3496a74df9ef8aea18b1c2c1202611513582 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 10 Mar 2022 16:28:03 +0100
Subject: [xorg] Install libgl1-mesa-dri 22.0-rc3 to avoid glitches

---
 core/modules/xorg/module.build       | 7 +++++++
 core/modules/xorg/module.conf.ubuntu | 3 +++
 2 files changed, 10 insertions(+)

(limited to 'core/modules/xorg')

diff --git a/core/modules/xorg/module.build b/core/modules/xorg/module.build
index 3e730932..e720451a 100644
--- a/core/modules/xorg/module.build
+++ b/core/modules/xorg/module.build
@@ -44,6 +44,13 @@ build() {
 			find . -type f -name "*_drv.so" -exec cp {} "${MODULE_BUILD_DIR}/usr/lib/xorg/modules/drivers" \;
 		done
 	fi
+	# Extra .deb packages
+	local deb dir
+	for deb in $REQUIRED_DEB_PACKAGES; do
+		dir="${MODULE_WORK_DIR}/${deb##*/}"
+		download "$deb" "$dir"
+		apt install -y "$dir" || perror "apt install $dir failed."
+	done
 }
 
 post_copy() {
diff --git a/core/modules/xorg/module.conf.ubuntu b/core/modules/xorg/module.conf.ubuntu
index 99c1f446..756b5016 100644
--- a/core/modules/xorg/module.conf.ubuntu
+++ b/core/modules/xorg/module.conf.ubuntu
@@ -82,3 +82,6 @@ REQUIRED_CONTENT_PACKAGES="
 			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
 "
+REQUIRED_DEB_PACKAGES="
+	https://launchpad.net/~ernstp/+archive/ubuntu/mesarc/+build/23224488/+files/libgl1-mesa-dri_22.0.0~rc3+git2203042220.716ca39489b~f~mesarc5_amd64.deb
+"
-- 
cgit v1.2.3-55-g7522