Attachment #6725 for bug #31971

View | Details | Raw Unified | Return to bug 31971
Collapse All | Expand All

Lines 14-22 Link Here

(-)a/features.in/x11/README (-6 / +6 lines)
14	а заодно обычно рано теряющие поддержку "устаревших"	14	а заодно обычно рано теряющие поддержку "устаревших"
15	видеокарт.	15	видеокарт.
16		16
17	Их применение возможно совмещать, но в этом случае следует	17	Возможно предоставлять в образе одновременно свободные и закрытые
18	понимать, что автоопределение в X.org предпочитает свободный	18	драйверы, но в этом случае следует понимать, что автоопределение
19	драйвер и nvidia при наличии nouveau не будет автоматически	19	в X.org предпочитает свободный драйвер и nvidia при наличии nouveau
20	выбран, т.е. потребуется дополнительное конфигурирование	20	не будет автоматически выбран, т.е. потребуется дополнительное
21	(вручную или при помощи alterator-x11) -- для live-систем	21	конфигурирование (вручную или при помощи alterator-x11) --
22	это может быть лишено практического смысла.	22	для live-систем это может быть лишено практического смысла.




# the very minimal driver set
use/x11:
	@$(call add_feature)
	@$(call add,THE_KMODULES,drm)	# required by recent nvidia.ko as well
	@$(call add,THE_LISTS,$(call tags,base xorg))
	@$(call add,THE_KMODULES,drm)	# required by recent nvidia.ko as well
	@$(call add,THE_KMODULES,$$(NVIDIA_KMODULES) $$(RADEON_KMODULES))
	@$(call add,THE_PACKAGES,$$(NVIDIA_PACKAGES) $$(RADEON_PACKAGES))

# x86: free drivers for various hardware (might lack acceleration)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/x11/xorg: use/x11/intel use/x11/nouveau use/x11/radeon
	@$(call add,THE_KMODULES,drm-radeon drm-nouveau)
	@$(call add,THE_LISTS,$(call tags,desktop xorg))
else
use/x11/xorg: use/x11; @:

	@$(call add,THE_PACKAGES,xorg-dri-intel)	### #25044

# for those cases when no 3D means no use at all
# NB: blobs won't Just Work (TM) along with nouveau/radeon
#     as free drivers get prioritized during autodetection
#use/x11/3d: use/x11/intel use/x11/nvidia use/x11/fglrx; @:
use/x11/3d: use/x11/intel use/x11/nvidia/optimus use/x11/radeon; @:

# somewhat lacking compared to radeon but still
use/x11/nouveau: use/x11 use/firmware
	@$(call set,NVIDIA_KMODULES,drm-nouveau)
	@$(call set,NVIDIA_PACKAGES,xorg-drv-nouveau)

# has performance problems but is getting better, just not there yet
use/x11/radeon: use/x11 use/firmware
	@$(call set,RADEON_KMODULES,drm-radeon)
	@$(call set,RADEON_PACKAGES,xorg-drv-ati xorg-drv-radeon)

# sometimes broken with current xorg-server
use/x11/nvidia: use/x11
	@$(call set,NVIDIA_KMODULES,nvidia)
	@$(call set,NVIDIA_PACKAGES,nvidia-settings nvidia-xconfig)

use/x11/nvidia/optimus: use/x11/nvidia
	@$(call add,THE_KMODULES,bbswitch)


# oftenly broken with current xorg-server, use radeon then
use/x11/fglrx: use/x11
	@$(call set,RADEON_KMODULES,fglrx)
	@$(call set,RADEON_PACKAGES,fglrx_glx fglrx-tools)

use/x11/wacom: use/x11
	@$(call add,THE_PACKAGES,xorg-drv-wacom xorg-drv-wizardpen)

Lines 2-8 xorg-drv-ati Link Here

(-)a/pkg.in/lists/tagged/desktop+xorg (-2 lines)
2	xorg-drv-cirrus	2	xorg-drv-cirrus
3	xorg-drv-mga	3	xorg-drv-mga
4	xorg-drv-modesetting	4	xorg-drv-modesetting
5	xorg-drv-nouveau
6	xorg-drv-nv	5	xorg-drv-nv
7	xorg-drv-qxl	6	xorg-drv-qxl
8	#xorg-drv-s3	7	#xorg-drv-s3
9	-

Return to bug 31971

Lines 6-18 Link Here

(-)a/features.in/x11/config.mk (-11 / +17 lines)
6	# the very minimal driver set	6	# the very minimal driver set
7	use/x11:	7	use/x11:
8	@$(call add_feature)	8	@$(call add_feature)
9	@$(call add,THE_KMODULES,drm) # required by recent nvidia.ko as well
10	@$(call add,THE_LISTS,$(call tags,base xorg))	9	@$(call add,THE_LISTS,$(call tags,base xorg))
		10	@$(call add,THE_KMODULES,drm) # required by recent nvidia.ko as well
		11	@$(call add,THE_KMODULES,$$(NVIDIA_KMODULES) $$(RADEON_KMODULES))
		12	@$(call add,THE_PACKAGES,$$(NVIDIA_PACKAGES) $$(RADEON_PACKAGES))
11		13
12	# x86: free drivers for various hardware (might lack acceleration)	14	# x86: free drivers for various hardware (might lack acceleration)
13	ifeq (,$(filter-out i586 x86_64,$(ARCH)))	15	ifeq (,$(filter-out i586 x86_64,$(ARCH)))
14	use/x11/xorg: use/x11 use/x11/intel use/firmware	16	use/x11/xorg: use/x11/intel use/x11/nouveau use/x11/radeon
15	@$(call add,THE_KMODULES,drm-radeon drm-nouveau)
16	@$(call add,THE_LISTS,$(call tags,desktop xorg))	17	@$(call add,THE_LISTS,$(call tags,desktop xorg))
17	else	18	else
18	use/x11/xorg: use/x11; @:	19	use/x11/xorg: use/x11; @:
Lines 24-43 use/x11/intel: use/x11 Link Here
24	@$(call add,THE_PACKAGES,xorg-dri-intel) ### #25044	25	@$(call add,THE_PACKAGES,xorg-dri-intel) ### #25044
25		26
26	# for those cases when no 3D means no use at all	27	# for those cases when no 3D means no use at all
27	# NB: blobs won't Just Work (TM) with use/x11/xorg,	28	# NB: blobs won't Just Work (TM) along with nouveau/radeon
28	# nouveau gets prioritized during autodetection	29	# as free drivers get prioritized during autodetection
29	#use/x11/3d: use/x11/intel use/x11/nvidia use/x11/fglrx; @:	30	#use/x11/3d: use/x11/intel use/x11/nvidia use/x11/fglrx; @:
30	use/x11/3d: use/x11/intel use/x11/nvidia/optimus use/x11/radeon; @:	31	use/x11/3d: use/x11/intel use/x11/nvidia/optimus use/x11/radeon; @:
31		32
		33	# somewhat lacking compared to radeon but still
		34	use/x11/nouveau: use/x11 use/firmware
		35	@$(call set,NVIDIA_KMODULES,drm-nouveau)
		36	@$(call set,NVIDIA_PACKAGES,xorg-drv-nouveau)
		37
32	# has performance problems but is getting better, just not there yet	38	# has performance problems but is getting better, just not there yet
33	use/x11/radeon: use/x11 use/firmware	39	use/x11/radeon: use/x11 use/firmware
34	@$(call add,THE_KMODULES,drm-radeon)	40	@$(call set,RADEON_KMODULES,drm-radeon)
35	@$(call add,THE_PACKAGES,xorg-drv-ati xorg-drv-radeon)	41	@$(call set,RADEON_PACKAGES,xorg-drv-ati xorg-drv-radeon)
36		42
37	# sometimes broken with current xorg-server	43	# sometimes broken with current xorg-server
38	use/x11/nvidia: use/x11	44	use/x11/nvidia: use/x11
39	@$(call add,THE_KMODULES,nvidia)	45	@$(call set,NVIDIA_KMODULES,nvidia)
40	@$(call add,THE_PACKAGES,nvidia-settings nvidia-xconfig)	46	@$(call set,NVIDIA_PACKAGES,nvidia-settings nvidia-xconfig)
41		47
42	use/x11/nvidia/optimus: use/x11/nvidia	48	use/x11/nvidia/optimus: use/x11/nvidia
43	@$(call add,THE_KMODULES,bbswitch)	49	@$(call add,THE_KMODULES,bbswitch)
Lines 45-52 use/x11/nvidia/optimus: use/x11/nvidia Link Here
45		51
46	# oftenly broken with current xorg-server, use radeon then	52	# oftenly broken with current xorg-server, use radeon then
47	use/x11/fglrx: use/x11	53	use/x11/fglrx: use/x11
48	@$(call add,THE_KMODULES,fglrx)	54	@$(call set,RADEON_KMODULES,fglrx)
49	@$(call add,THE_PACKAGES,fglrx_glx fglrx-tools)	55	@$(call set,RADEON_PACKAGES,fglrx_glx fglrx-tools)
50		56
51	use/x11/wacom: use/x11	57	use/x11/wacom: use/x11
52	@$(call add,THE_PACKAGES,xorg-drv-wacom xorg-drv-wizardpen)	58	@$(call add,THE_PACKAGES,xorg-drv-wacom xorg-drv-wizardpen)