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

nvidia304: remove libGL/libglx symlinks; this now provides/replaces libGL.

This commit is contained in:
Juan RP 2014-03-07 16:20:24 +01:00
parent 1331233217
commit 0c4cd22c4c
3 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
srcpkgs/nvidia304/INSTALL
View File

@ -1,16 +0,0 @@
# Overwrite libGL and libglx symlinks.
case ${ACTION} in
post)
rm -f usr/lib/libGL.so usr/lib/libGL.so.1
rm -f usr/lib/xorg/modules/extensions/libglx.so
# libGL
cd usr/lib
ln -sf libGL-nvidia.so.${VERSION%_*} libGL.so
ln -sf libGL-nvidia.so.${VERSION%_*} libGL.so.1
# libglx
cd ../../usr/lib/xorg/modules/extensions
ln -sf libglx-nvidia.so.${VERSION%_*} libglx.so
;;
esac

19
srcpkgs/nvidia304/REMOVE
View File

@ -1,19 +0,0 @@
# Restore mesa libGL and xorg-server libglx symlinks.
case ${ACTION} in
purge)
rm -f usr/lib/libGL.so usr/lib/libGL.so.1
rm -f usr/lib/xorg/modules/extensions/libglx.so
# libGL
cd usr/lib
if [ -f libGL-mesa.so.1.2.0 ]; then
ln -sf libGL-mesa.so.1.2.0 libGL.so
ln -sf libGL-mesa.so.1.2.0 libGL.so.1
fi
# libglx
if [ -f xorg/modules/extensions/libglx-xorg.so ]; then
cd xorg/modules/extensions
ln -sf libglx-xorg.so libglx.so
fi
;;
esac

19
srcpkgs/nvidia304/template
View File

@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
pkgname=nvidia304 pkgname=nvidia304
version=304.119 version=304.119
revision=1 revision=2
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,11 +13,11 @@ 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="xserver-abi-video<16 ${pkgname}-dkms-${version}_${revision} pkg-config" depends="xserver-abi-video<16 ${pkgname}-dkms-${version}_${revision} pkg-config"
provides="nvidia-${version}_${revision}" provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
replaces="nvidia>=0" replaces="nvidia>=0 libGL>=0"
conflicts="catalyst>=0" conflicts="catalyst>=0"
if [ "${XBPS_MACHINE}" = "i686" ]; then if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}" _pkg="NVIDIA-Linux-x86-${version}"
distfiles="ftp://download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" distfiles="ftp://download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
checksum=c8ae388fcf2fa8df41620466b359ce2c51d3f061aaee0df588fc7a9dae80df51 checksum=c8ae388fcf2fa8df41620466b359ce2c51d3f061aaee0df588fc7a9dae80df51
@ -28,7 +28,7 @@ else
fi fi
do_extract() { do_extract() {
install -m755 ${XBPS_SRCDISTDIR}/${_pkg}.run ${wrksrc} install -m755 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkg}.run ${wrksrc}
cd ${wrksrc} cd ${wrksrc}
./${_pkg}.run --extract-only ./${_pkg}.run --extract-only
rm -f ${_pkg}.run rm -f ${_pkg}.run
@ -41,11 +41,14 @@ do_install() {
vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
# GLX extension module for X # GLX extension module for X
vinstall libglx.so.${version} 755 usr/lib/xorg/modules/extensions \ vinstall libglx.so.${version} 755 usr/lib/xorg/modules/extensions
libglx-nvidia.so.${version} ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so
ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so.1
# OpenGL library # OpenGL library
vinstall libGL.so.${version} 755 usr/lib libGL-nvidia.so.${version} vinstall libGL.so.${version} 755 usr/lib
ln -sf libGL.so.${version} ${DESTDIR}/usr/lib/libGL.so
ln -sf libGL.so.${version} ${DESTDIR}/usr/lib/libGL.so.1
# OpenGL core library # OpenGL core library
vinstall libnvidia-glcore.so.${version} 755 usr/lib vinstall libnvidia-glcore.so.${version} 755 usr/lib