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

nvidia: split libs into -libs and -gtklibs subpkgs. 

This should avoid the circular dependencies reported by @duncaen.
This commit is contained in:
Juan RP 2015-03-21 12:35:36 +01:00
parent 30117c7a89
commit d01cae1ab3
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/shlibs
View File

@ -121,9 +121,14 @@ libGLESv2.so rpi-firmware-20150207_1
libwayland-egl.so.1 libwayland-egl-9.0.1_4
libGL.so.1 libGL-7.11_1
libGL.so.1 catalyst-14.2_1
libGL.so.1 nvidia-346.47_1
libGL.so.1 nvidia304-304.00_1
libGL.so.1 nvidia-stable-340.46_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
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-gtklibs Symbolic link
View File

@ -0,0 +1 @@
nvidia

1
srcpkgs/nvidia-libs Symbolic link
View File

@ -0,0 +1 @@
nvidia

23
srcpkgs/nvidia/template
View File

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
pkgname=nvidia
version=346.47
revision=3
revision=4
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -13,12 +13,9 @@ only_for_archs="i686 x86_64"
repository="nonfree"
create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities"
depends="nvidia-dkms-${version}_${revision} pkg-config"
depends="nvidia-gtklibs-${version}_${revision} nvidia-dkms-${version}_${revision} pkg-config"
conflicts="xserver-abi-video>20"
provides="libGL-${version}_${revision}"
replaces="libGL>=0"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"
distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"
@ -29,6 +26,8 @@ else
checksum=d1b6672a9ddef2a01a527902b524dec232792cf9b61d3fa7bd0189488a961677
fi
subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs"
do_extract() {
install -m755 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkg}.run ${wrksrc}
cd ${wrksrc}
@ -176,6 +175,20 @@ do_install() {
echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
}
nvidia-gtklibs_package() {
short_desc="${_desc} - GTK libraries"
pkg_install() {
vmove usr/lib/lib*gtk*.so*
}
}
nvidia-libs_package() {
short_desc="${_desc} - common libraries"
provides="libGL-${version}_${revision}"
replaces="libGL>=0"
pkg_install() {
vmove usr/lib
}
}
nvidia-dkms_package() {
short_desc="${_desc} - DKMS kernel module"
triggers="dkms"