openmamba/makedist-openmamba-milestone3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: add xorg-drv-video-cirrus to x86_64 and revise other xorgdrvvideo definitions

Browse Source
This commit is contained in:
root 2014-06-14 14:04:16 +02:00 committed by Silvan Calarco
parent 4d0873e50b
commit 447c21a55d
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.defs
View File

@ -86,7 +86,13 @@ libGLcore.so.1 = xorg-drv-video-nvidia
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
libvdpau.so.1 = libvdpau libvdpau.so.1 = libvdpau
libvdpau_trace.so.1 = libvdpau libvdpau_trace.so.1 = libvdpau
xorgdrvvideo = xorg-drv-video-base xorg-drv-video-nouveau $(xorgproprietary) xorgdrvvideo = xorg-drv-video-apm xorg-drv-video-ark xorg-drv-video-ast xorg-drv-video-ati xorg-drv-video-chips \
xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev xorg-drv-video-glint xorg-drv-video-i128 \
xorg-drv-video-i740 xorg-drv-video-intel xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic \
xorg-drv-video-newport xorg-drv-video-nouveau xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-rendition \
xorg-drv-video-s3 xorg-drv-video-s3virge xorg-drv-video-savage xorg-drv-video-siliconmotion xorg-drv-video-sis \
xorg-drv-video-sisusb xorg-drv-video-trident xorg-drv-video-tseng xorg-drv-video-v4l xorg-drv-video-vesa \
xorg-drv-video-vmware xorg-drv-video-voodoo $(xorgproprietary)
# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo
bootloader = syslinux bootloader = syslinux
endif endif
@ -101,9 +107,9 @@ libGLcore.so.1 = xorg-drv-video-nvidia
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
libvdpau.so.1[][64bit] = libvdpau libvdpau.so.1[][64bit] = libvdpau
libvdpau_trace.so.1[][64bit] = libvdpau libvdpau_trace.so.1[][64bit] = libvdpau
xorgdrvvideo = xorg-drv-video-ati xorg-drv-video-dummy xorg-drv-video-fbdev xorg-drv-video-i128 xorg-drv-video-intel \ xorgdrvvideo = xorg-drv-video-ati xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev xorg-drv-video-i128 \
xorg-drv-video-mga xorg-drv-video-nouveau xorg-drv-video-openchrome \ xorg-drv-video-intel xorg-drv-video-mga xorg-drv-video-nouveau xorg-drv-video-openchrome xorg-drv-video-r128 \
xorg-drv-video-r128 xorg-drv-video-vesa xorg-drv-video-v4l xorg-drv-video-vmware $(xorgproprietary) xorg-drv-video-vesa xorg-drv-video-v4l xorg-drv-video-vmware $(xorgproprietary)
bootloader = syslinux bootloader = syslinux
endif endif

1
platforms/bootcd/Makefile.defs
View File

@ -4,4 +4,3 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
#xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia
libGLcore.so.1 = xorg-drv-video-nvidia libGLcore.so.1 = xorg-drv-video-nvidia
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
xorgdrvvideo = xorg-drv-video-base xorg-drv-video-amd xorg-drv-video-nsc xorg-drv-video-fglrx xorg-drv-video-nvidia

1
platforms/installdvd/Makefile.defs
View File

@ -4,7 +4,6 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
#xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia
libGLcore.so.1 = xorg-drv-video-nvidia libGLcore.so.1 = xorg-drv-video-nvidia
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
xorgdrvvideo = xorg-drv-video-base xorg-drv-video-amd xorg-drv-video-nsc xorg-drv-video-fglrx xorg-drv-video-nvidia
libkorganizer.so.1 = korganizer libkorganizer.so.1 = korganizer
libkorganizer_calendar.so.1 = korganizer libkorganizer_calendar.so.1 = korganizer
libkorganizer_eventviewer.so.1 = korganizer libkorganizer_eventviewer.so.1 = korganizer

1
platforms/livecd/Makefile.defs
View File

@ -4,4 +4,3 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
#xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia
libGLcore.so.1 = xorg-drv-video-nvidia libGLcore.so.1 = xorg-drv-video-nvidia
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
#xorgdrvvideo = xorg-drv-video-base xorg-drv-video-amd xorg-drv-video-nsc xorg-drv-video-fglrx xorg-drv-video-nvidia

2
platforms/livedvd/Makefile.defs
View File

@ -4,7 +4,7 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
#xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia
libGLcore.so.1 = xorg-drv-video-nvidia libGLcore.so.1 = xorg-drv-video-nvidia
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
xorgdrvvideo = xorg-drv-video-base xorg-drv-video-amd xorg-drv-video-nsc xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-vboxvideo xorgdrvvideo += xorg-drv-video-vboxvideo
libkorganizer.so.1 = korganizer libkorganizer.so.1 = korganizer
libkorganizer_calendar.so.1 = korganizer libkorganizer_calendar.so.1 = korganizer
libkorganizer_eventviewer.so.1 = korganizer libkorganizer_eventviewer.so.1 = korganizer

1
platforms/testcd-root/Makefile.defs
View File

@ -1,3 +1,2 @@
networkmanagergui = plasma-applet-networkmanagement networkmanagergui = plasma-applet-networkmanagement
#xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-nouveau
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest

1
platforms/testcd/Makefile.defs
View File

@ -4,4 +4,3 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
#xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia
libGLcore.so.1 = xorg-drv-video-nvidia libGLcore.so.1 = xorg-drv-video-nvidia
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
#xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-nouveau