>From 093c8c48649ed6c50753b5c147f1c377f2bb03a7 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 9 Jul 2019 08:32:05 +0300 Subject: [PATCH] Revert "x11: add amdgpu and vulkan support into base target" This reverts commit 115a1901cd289e8a21a949378ee8bf85508f5cfa: the change has not been tested properly unfortunately, and it broke today's regular-rc builds fortunately; there are no vulkan-{intel,radeon} packages in sisyphus (only amdgpu), and these are present in lakostis@' repo: http://www.unsafe.ru/lakostis/RPMS/ALTLinux/glvnd/repo/x86_64/RPMS.hasher/ Just drop the whole thing until it gets sorted out. --- features.in/x11/config.mk | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk index 69b5b42..a003e8e 100644 --- a/features.in/x11/config.mk +++ b/features.in/x11/config.mk @@ -13,11 +13,10 @@ use/x11: # x86: free drivers for various hardware (might lack acceleration) ifeq (,$(filter-out i586 x86_64,$(ARCH))) -use/x11/xorg: use/x11/vulkan \ - use/x11/intel use/x11/nouveau use/x11/radeon use/x11/amdgpu +use/x11/xorg: use/x11/intel use/x11/nouveau use/x11/radeon @$(call add,THE_LISTS,$(call tags,desktop xorg)) else -use/x11/xorg: use/x11/vulkan-base; @: +use/x11/xorg: use/x11; @: endif use/x11/intel: use/x11 @@ -51,16 +50,9 @@ use/x11/amdgpu: use/x11 use/firmware @$(call add,RADEON_PACKAGES,xorg-drv-amdgpu) # Vulkan is new and bleeding edge, only intel and amgpu(pro?) -use/x11/vulkan-base: use/x11 +use/x11/vulkan: use/x11/intel use/x11/amdgpu @$(call add,THE_PACKAGES,vulkan) - -use/x11/vulkan-intel: use/x11/vulkan-base use/x11/intel - @$(call add,THE_PACKAGES,vulkan-intel) - -use/x11/vulkan-radeon: use/x11/vulkan-base use/x11/amdgpu - @$(call add,THE_PACKAGES,vulkan-radeon) - -use/x11/vulkan: use/x11/vulkan-intel use/x11/vulkan-amdgpu; @: + @$(call add,THE_PACKAGES,vulkan-radeon vulkan-intel) # see https://github.com/NVIDIA/libglvnd for all gory details use/x11/glvnd: use/x11 -- 2.10.4