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

catalyst, nvidia*: fix pattern in conflicts.

Browse source
This commit is contained in:
Juan RP 2015-11-10 17:36:36 +01:00
parent ea6f3dc775
commit 588e13c6f1
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/catalyst/template
View file

@ -4,7 +4,7 @@ _release="15.9"
pkgname=catalyst pkgname=catalyst
version=15.201.1151 version=15.201.1151
revision=3 revision=4
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Proprietary AMD license" license="Proprietary AMD license"
homepage="http://www.amd.com" homepage="http://www.amd.com"
@ -13,7 +13,7 @@ only_for_archs="i686 x86_64"
hostmakedepends="unzip wget" hostmakedepends="unzip wget"
subpackages="${pkgname}-opencl ${pkgname}-dkms ${pkgname}-libs" subpackages="${pkgname}-opencl ${pkgname}-dkms ${pkgname}-libs"
depends="${pkgname}-dkms-${version}_${revision}" depends="${pkgname}-dkms-${version}_${revision}"
conflicts="nvidia>=0 xserver-abi-video>19" conflicts="nvidia>=0 xserver-abi-video>19_1"
short_desc="${_desc} - Utilities" short_desc="${_desc} - Utilities"
repository="nonfree" repository="nonfree"
create_wrksrc=yes create_wrksrc=yes

4
srcpkgs/nvidia-stable/template
View file

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)"
pkgname=nvidia-stable pkgname=nvidia-stable
version=340.93 version=340.93
revision=2 revision=3
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Propietary NVIDIA license" license="Propietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -14,7 +14,7 @@ repository="nonfree"
create_wrksrc=yes create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities" short_desc="${_desc} - Libraries and Utilities"
depends="${pkgname}-dkms-${version}_${revision} pkg-config" depends="${pkgname}-dkms-${version}_${revision} pkg-config"
conflicts="catalyst>=0 xserver-abi-video>19" conflicts="catalyst>=0 xserver-abi-video>19_1"
provides="nvidia-${version}_${revision}" provides="nvidia-${version}_${revision}"
replaces="nvidia>=0" replaces="nvidia>=0"

4
srcpkgs/nvidia/template
View file

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
pkgname=nvidia pkgname=nvidia
version=352.55 version=352.55
revision=2 revision=3
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Proprietary NVIDIA license" license="Proprietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -14,7 +14,7 @@ repository="nonfree"
create_wrksrc=yes create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities" short_desc="${_desc} - Libraries and Utilities"
depends="nvidia-gtklibs-${version}_${revision} nvidia-dkms-${version}_${revision} pkg-config" depends="nvidia-gtklibs-${version}_${revision} nvidia-dkms-${version}_${revision} pkg-config"
conflicts="xserver-abi-video>19" conflicts="xserver-abi-video>19_1"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}" _pkg="NVIDIA-Linux-x86-${version}"

4
srcpkgs/nvidia304/template
View file

@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
pkgname=nvidia304 pkgname=nvidia304
version=304.128 version=304.128
revision=2 revision=3
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Propietary NVIDIA license" license="Propietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -15,7 +15,7 @@ short_desc="${_desc} - Libraries and Utilities"
depends="${pkgname}-dkms-${version}_${revision} pkg-config" depends="${pkgname}-dkms-${version}_${revision} pkg-config"
provides="nvidia-${version}_${revision}" provides="nvidia-${version}_${revision}"
replaces="nvidia>=0" replaces="nvidia>=0"
conflicts="catalyst>=0 xserver-abi-video>19" conflicts="catalyst>=0 xserver-abi-video>19_1"
subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs" subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then