diff options
| -rw-r--r-- | abs/core/nvidia-utils/PKGBUILD | 50 | ||||
| -rw-r--r-- | abs/core/nvidia/PKGBUILD | 36 | ||||
| -rw-r--r-- | abs/core/nvidia/nvidia.install | 6 |
3 files changed, 58 insertions, 34 deletions
diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index c1180c0..4e5c35c 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171131 2012-11-16 19:33:17Z ibiru $ +# $Id: PKGBUILD 199766 2013-11-15 21:30:02Z svenstaro $ # Maintainer: Thomas Baechler <thomas@archlinux.org> # Contributor: James Rayner <iphitus@gmail.com> pkgbase=nvidia-utils -pkgname=('nvidia-utils' 'opencl-nvidia') -pkgver=310.19 +pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia') +pkgver=331.20 pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -14,12 +14,12 @@ if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('2adbdd38540b3a8955714760e05f575d') + md5sums+=('801aa04a087891690f1cac09575b2ba9') elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('0ba08d32852e442ebba5ba22c7abed36') + md5sums+=('28295eed56c2ca996401c0093279620f') fi create_links() { @@ -50,22 +50,37 @@ package_opencl-nvidia() { create_links } -package_nvidia-utils() { - pkgdesc="NVIDIA drivers utilities and libraries." - depends=('xorg-server' 'libxvmc') - optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 'pkg-config: nvidia-xconfig' - 'opencl-nvidia: OpenCL support') +package_nvidia-libgl() { + pkgdesc="NVIDIA drivers libraries symlinks" + depends=('nvidia-utils') conflicts=('libgl') provides=('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" +} + +package_nvidia-utils() { + pkgdesc="NVIDIA drivers utilities" + depends=('xorg-server') + optdepends=('gtk2: nvidia-settings' + 'opencl-nvidia: OpenCL support') + 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 + 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 library - install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}" + 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}" # VDPAU @@ -78,7 +93,10 @@ package_nvidia-utils() { # 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}" - + #install -D -m755 nvidia-cuda-proxy-server "${pkgdir}/usr/bin/nvidia-cuda-proxy-server" + #install -D -m644 nvidia-cuda-proxy-control.1.gz "${pkgdir}/usr/share/man/man1/nvidia-cuda-proxy-control.1.gz" + # 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" @@ -103,4 +121,4 @@ package_nvidia-utils() { create_links } -md5sums=('0ba08d32852e442ebba5ba22c7abed36') +md5sums=('28295eed56c2ca996401c0093279620f') diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index a7d4b38..5c42e7b 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -1,37 +1,43 @@ -# $Id: PKGBUILD 171241 2012-11-16 21:41:41Z ibiru $ +# $Id: PKGBUILD 202756 2013-12-26 13:03:42Z thomas $ # Maintainer : Thomas Baechler <thomas@archlinux.org> pkgname=nvidia -pkgver=310.19 -_extramodules=extramodules-3.6-ARCH -pkgrel=2 -pkgdesc="NVIDIA drivers for linux." +pkgver=331.20 +_extramodules=extramodules-3.12-ARCH +pkgrel=3 +pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.6' 'linux-headers<3.7') +depends=('linux>=3.12' 'linux<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.12' 'linux-headers<3.13') conflicts=('nvidia-96xx' 'nvidia-173xx') license=('custom') install=nvidia.install options=(!strip) +#source=('nvidia-linux-3.12.patch') +#md5sums=('d267069bc456de269424b4e1b46a3745') if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('2adbdd38540b3a8955714760e05f575d') + source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums+=('801aa04a087891690f1cac09575b2ba9') elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('0ba08d32852e442ebba5ba22c7abed36') + source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums+=('28295eed56c2ca996401c0093279620f') fi -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" +prepare() { cd "${srcdir}" sh "${_pkg}.run" --extract-only - cd "${_pkg}/kernel" + cd "${_pkg}" +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${srcdir}"/"${_pkg}"/kernel make SYSSRC=/usr/lib/modules/"${_kernver}/build" module } @@ -43,4 +49,4 @@ package() { sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" } -md5sums=('0ba08d32852e442ebba5ba22c7abed36') +md5sums=('28295eed56c2ca996401c0093279620f') diff --git a/abs/core/nvidia/nvidia.install b/abs/core/nvidia/nvidia.install index c2c292a..b11a93e 100644 --- a/abs/core/nvidia/nvidia.install +++ b/abs/core/nvidia/nvidia.install @@ -1,11 +1,11 @@ post_install() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.12-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.12-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx' @@ -13,6 +13,6 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.12-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |