Date: Sunday, March 9, 2014 @ 02:58:56 Author: fyan Revision: 207427 upgpkg: nvidia-304xx-utils 304.119-2
- split nvidia-304xx-libgl to make the -utils package work with bumblebee (dependency on nvidia-304xx-utils will be removed in next release, I keep this dependency to give current user a clean upgrade) - add symlinks to mesa libEGL & libGLES libraries, since nvidia 304xx doesn't ship them Modified: nvidia-304xx-utils/trunk/PKGBUILD ----------+ PKGBUILD | 69 +++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-09 00:19:31 UTC (rev 207426) +++ PKGBUILD 2014-03-09 01:58:56 UTC (rev 207427) @@ -1,14 +1,15 @@ # $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@gmail.com> +# Contributor: Andreas Radke <andy...@archlinux.org> pkgbase=nvidia-304xx-utils -pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx') +pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx') pkgver=304.119 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') -makedepends=('libcl' 'libxvmc' 'xorg-server' 'zlib') +makedepends=('libcl' 'libxvmc' 'xorg-server' 'zlib' 'mesa') options=('!strip') if [ "$CARCH" = "i686" ]; then @@ -56,42 +57,82 @@ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE" } +package_nvidia-304xx-libgl() { + pkgdesc="NVIDIA drivers libraries symlinks, 304xx legacy branch" + depends=('nvidia-304xx-utils' 'mesa') + conflicts=('libgl' 'nvidia-libgl') + provides=('libgl' 'nvidia-libgl') + cd "${srcdir}/${_pkg}" + + mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions" + ln -s "/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.1" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + + ln -s "/usr/lib/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}" + ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1" + ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so" + + # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them + ln -s mesa-libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so" + ln -s mesa-libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1" + ln -s mesa-libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1.0.0" + ln -s mesa-libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so" + ln -s mesa-libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1" + ln -s mesa-libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0" + ln -s mesa-libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so" + ln -s mesa-libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2" + ln -s mesa-libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2.0.0" + + mkdir -p "${pkgdir}/usr/share/licenses" + ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-libgl" +} + package_nvidia-304xx-utils() { pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch" - depends=('xorg-server' 'libxvmc') + depends=('xorg-server' 'libxvmc' 'nvidia-304xx-libgl') optdepends=('gtk2: nvidia-settings' 'pkg-config: nvidia-xconfig' 'opencl-nvidia-304xx: OpenCL support') - conflicts=('libgl' 'nvidia-utils') - provides=('libgl' 'nvidia-utils') + conflicts=('nvidia-utils') + provides=('nvidia-utils') cd "${srcdir}/${_pkg}" # X driver install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so" + # GLX extension module for X - install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}" - ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise - # OpenGL library - install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}" + install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise + + # OpenGL libraries + install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}" + # OpenGL core library install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}" + # XvMC -# install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib/libXvMCNVIDIA.a" install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/libXvMCNVIDIA.so.${pkgver}" + # VDPAU install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}" + # nvidia-tls library install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}" install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}" - install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}" + # CUDA install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}" install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}" + # DEBUG + install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump" + # nvidia-xconfig install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig" install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz" + # nvidia-settings install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings" install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz" @@ -98,8 +139,10 @@ install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png" sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop" + # nvidia-bug-report install -D -m755 nvidia-bug-report.sh "${pkgdir}/usr/bin/nvidia-bug-report.sh" + # nvidia-smi install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi" install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz"