From 916f339374c0815b868509d2b11e6bc148fc81c1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 27 Jun 2013 17:56:03 +0200 Subject: [PATCH] nvidia: explicitly depend on xserver-abi-video<14 (up to 1.13.x). --- srcpkgs/nvidia/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index ff27a8acca7..49ce567c789 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -1,8 +1,8 @@ # Template file for 'nvidia' pkgname=nvidia version=319.32 -revision=1 -short_desc="NVIDIA drivers for linux - libraries and utilities" +revision=2 +short_desc="NVIDIA drivers for linux" maintainer="Juan RP " license="Propietary NVIDIA license" homepage="http://www.nvidia.com" @@ -130,11 +130,11 @@ do_install() { } nvidia-dkms_package() { - nonfree=yes + short_desc+=" - DKMS kernel module" triggers="dkms" dkms_modules="nvidia ${version}" depends="dkms" - short_desc="NVIDIA drivers for linux - DKMS kernel module" + nonfree=yes pkg_install() { vmove usr/src vmove usr/lib/modules-load.d @@ -143,10 +143,10 @@ nvidia-dkms_package() { } nvidia-opencl_package() { - nonfree=yes - short_desc="NVIDIA drivers for linux - OpenCL implementation" + short_desc+=" - OpenCL implementation" provides="libOpenCL-${version}" replaces="libOpenCL>=0" + nonfree=yes pkg_install() { vmove "usr/lib/libOpenCL*" vmove "usr/lib/libnvidia-compiler*" @@ -156,9 +156,10 @@ nvidia-opencl_package() { } nvidia_package() { - nonfree=yes - depends="nvidia-dkms-${version}_${revision} pkg-config" + short_desc+=" - Libraries and Utilities" + depends="xserver-abi-video<14 nvidia-dkms-${version}_${revision} pkg-config" conflicts="catalyst>=0" + nonfree=yes pkg_install() { vmove all }