From 4f51f0a25fa3b66fe3a2b657cd90d04ee0a50952 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 27 Jun 2013 17:06:29 +0200 Subject: [PATCH] catalyst: explicitly depend on xserver-abi-video<14 (up to 1.13.x). --- srcpkgs/catalyst/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index 07816eeea2..463acc3e32 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -1,8 +1,8 @@ # Template file for 'catalyst' pkgname=catalyst version=13.4 -revision=1 -short_desc="AMD catalyst driver for Linux -- libraries and utilities" +revision=2 +short_desc="AMD catalyst driver for Linux" maintainer="Juan RP " license="Propietary AMD license" homepage="http://www.amd.com" @@ -99,10 +99,10 @@ do_install() { } catalyst-dkms_package() { - nonfree=yes - short_desc="AMD catalyst driver for Linux -- DKMS kernel module" + short_desc+=" - DKMS kernel module" triggers="dkms" dkms_modules="fglrx ${version}_${revision}" + nonfree=yes pkg_install() { local _fglrx=fglrx-${version}_${revision} @@ -125,10 +125,10 @@ catalyst-dkms_package() { } catalyst-opencl_package() { - nonfree=yes - short_desc="AMD catalyst driver for Linux -- OpenCL implementation" + short_desc+=" - OpenCL implementation" provides="libOpenCL-${version}" replaces="libOpenCL>=0" + nonfree=yes noverifyrdeps=yes pkg_install() { cd ${wrksrc}/fglrx/arch/${_ARCHDIR} @@ -147,9 +147,10 @@ catalyst-opencl_package() { } catalyst_package() { - nonfree=yes - depends="${pkgname}-dkms-${version}_${revision}" + short_desc+=" - Libraries and Utilities" + depends="xserver-abi-video<14 ${pkgname}-dkms-${version}_${revision}" conflicts="nvidia>=0" + nonfree=yes pkg_install() { vmove all }