From 447c21a55db5c85e59fcb9d4d1a5721e5ad072d8 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 14 Jun 2014 14:04:16 +0200 Subject: [PATCH] Makefile: add xorg-drv-video-cirrus to x86_64 and revise other xorgdrvvideo definitions --- Makefile.defs | 14 ++++++++++---- platforms/bootcd/Makefile.defs | 1 - platforms/installdvd/Makefile.defs | 1 - platforms/livecd/Makefile.defs | 1 - platforms/livedvd/Makefile.defs | 2 +- platforms/testcd-root/Makefile.defs | 1 - platforms/testcd/Makefile.defs | 1 - 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 7b357f6..df0a031 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -86,7 +86,13 @@ libGLcore.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia libvdpau.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 bootloader = syslinux endif @@ -101,9 +107,9 @@ libGLcore.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia libvdpau.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 \ - xorg-drv-video-mga xorg-drv-video-nouveau xorg-drv-video-openchrome \ - xorg-drv-video-r128 xorg-drv-video-vesa xorg-drv-video-v4l xorg-drv-video-vmware $(xorgproprietary) +xorgdrvvideo = xorg-drv-video-ati xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev xorg-drv-video-i128 \ + xorg-drv-video-intel xorg-drv-video-mga xorg-drv-video-nouveau xorg-drv-video-openchrome xorg-drv-video-r128 \ + xorg-drv-video-vesa xorg-drv-video-v4l xorg-drv-video-vmware $(xorgproprietary) bootloader = syslinux endif diff --git a/platforms/bootcd/Makefile.defs b/platforms/bootcd/Makefile.defs index 1def362..c76bbe2 100644 --- a/platforms/bootcd/Makefile.defs +++ b/platforms/bootcd/Makefile.defs @@ -4,4 +4,3 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia libGLcore.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 diff --git a/platforms/installdvd/Makefile.defs b/platforms/installdvd/Makefile.defs index f95e0ed..1d3d39b 100644 --- a/platforms/installdvd/Makefile.defs +++ b/platforms/installdvd/Makefile.defs @@ -4,7 +4,6 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia libGLcore.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_calendar.so.1 = korganizer libkorganizer_eventviewer.so.1 = korganizer diff --git a/platforms/livecd/Makefile.defs b/platforms/livecd/Makefile.defs index f4138c4..c76bbe2 100644 --- a/platforms/livecd/Makefile.defs +++ b/platforms/livecd/Makefile.defs @@ -4,4 +4,3 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia libGLcore.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 diff --git a/platforms/livedvd/Makefile.defs b/platforms/livedvd/Makefile.defs index 17d2cb2..bb48250 100644 --- a/platforms/livedvd/Makefile.defs +++ b/platforms/livedvd/Makefile.defs @@ -4,7 +4,7 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia libGLcore.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_calendar.so.1 = korganizer libkorganizer_eventviewer.so.1 = korganizer diff --git a/platforms/testcd-root/Makefile.defs b/platforms/testcd-root/Makefile.defs index 05e6cdc..36c84ec 100644 --- a/platforms/testcd-root/Makefile.defs +++ b/platforms/testcd-root/Makefile.defs @@ -1,3 +1,2 @@ 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 diff --git a/platforms/testcd/Makefile.defs b/platforms/testcd/Makefile.defs index 1777bea..c76bbe2 100644 --- a/platforms/testcd/Makefile.defs +++ b/platforms/testcd/Makefile.defs @@ -4,4 +4,3 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia libGLcore.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