Date: Wednesday, March 12, 2014 @ 18:36:03 Author: fyan Revision: 207594
archrelease: copy trunk to extra-i686, extra-x86_64 Added: nvidia-304xx/repos/extra-i686/PKGBUILD (from rev 207593, nvidia-304xx/trunk/PKGBUILD) nvidia-304xx/repos/extra-i686/nvidia.install (from rev 207593, nvidia-304xx/trunk/nvidia.install) nvidia-304xx/repos/extra-x86_64/PKGBUILD (from rev 207593, nvidia-304xx/trunk/PKGBUILD) nvidia-304xx/repos/extra-x86_64/nvidia.install (from rev 207593, nvidia-304xx/trunk/nvidia.install) Deleted: nvidia-304xx/repos/extra-i686/PKGBUILD nvidia-304xx/repos/extra-i686/nvidia.install nvidia-304xx/repos/extra-i686/nvidia_3.13_kernel.patch nvidia-304xx/repos/extra-x86_64/PKGBUILD nvidia-304xx/repos/extra-x86_64/nvidia.install nvidia-304xx/repos/extra-x86_64/nvidia_3.13_kernel.patch ---------------------------------------+ /PKGBUILD | 104 ++++++++++++++++++++++++++++++++ /nvidia.install | 30 +++++++++ extra-i686/PKGBUILD | 55 ---------------- extra-i686/nvidia.install | 15 ---- extra-i686/nvidia_3.13_kernel.patch | 25 ------- extra-x86_64/PKGBUILD | 55 ---------------- extra-x86_64/nvidia.install | 15 ---- extra-x86_64/nvidia_3.13_kernel.patch | 25 ------- 8 files changed, 134 insertions(+), 190 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-03-12 17:34:56 UTC (rev 207593) +++ extra-i686/PKGBUILD 2014-03-12 17:36:03 UTC (rev 207594) @@ -1,55 +0,0 @@ -# $Id$ -# Maintainer : Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia-304xx -pkgver=304.119 -_extramodules=extramodules-3.13-ARCH -pkgrel=2 -pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=3.13' 'linux<3.14' "nvidia-304xx-utils=${pkgver}") -makedepends=('linux-headers>=3.13' 'linux-headers<3.14') -conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx') -license=('custom') -install=nvidia.install -options=(!strip) -source=('nvidia_3.13_kernel.patch') -md5sums=('f1569a1ce7f9293b876c2b72f3fd7c9e') - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums+=('a2acb8066ac296005dbf560ee83ae6d9') -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+=('fb93002115c99f15b6ca393a90a9c9ec') -fi - - -prepare() { - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}" - patch -p1 -i "${srcdir}"/nvidia_3.13_kernel.patch -} - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${_pkg}/kernel" - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package() { - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - install -d -m755 "${pkgdir}/usr/lib/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - - # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. -} Copied: nvidia-304xx/repos/extra-i686/PKGBUILD (from rev 207593, nvidia-304xx/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-03-12 17:36:03 UTC (rev 207594) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@gmail.com> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia-304xx +pkgver=304.121 +_extramodules=extramodules-3.13-ARCH +pkgrel=1 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.13' 'linux<3.14' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers>=3.13' 'linux-headers<3.14') +conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('b8c950f0a30a6e1f503630fbd0ca8ab9') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('41e6d2b6325e5b0ae9889cfbd6bec696') +fi + + +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}/kernel" + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. +} Deleted: extra-i686/nvidia.install =================================================================== --- extra-i686/nvidia.install 2014-03-12 17:34:56 UTC (rev 207593) +++ extra-i686/nvidia.install 2014-03-12 17:36:03 UTC (rev 207594) @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.13-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.13-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.13-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} Copied: nvidia-304xx/repos/extra-i686/nvidia.install (from rev 207593, nvidia-304xx/trunk/nvidia.install) =================================================================== --- extra-i686/nvidia.install (rev 0) +++ extra-i686/nvidia.install 2014-03-12 17:36:03 UTC (rev 207594) @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.13-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.13-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.13-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} Deleted: extra-i686/nvidia_3.13_kernel.patch =================================================================== --- extra-i686/nvidia_3.13_kernel.patch 2014-03-12 17:34:56 UTC (rev 207593) +++ extra-i686/nvidia_3.13_kernel.patch 2014-03-12 17:36:03 UTC (rev 207594) @@ -1,25 +0,0 @@ -diff -Nur NVIDIA-Linux-x86_64-304.117-no-compat32.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-304.117-no-compat32/kernel/nv-acpi.c ---- NVIDIA-Linux-x86_64-304.117-no-compat32.orig/kernel/nv-acpi.c 2013-11-27 06:25:42.000000000 +0100 -+++ NVIDIA-Linux-x86_64-304.117-no-compat32/kernel/nv-acpi.c 2014-01-26 12:25:06.443610357 +0100 -@@ -15,6 +15,10 @@ - #include "nv-linux.h" - #include "nv-reg.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE) -+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a) -+#endif -+ - #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) - - static int nv_acpi_add (struct acpi_device *); -@@ -299,7 +303,10 @@ - - if (pNvAcpiObject->notify_handler_installed) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) -+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */ - NV_ACPI_OS_WAIT_EVENTS_COMPLETE(); -+#endif - - // remove event notifier - status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event); Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-03-12 17:34:56 UTC (rev 207593) +++ extra-x86_64/PKGBUILD 2014-03-12 17:36:03 UTC (rev 207594) @@ -1,55 +0,0 @@ -# $Id$ -# Maintainer : Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia-304xx -pkgver=304.119 -_extramodules=extramodules-3.13-ARCH -pkgrel=2 -pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=3.13' 'linux<3.14' "nvidia-304xx-utils=${pkgver}") -makedepends=('linux-headers>=3.13' 'linux-headers<3.14') -conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx') -license=('custom') -install=nvidia.install -options=(!strip) -source=('nvidia_3.13_kernel.patch') -md5sums=('f1569a1ce7f9293b876c2b72f3fd7c9e') - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums+=('a2acb8066ac296005dbf560ee83ae6d9') -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+=('fb93002115c99f15b6ca393a90a9c9ec') -fi - - -prepare() { - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}" - patch -p1 -i "${srcdir}"/nvidia_3.13_kernel.patch -} - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${_pkg}/kernel" - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package() { - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - install -d -m755 "${pkgdir}/usr/lib/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - - # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. -} Copied: nvidia-304xx/repos/extra-x86_64/PKGBUILD (from rev 207593, nvidia-304xx/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-03-12 17:36:03 UTC (rev 207594) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@gmail.com> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia-304xx +pkgver=304.121 +_extramodules=extramodules-3.13-ARCH +pkgrel=1 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.13' 'linux<3.14' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers>=3.13' 'linux-headers<3.14') +conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('b8c950f0a30a6e1f503630fbd0ca8ab9') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('41e6d2b6325e5b0ae9889cfbd6bec696') +fi + + +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}/kernel" + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. +} Deleted: extra-x86_64/nvidia.install =================================================================== --- extra-x86_64/nvidia.install 2014-03-12 17:34:56 UTC (rev 207593) +++ extra-x86_64/nvidia.install 2014-03-12 17:36:03 UTC (rev 207594) @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.13-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.13-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.13-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} Copied: nvidia-304xx/repos/extra-x86_64/nvidia.install (from rev 207593, nvidia-304xx/trunk/nvidia.install) =================================================================== --- extra-x86_64/nvidia.install (rev 0) +++ extra-x86_64/nvidia.install 2014-03-12 17:36:03 UTC (rev 207594) @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.13-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.13-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.13-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} Deleted: extra-x86_64/nvidia_3.13_kernel.patch =================================================================== --- extra-x86_64/nvidia_3.13_kernel.patch 2014-03-12 17:34:56 UTC (rev 207593) +++ extra-x86_64/nvidia_3.13_kernel.patch 2014-03-12 17:36:03 UTC (rev 207594) @@ -1,25 +0,0 @@ -diff -Nur NVIDIA-Linux-x86_64-304.117-no-compat32.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-304.117-no-compat32/kernel/nv-acpi.c ---- NVIDIA-Linux-x86_64-304.117-no-compat32.orig/kernel/nv-acpi.c 2013-11-27 06:25:42.000000000 +0100 -+++ NVIDIA-Linux-x86_64-304.117-no-compat32/kernel/nv-acpi.c 2014-01-26 12:25:06.443610357 +0100 -@@ -15,6 +15,10 @@ - #include "nv-linux.h" - #include "nv-reg.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE) -+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a) -+#endif -+ - #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) - - static int nv_acpi_add (struct acpi_device *); -@@ -299,7 +303,10 @@ - - if (pNvAcpiObject->notify_handler_installed) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) -+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */ - NV_ACPI_OS_WAIT_EVENTS_COMPLETE(); -+#endif - - // remove event notifier - status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);