From 067bcf02b41adb0cb5fb4e618a4971159736dc07 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 4 Sep 2011 17:22:13 +0200 Subject: [PATCH] Backport from openamba (devel): global Makefile.defs updates --- Makefile.defs | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index e20dd2c..bb2b263 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -4,7 +4,8 @@ libpthread.so.0 = glibc # kernel -kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_96xx +kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia +# kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_96xx kernelsound = kernel-$(KERNEL_EXTRAVER)-sound-backport kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl kernel-$(KERNEL_EXTRAVER)-rtl8192se # kernel-$(KERNEL_EXTRAVER)-atl1e @@ -21,12 +22,18 @@ kernellirc = kernel-$(KERNEL_EXTRAVER)-lirc kernelvboxvideo = kernel-$(KERNEL_EXTRAVER)-vboxvideo # xorg -xorglibGL = libGL-Mesa-dri libGL-fglrx-X11 libGL-nvidia-X11 libGL-nvidia_71xx-X11 libGL-nvidia_96xx-X11 libGL-nvidia_173xx-X11 -xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia xorg-ext-libglx-nvidia_71xx xorg-ext-libglx-nvidia_96xx xorg-ext-libglx-nvidia_173xx -libGLcore.so.1 = xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx -libnvidia-tls.so.1 = xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx -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 xorg-drv-video-vboxvideo -xorgdrvinput = xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-vboxmouse xorg-drv-input-evtouch xorg-drv-input-evdev +xorglibGL = libGL-Mesa-dri libGL-fglrx-X11 libGL-nvidia-X11 +# libGL-nvidia_71xx-X11 libGL-nvidia_96xx-X11 libGL-nvidia_173xx-X11 +xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia +# xorg-ext-libglx-nvidia_71xx xorg-ext-libglx-nvidia_96xx xorg-ext-libglx-nvidia_173xx +libGLcore.so.1 = xorg-drv-video-nvidia +# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx +libnvidia-tls.so.1 = xorg-drv-video-nvidia +# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx +xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nouveau xorg-drv-video-vboxvideo +# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx +xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-vboxmouse xorg-drv-input-evdev +# xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch libGL.so.1 = libGL-Mesa-dri libGLU.so.1 = libGL-Mesa-dri @@ -93,6 +100,8 @@ perl[Automake__XFile] = automake /usr/sbin/pwconv= pwdutils /usr/sbin/pwunconv= pwdutils +libgs.so.9 = ghostscript + # openoffice openofficei18n = OpenOffice-i18n-$(LANGUAGE)