snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

nvidia304: split libs into the -libs subpkg. 

This avoids a circular dependency with packages depending on libGL,
provided previously by "nvidia304".
This commit is contained in:
Juan RP 2015-03-22 06:34:49 +01:00
parent 892a2ec5a7
commit 431397a754
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/shlibs
View File

@ -129,9 +129,8 @@ libnvidia-tls.so.346.47 nvidia-libs-346.47_1 ignore
libnvidia-glcore.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-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
libnvidia-gtk3.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 libnvidia-glcore.so.346.47 nvidia-stable-libs-340.46_1 ignore
libnvidia-ml.so.1 nvidia304-libs-304.00_1 ignore
libglapi.so.0 libglapi-7.11_1 libglapi.so.0 libglapi-7.11_1
libgbm.so.1 libgbm-9.0_1 libgbm.so.1 libgbm-9.0_1
librsvg-2.so.2 librsvg-2.26.0_1 librsvg-2.so.2 librsvg-2.26.0_1

1
srcpkgs/nvidia304-libs Symbolic link
View File

@ -0,0 +1 @@
nvidia304

15
srcpkgs/nvidia304/template
View File

@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
pkgname=nvidia304 pkgname=nvidia304
version=304.125 version=304.125
revision=5 revision=6
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license" license="Propietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -13,9 +13,10 @@ create_wrksrc=yes
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
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"
provides="nvidia-${version}_${revision} libGL-${version}_${revision}" provides="nvidia-${version}_${revision}"
replaces="nvidia>=0 libGL>=0" replaces="nvidia>=0"
conflicts="catalyst>=0 xserver-abi-video>20" conflicts="catalyst>=0 xserver-abi-video>20"
subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}" _pkg="NVIDIA-Linux-x86-${version}"
@ -177,3 +178,11 @@ nvidia304-opencl_package() {
vmove etc/OpenCL vmove etc/OpenCL
} }
} }
nvidia304-libs_package() {
short_desc="${_desc} - libraries"
provides="libGL-${version}_${revision}"
replaces="libGL>=0"
pkg_install() {
vmove usr/lib
}
}