jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

catalyst, nvidia: do not depend on the xserver-abi-video vpkg.

Browse source 
This introduces an unresolved circular dependency that cannot be
resolved easily:

nvidia -> xorg-server -> libGL -> nvidia

Rather add a conflict with the unsupported xserver-abi-video pkgs.
This commit is contained in:
Juan RP 2015-03-21 11:46:17 +01:00
parent 452bf9c70e
commit 30117c7a89
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/catalyst/template
View file

@ -4,15 +4,15 @@ _distver="14.12"
pkgname=catalyst
version=14.501.1003
revision=3
revision=4
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary AMD license"
homepage="http://www.amd.com"
only_for_archs="i686 x86_64"
hostmakedepends="unzip wget"
depends="virtual?xserver-abi-video<19_1 ${pkgname}-dkms-${version}_${revision}"
conflicts="nvidia>=0"
depends="${pkgname}-dkms-${version}_${revision}"
conflicts="nvidia>=0 xserver-abi-video>19"
provides="libGL-${version}_${revision}"
replaces="libGL>=0"
short_desc="${_desc} - Libraries and Utilities"

6
srcpkgs/nvidia-stable/template
View file

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)"
pkgname=nvidia-stable
version=340.76
revision=3
revision=4
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -13,8 +13,8 @@ only_for_archs="i686 x86_64"
repository="nonfree"
create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities"
depends="virtual?xserver-abi-video<20 nvidia-stable-dkms-${version}_${revision} pkg-config"
conflicts="catalyst>=0"
depends="nvidia-stable-dkms-${version}_${revision} pkg-config"
conflicts="catalyst>=0 xserver-abi-video>20"
provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
replaces="nvidia>=0 libGL>=0"

6
srcpkgs/nvidia/template
View file

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
pkgname=nvidia
version=346.47
revision=2
revision=3
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -13,8 +13,8 @@ only_for_archs="i686 x86_64"
repository="nonfree"
create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities"
depends="virtual?xserver-abi-video<20 nvidia-dkms-${version}_${revision} pkg-config"
conflicts="catalyst>=0"
depends="nvidia-dkms-${version}_${revision} pkg-config"
conflicts="xserver-abi-video>20"
provides="libGL-${version}_${revision}"
replaces="libGL>=0"

6
srcpkgs/nvidia304/template
View file

@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
pkgname=nvidia304
version=304.125
revision=4
revision=5
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -12,10 +12,10 @@ repository="nonfree"
create_wrksrc=yes
only_for_archs="i686 x86_64"
short_desc="${_desc} - Libraries and Utilities"
depends="virtual?xserver-abi-video<20 ${pkgname}-dkms-${version}_${revision} pkg-config"
depends="${pkgname}-dkms-${version}_${revision} pkg-config"
provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
replaces="nvidia>=0 libGL>=0"
conflicts="catalyst>=0"
conflicts="catalyst>=0 xserver-abi-video>20"
if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"