From 53c2933d6bfc38eb1ba129d1d848b5ef1ab614f1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 23 May 2019 14:25:28 +0200
Subject: [xorg] Clean up required packages

---
 core/modules/xorg/module.conf.ubuntu.18 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'core/modules/xorg')

diff --git a/core/modules/xorg/module.conf.ubuntu.18 b/core/modules/xorg/module.conf.ubuntu.18
index 07971d92..1d963149 100644
--- a/core/modules/xorg/module.conf.ubuntu.18
+++ b/core/modules/xorg/module.conf.ubuntu.18
@@ -6,8 +6,8 @@ REQUIRED_INSTALLED_PACKAGES="
 			ttf-dejavu-core
 			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
+			libgl1-mesa-dri
+			libgl1-mesa-glx
 			libglx0
 			libegl1
 			libegl1-mesa
@@ -27,7 +27,6 @@ REQUIRED_INSTALLED_PACKAGES="
 			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
 "
@@ -38,11 +37,12 @@ REQUIRED_CONTENT_PACKAGES="
 			ttf-dejavu-core
 			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
+			libgl1-mesa-dri
+			libgl1-mesa-glx
 			libglx0
 			libglx-mesa0
 			libxcb-glx0
+			@libgbm1
 			libegl1
 			libegl1-mesa
 			libgbm1
@@ -62,7 +62,6 @@ REQUIRED_CONTENT_PACKAGES="
 			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
-- 
cgit v1.2.3-55-g7522