diff options
| author | Jonathan Bauer | 2017-11-30 11:22:35 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2017-11-30 11:22:35 +0100 |
| commit | 7e684456aca1982139eb4ff3f4fa41de26307f6d (patch) | |
| tree | 0014a1cdba2f65d0a8c17af1033c9c144134003a /core/modules/xorg | |
| parent | [systemd] fixes compilation problems on 17.10 (diff) | |
| download | mltk-7e684456aca1982139eb4ff3f4fa41de26307f6d.tar.gz mltk-7e684456aca1982139eb4ff3f4fa41de26307f6d.tar.xz mltk-7e684456aca1982139eb4ff3f4fa41de26307f6d.zip | |
[xorg] do not delete libglamor anymore
The bug described in the comments seems to be fixed for newer Xorg
versions
Diffstat (limited to 'core/modules/xorg')
| -rw-r--r-- | core/modules/xorg/module.build | 6 | ||||
| -rw-r--r-- | core/modules/xorg/module.conf.ubuntu.17 | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/core/modules/xorg/module.build b/core/modules/xorg/module.build index 8fc1edd4..b5f4eb53 100644 --- a/core/modules/xorg/module.build +++ b/core/modules/xorg/module.build @@ -27,8 +27,10 @@ build() { cp -r "${MODULE_BUILD_DIR}/etc/udev" "${MODULE_BUILD_DIR}/usr/lib/" fi rm -rf -- "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/etc/udev" - # This freezed/crashed X with certain gfx cards (radeon R240) - rm -f -- "${MODULE_BUILD_DIR}/usr/lib/xorg/modules/libglamoregl.so" + + # This used to freeze/crashe X with certain gfx cards (radeon R240) + # /usr/lib/xorg/modules/libglamoregl.so + # Newer X versions seems to have this fixed, so we included it again # See if we should build more up to date versions of drivers local drv diff --git a/core/modules/xorg/module.conf.ubuntu.17 b/core/modules/xorg/module.conf.ubuntu.17 index 66ba3a90..520cc3b5 100644 --- a/core/modules/xorg/module.conf.ubuntu.17 +++ b/core/modules/xorg/module.conf.ubuntu.17 @@ -25,7 +25,6 @@ REQUIRED_INSTALLED_PACKAGES=" xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX - libdrm-dev libgbm-dev libgl-dev @@ -51,6 +50,12 @@ REQUIRED_CONTENT_PACKAGES=" xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX + libegl1-mesa + libgbm1 + libcapnp-0.5.3 + libmirclient9 + libwayland-client0 + libwayland-server0 xkb-data x11-xkb-utils x11-xserver-utils |