PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nvidia*: conflicts with xserver-abi-video>19 (xorg-server-1.18).

Browse Source
This commit is contained in:
Juan RP 2015-11-10 10:35:16 +01:00
parent e6de2652db
commit f33c53b777
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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=1 revision=2
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>20" conflicts="catalyst>=0 xserver-abi-video>19"
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=1 revision=2
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>20" conflicts="xserver-abi-video>19"
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=1 revision=2
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>20" conflicts="catalyst>=0 xserver-abi-video>19"
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