nvidia-stable: split libs into the -libs subpkg.

This avoids a circular dependency with packages depending on libGL,
provided previously by "nvidia-stable".
This commit is contained in:
Juan RP 2015-03-22 06:30:47 +01:00
parent adb6f24024
commit 892a2ec5a7
3 changed files with 22 additions and 9 deletions

View file

@ -124,11 +124,14 @@ libGL.so.1 catalyst-libs-14.2_1
libGL.so.1 nvidia-libs-346.47_1
libGL.so.1 nvidia304-libs-304.00_1
libGL.so.1 nvidia-stable-libs-340.46_1
libnvidia-ml.so.1 nvidia-libs-346.47_1
libnvidia-tls.so.346.47 nvidia-libs-346.47_1
libnvidia-glcore.so.346.47 nvidia-libs-346.47_1
libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1
libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1
libnvidia-ml.so.1 nvidia-libs-346.47_1 ignore
libnvidia-tls.so.346.47 nvidia-libs-346.47_1 ignore
libnvidia-glcore.so.346.47 nvidia-libs-346.47_1 ignore
libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
libnvidia-ml.so.1 nvidia-stable-libs-340.46_1 ignore
libnvidia-tls.so.346.47 nvidia-stable-libs-340.46_1 ignore
libnvidia-glcore.so.346.47 nvidia-stable-libs-340.46_1 ignore
libglapi.so.0 libglapi-7.11_1
libgbm.so.1 libgbm-9.0_1
librsvg-2.so.2 librsvg-2.26.0_1

1
srcpkgs/nvidia-stable-libs Symbolic link
View file

@ -0,0 +1 @@
nvidia-stable

View file

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)"
pkgname=nvidia-stable
version=340.76
revision=4
revision=5
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -13,11 +13,12 @@ only_for_archs="i686 x86_64"
repository="nonfree"
create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities"
depends="nvidia-stable-dkms-${version}_${revision} pkg-config"
depends="${pkgname}-dkms-${version}_${revision} pkg-config"
conflicts="catalyst>=0 xserver-abi-video>20"
provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
replaces="nvidia>=0 libGL>=0"
provides="nvidia-${version}_${revision}"
replaces="nvidia>=0"
subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"
@ -194,3 +195,11 @@ nvidia-stable-opencl_package() {
vmove etc/OpenCL
}
}
nvidia-stable-libs_package() {
short_desc="${_desc} - libraries"
provides="libGL-${version}_${revision}"
replaces="libGL>=0"
pkg_install() {
vmove usr/lib
}
}