Initial import

4 files changed, 115 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..3b57f44e9411
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,26 @@
+# Generated by makepkg 4.2.0
+# Mon Feb  9 15:53:10 UTC 2015
+pkgbase = nvidia-pae
+	pkgdesc = NVIDIA drivers for linux-pae
+	pkgver = 346.35
+	pkgrel = 3
+	url = http://www.nvidia.com/
+	install = nvidia.install
+	arch = i686
+	license = custom
+	makedepends = linux-pae-headers>=3.18
+	makedepends = linux-pae-headers<3.19
+	depends = linux-pae>=3.18
+	depends = linux-pae<3.19
+	depends = nvidia-libgl
+	depends = nvidia-utils=346.35
+	conflicts = nvidia-96xx
+	conflicts = nvidia-173xx
+	options = !strip
+	source = nv-drm.patch
+	md5sums = 2365f1405f0c7bbb8f8cd7ebd5e4e301
+	source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/346.35/NVIDIA-Linux-x86-346.35.run
+	md5sums_i686 = d2b8f7f90ef5037f03f94519f9809511
+
+pkgname = nvidia-pae
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..a6183a5da2ea
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Robert Knauer <robert@privatdemail.net>
+# Contributor: Thomas Baechler <thomas@archlinux.org>
+
+pkgname=nvidia-pae
+pkgver=352.09
+_extramodules=extramodules-4.0-pae
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux-pae"
+arch=('i686')
+url="http://www.nvidia.com/"
+depends=('linux-pae>=4.0' 'linux-pae<4.1' 'nvidia-libgl' "nvidia-utils=${pkgver}")
+makedepends=('linux-pae-headers>=4.0' 'linux-pae-headers<4.1')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+
+source=("nv-drm.patch")
+source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
+source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+md5sums=('2365f1405f0c7bbb8f8cd7ebd5e4e301')
+md5sums_i686=('0e009686400c522209eaa8ab835ff81f')
+md5sums_x86_64=('9ca9f07f91361362f304ca8317ddd453')
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+  sh "${_pkg}.run" --extract-only
+  cd "${_pkg}"
+  # patches here
+  patch -Np0 -i "$srcdir/nv-drm.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}/etc/modprobe.d"
+  echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist-pae.conf"
+  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+}
diff --git a/nv-drm.patch b/nv-drm.patch
new file mode 100644
index 000000000000..820463d378c2
--- /dev/null
+++ b/nv-drm.patch
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200

++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200

+@@ -18,6 +18,11 @@

+

+ #include <drm/drmP.h>

+

++/* 3.18-rc0+ */

++#ifndef drm_gem_object

++#include <drm/drm_gem.h>

++#endif

++

+ extern nv_linux_state_t *nv_linux_devices;

+

+ struct nv_gem_object {

+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c

+index ecc982a..60d7aae 100644

+--- kernel/nv-drm.c~

++++ kernel/nv-drm.c

+@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {

+     .gem_prime_vmap = nv_gem_prime_vmap,

+     .gem_prime_vunmap = nv_gem_prime_vunmap,

+

++    .set_busid = drm_pci_set_busid,

++

+     .name = "nvidia-drm",

+     .desc = "NVIDIA DRM driver",

+     .date = "20130102",

diff --git a/nvidia.install b/nvidia.install
new file mode 100644
index 000000000000..c1d8c800f095
--- /dev/null
+++ b/nvidia.install
@@ -0,0 +1,16 @@
+post_install() {
+  EXTRAMODULES='extramodules-4.0-pae'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
+  echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+  EXTRAMODULES='extramodules-4.0-pae'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
+  rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
+}
+
+post_remove() {
+  EXTRAMODULES='extramodules-4.0-pae'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}