Date: Monday, February 27, 2017 @ 13:06:23 Author: lcarlier Revision: 289624
archrelease: copy trunk to extra-i686, extra-x86_64 Added: nvidia-304xx-utils/repos/extra-i686/PKGBUILD (from rev 289623, nvidia-304xx-utils/trunk/PKGBUILD) nvidia-304xx-utils/repos/extra-i686/nvidia-drm-outputclass.conf (from rev 289623, nvidia-304xx-utils/trunk/nvidia-drm-outputclass.conf) nvidia-304xx-utils/repos/extra-x86_64/PKGBUILD (from rev 289623, nvidia-304xx-utils/trunk/PKGBUILD) nvidia-304xx-utils/repos/extra-x86_64/nvidia-drm-outputclass.conf (from rev 289623, nvidia-304xx-utils/trunk/nvidia-drm-outputclass.conf) Deleted: nvidia-304xx-utils/repos/extra-i686/PKGBUILD nvidia-304xx-utils/repos/extra-i686/nvidia-drm-outputclass.conf nvidia-304xx-utils/repos/extra-x86_64/PKGBUILD nvidia-304xx-utils/repos/extra-x86_64/nvidia-drm-outputclass.conf ------------------------------------------+ /PKGBUILD | 304 +++++++++++++++++++++++++++++ /nvidia-drm-outputclass.conf | 12 + extra-i686/PKGBUILD | 152 -------------- extra-i686/nvidia-drm-outputclass.conf | 6 extra-x86_64/PKGBUILD | 152 -------------- extra-x86_64/nvidia-drm-outputclass.conf | 6 6 files changed, 316 insertions(+), 316 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-02-27 13:05:58 UTC (rev 289623) +++ extra-i686/PKGBUILD 2017-02-27 13:06:23 UTC (rev 289624) @@ -1,152 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andreas Radke <andy...@archlinux.org> - -pkgbase=nvidia-304xx-utils -pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx') -pkgver=304.135 -pkgrel=5 -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -license=('custom') -makedepends=('zlib') -options=('!strip') -source=(nvidia-drm-outputclass.conf) -source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") -source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('4f5562ee8f3171769e4638b35396c55d') -md5sums_i686=('0e2082ae8490b135eb306befe6db56e1') -md5sums_x86_64=('8ee9bd0b020508bca9953181811422fa') - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" -elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" -fi - -create_links() { - # create soname links - for _lib in $(find "${pkgdir}" -name '*.so*' | grep -v 'xorg/'); do - _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true) - _base=$(echo ${_soname} | sed -r 's/(.*).so.*/\1.so/') - [[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}" - [[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}" - done -} - -build() { - sh "${_pkg}.run" --extract-only -} - -package_opencl-nvidia-304xx() { - pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch" - depends=('zlib') - optdepends=('opencl-headers: headers necessary for OpenCL development') - provides=('opencl-nvidia' 'opencl-driver') - conflicts=('opencl-nvidia') - - cd ${_pkg} - - # OpenCL - install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" - install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}" - install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" - - create_links - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE" -} - -package_nvidia-304xx-utils() { - pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch" - depends=('xorg-server' 'libxvmc' 'mesa') - optdepends=('gtk2: nvidia-settings' - 'pkg-config: nvidia-xconfig' - 'opencl-nvidia-304xx: OpenCL support') - conflicts=('nvidia-304xx-libgl' 'nvidia-340xx-utils' 'nvidia-utils') - provides=('libgl' 'libgles' 'libegl' 'nvidia-304xx-libgl' 'nvidia-utils') - replaces=('nvidia-304xx-libgl') - - cd ${_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/nvidia/xorg/libglx.so.${pkgver}" - ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so.1" # X doesn't find glx otherwise - ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/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/nvidia/libnvidia-glcore.so.${pkgver}" - - # XvMC - install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/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/nvidia/libnvidia-tls.so.${pkgver}" - install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-cfg.so.${pkgver}" - install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-ml.so.${pkgver}" - - # CUDA - install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libcuda.so.${pkgver}" - install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/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" - 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" - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx/LICENSE" - ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-utils" - - install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia-304xx/README" - install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog" - ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils" - - # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them - ln -s /usr/lib/mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0" - ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1" - ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so" - - ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1.1.0" - ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1" - ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so" - - ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2.0.0" - ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2" - ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so" - - # distro specific files must be installed in /usr/share/X11/xorg.conf.d - install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d" - install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf" - - install -dm 755 "${pkgdir}"/etc/ld.so.conf.d - echo -e '/usr/lib/nvidia/' > "${pkgdir}"/etc/ld.so.conf.d/00-nvidia.conf - - create_links -} Copied: nvidia-304xx-utils/repos/extra-i686/PKGBUILD (from rev 289623, nvidia-304xx-utils/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-02-27 13:06:23 UTC (rev 289624) @@ -0,0 +1,152 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> + +pkgbase=nvidia-304xx-utils +pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx') +pkgver=304.135 +pkgrel=5 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +license=('custom') +makedepends=('zlib') +options=('!strip') +source=(nvidia-drm-outputclass.conf) +source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +md5sums=('4f5562ee8f3171769e4638b35396c55d') +md5sums_i686=('0e2082ae8490b135eb306befe6db56e1') +md5sums_x86_64=('8ee9bd0b020508bca9953181811422fa') + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" +fi + +create_links() { + # create soname links + for _lib in $(find "${pkgdir}" -name '*.so*' | grep -v 'xorg/'); do + _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true) + _base=$(echo ${_soname} | sed -r 's/(.*).so.*/\1.so/') + [[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}" + [[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}" + done +} + +build() { + sh "${_pkg}.run" --extract-only +} + +package_opencl-nvidia-304xx() { + pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch" + depends=('zlib') + optdepends=('opencl-headers: headers necessary for OpenCL development') + provides=('opencl-nvidia' 'opencl-driver') + conflicts=('opencl-nvidia') + + cd ${_pkg} + + # OpenCL + install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" + install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}" + install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" + + create_links + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE" +} + +package_nvidia-304xx-utils() { + pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch" + depends=('xorg-server' 'libxvmc' 'mesa') + optdepends=('gtk2: nvidia-settings' + 'pkg-config: nvidia-xconfig' + 'opencl-nvidia-304xx: OpenCL support') + conflicts=('nvidia-304xx-libgl' 'nvidia-340xx-utils' 'nvidia-utils') + provides=('libgl' 'libgles' 'libegl' 'nvidia-304xx-libgl' 'nvidia-utils') + replaces=('nvidia-304xx-libgl') + + cd ${_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/nvidia/xorg/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so.1" # X doesn't find glx otherwise + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/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/nvidia/libnvidia-glcore.so.${pkgver}" + + # XvMC + install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/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/nvidia/libnvidia-tls.so.${pkgver}" + install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-cfg.so.${pkgver}" + install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-ml.so.${pkgver}" + + # CUDA + install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libcuda.so.${pkgver}" + install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/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" + 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" + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx/LICENSE" + ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-utils" + + install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia-304xx/README" + install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog" + ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils" + + # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them + ln -s /usr/lib/mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0" + ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1" + ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so" + + ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1.1.0" + ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1" + ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so" + + ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2.0.0" + ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2" + ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so" + + # distro specific files must be installed in /usr/share/X11/xorg.conf.d + install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d" + install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf" + + install -dm 755 "${pkgdir}"/etc/ld.so.conf.d + echo -e '/usr/lib/nvidia/' > "${pkgdir}"/etc/ld.so.conf.d/00-nvidia.conf + + create_links +} Deleted: extra-i686/nvidia-drm-outputclass.conf =================================================================== --- extra-i686/nvidia-drm-outputclass.conf 2017-02-27 13:05:58 UTC (rev 289623) +++ extra-i686/nvidia-drm-outputclass.conf 2017-02-27 13:06:23 UTC (rev 289624) @@ -1,6 +0,0 @@ -Section "OutputClass" - Identifier "nvidia" - MatchDriver "nvidia-drm" - Driver "nvidia" - ModulePath "/usr/lib/nvidia/xorg" -EndSection Copied: nvidia-304xx-utils/repos/extra-i686/nvidia-drm-outputclass.conf (from rev 289623, nvidia-304xx-utils/trunk/nvidia-drm-outputclass.conf) =================================================================== --- extra-i686/nvidia-drm-outputclass.conf (rev 0) +++ extra-i686/nvidia-drm-outputclass.conf 2017-02-27 13:06:23 UTC (rev 289624) @@ -0,0 +1,6 @@ +Section "OutputClass" + Identifier "nvidia" + MatchDriver "nvidia-drm" + Driver "nvidia" + ModulePath "/usr/lib/nvidia/xorg" +EndSection Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-02-27 13:05:58 UTC (rev 289623) +++ extra-x86_64/PKGBUILD 2017-02-27 13:06:23 UTC (rev 289624) @@ -1,152 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andreas Radke <andy...@archlinux.org> - -pkgbase=nvidia-304xx-utils -pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx') -pkgver=304.135 -pkgrel=5 -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -license=('custom') -makedepends=('zlib') -options=('!strip') -source=(nvidia-drm-outputclass.conf) -source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") -source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('4f5562ee8f3171769e4638b35396c55d') -md5sums_i686=('0e2082ae8490b135eb306befe6db56e1') -md5sums_x86_64=('8ee9bd0b020508bca9953181811422fa') - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" -elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" -fi - -create_links() { - # create soname links - for _lib in $(find "${pkgdir}" -name '*.so*' | grep -v 'xorg/'); do - _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true) - _base=$(echo ${_soname} | sed -r 's/(.*).so.*/\1.so/') - [[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}" - [[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}" - done -} - -build() { - sh "${_pkg}.run" --extract-only -} - -package_opencl-nvidia-304xx() { - pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch" - depends=('zlib') - optdepends=('opencl-headers: headers necessary for OpenCL development') - provides=('opencl-nvidia' 'opencl-driver') - conflicts=('opencl-nvidia') - - cd ${_pkg} - - # OpenCL - install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" - install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}" - install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" - - create_links - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE" -} - -package_nvidia-304xx-utils() { - pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch" - depends=('xorg-server' 'libxvmc' 'mesa') - optdepends=('gtk2: nvidia-settings' - 'pkg-config: nvidia-xconfig' - 'opencl-nvidia-304xx: OpenCL support') - conflicts=('nvidia-304xx-libgl' 'nvidia-340xx-utils' 'nvidia-utils') - provides=('libgl' 'libgles' 'libegl' 'nvidia-304xx-libgl' 'nvidia-utils') - replaces=('nvidia-304xx-libgl') - - cd ${_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/nvidia/xorg/libglx.so.${pkgver}" - ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so.1" # X doesn't find glx otherwise - ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/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/nvidia/libnvidia-glcore.so.${pkgver}" - - # XvMC - install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/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/nvidia/libnvidia-tls.so.${pkgver}" - install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-cfg.so.${pkgver}" - install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-ml.so.${pkgver}" - - # CUDA - install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libcuda.so.${pkgver}" - install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/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" - 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" - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx/LICENSE" - ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-utils" - - install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia-304xx/README" - install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog" - ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils" - - # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them - ln -s /usr/lib/mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0" - ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1" - ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so" - - ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1.1.0" - ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1" - ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so" - - ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2.0.0" - ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2" - ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so" - - # distro specific files must be installed in /usr/share/X11/xorg.conf.d - install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d" - install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf" - - install -dm 755 "${pkgdir}"/etc/ld.so.conf.d - echo -e '/usr/lib/nvidia/' > "${pkgdir}"/etc/ld.so.conf.d/00-nvidia.conf - - create_links -} Copied: nvidia-304xx-utils/repos/extra-x86_64/PKGBUILD (from rev 289623, nvidia-304xx-utils/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-02-27 13:06:23 UTC (rev 289624) @@ -0,0 +1,152 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> + +pkgbase=nvidia-304xx-utils +pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx') +pkgver=304.135 +pkgrel=5 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +license=('custom') +makedepends=('zlib') +options=('!strip') +source=(nvidia-drm-outputclass.conf) +source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +md5sums=('4f5562ee8f3171769e4638b35396c55d') +md5sums_i686=('0e2082ae8490b135eb306befe6db56e1') +md5sums_x86_64=('8ee9bd0b020508bca9953181811422fa') + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" +fi + +create_links() { + # create soname links + for _lib in $(find "${pkgdir}" -name '*.so*' | grep -v 'xorg/'); do + _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true) + _base=$(echo ${_soname} | sed -r 's/(.*).so.*/\1.so/') + [[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}" + [[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}" + done +} + +build() { + sh "${_pkg}.run" --extract-only +} + +package_opencl-nvidia-304xx() { + pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch" + depends=('zlib') + optdepends=('opencl-headers: headers necessary for OpenCL development') + provides=('opencl-nvidia' 'opencl-driver') + conflicts=('opencl-nvidia') + + cd ${_pkg} + + # OpenCL + install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" + install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}" + install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" + + create_links + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE" +} + +package_nvidia-304xx-utils() { + pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch" + depends=('xorg-server' 'libxvmc' 'mesa') + optdepends=('gtk2: nvidia-settings' + 'pkg-config: nvidia-xconfig' + 'opencl-nvidia-304xx: OpenCL support') + conflicts=('nvidia-304xx-libgl' 'nvidia-340xx-utils' 'nvidia-utils') + provides=('libgl' 'libgles' 'libegl' 'nvidia-304xx-libgl' 'nvidia-utils') + replaces=('nvidia-304xx-libgl') + + cd ${_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/nvidia/xorg/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so.1" # X doesn't find glx otherwise + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/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/nvidia/libnvidia-glcore.so.${pkgver}" + + # XvMC + install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/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/nvidia/libnvidia-tls.so.${pkgver}" + install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-cfg.so.${pkgver}" + install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-ml.so.${pkgver}" + + # CUDA + install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libcuda.so.${pkgver}" + install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/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" + 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" + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx/LICENSE" + ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-utils" + + install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia-304xx/README" + install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog" + ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils" + + # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them + ln -s /usr/lib/mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0" + ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1" + ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so" + + ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1.1.0" + ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1" + ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so" + + ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2.0.0" + ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2" + ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so" + + # distro specific files must be installed in /usr/share/X11/xorg.conf.d + install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d" + install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf" + + install -dm 755 "${pkgdir}"/etc/ld.so.conf.d + echo -e '/usr/lib/nvidia/' > "${pkgdir}"/etc/ld.so.conf.d/00-nvidia.conf + + create_links +} Deleted: extra-x86_64/nvidia-drm-outputclass.conf =================================================================== --- extra-x86_64/nvidia-drm-outputclass.conf 2017-02-27 13:05:58 UTC (rev 289623) +++ extra-x86_64/nvidia-drm-outputclass.conf 2017-02-27 13:06:23 UTC (rev 289624) @@ -1,6 +0,0 @@ -Section "OutputClass" - Identifier "nvidia" - MatchDriver "nvidia-drm" - Driver "nvidia" - ModulePath "/usr/lib/nvidia/xorg" -EndSection Copied: nvidia-304xx-utils/repos/extra-x86_64/nvidia-drm-outputclass.conf (from rev 289623, nvidia-304xx-utils/trunk/nvidia-drm-outputclass.conf) =================================================================== --- extra-x86_64/nvidia-drm-outputclass.conf (rev 0) +++ extra-x86_64/nvidia-drm-outputclass.conf 2017-02-27 13:06:23 UTC (rev 289624) @@ -0,0 +1,6 @@ +Section "OutputClass" + Identifier "nvidia" + MatchDriver "nvidia-drm" + Driver "nvidia" + ModulePath "/usr/lib/nvidia/xorg" +EndSection