config/version: set version to 3.1.2

Signed-off-by: Stephan Raue <stephan@openelec.tv>

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="3.1.2"
 
 # OS_VERSION: OS Version
   OS_VERSION="3.2"

packages/tools/bcm2835-bootloader/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="e11b332"
+PKG_VERSION="0d1b1d8"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/x11/driver/xf86-video-nvidia/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="319.32"
+PKG_VERSION="304.88"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"

packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7-fix.patch

@@ -1,16 +0,0 @@
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index 8eff4d7..2bf3318 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1716,11 +1716,8 @@ case "$6" in
-                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- 
--                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
--                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
--                fi
-             fi
-         fi
- 

packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-001-kernel-3.10.patch

@@ -1,6 +1,6 @@
-# https://devtalk.nvidia.com/default/topic/543728/linux/building-nvidia-driver-on-kernel-3-9-0/post/3814531/#3814531
+https://devtalk.nvidia.com/default/topic/543728/linux/building-nvidia-driver-on-kernel-3-9-0/post/3814531/#3814531
+http://pastie.org/7942599
 
-diff -ur -X - a/kernel/nv-i2c.c b/kernel/nv-i2c.c
 --- a/kernel/nv-i2c.c	2013-04-26 00:22:30.000000000 -0400
 +++ b/kernel/nv-i2c.c	2013-05-13 05:20:55.571981365 -0400
 @@ -311,8 +311,6 @@
@@ -31,7 +31,7 @@ diff -ur -X - a/kernel/nv-i2c.c b/kernel/nv-i2c.c
  }
  
  #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -ur -X - a/kernel/nv-procfs.c b/kernel/nv-procfs.c
+
 --- a/kernel/nv-procfs.c	2013-04-26 00:22:30.000000000 -0400
 +++ b/kernel/nv-procfs.c	2013-05-22 04:52:45.229495748 -0400
 @@ -60,60 +60,41 @@
@@ -163,7 +163,7 @@ diff -ur -X - a/kernel/nv-procfs.c b/kernel/nv-procfs.c
          }
      }
 @@ -180,12 +161,12 @@
-         type = "PCIe";
+         type = "PCI-E";
      else
          type = "PCI";
 -    len += sprintf(page+len, "Bus Type: \t %s\n", type);

packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-002-kernel-3.10.patch

@@ -0,0 +1,29 @@
+by ultraman
+
+--- a/kernel/nv-procfs.c	2013-03-27 22:26:51.000000000 +0100
++++ b/kernel/nv-procfs.c	2013-07-05 12:08:43.000000000 +0200
+@@ -789,18 +791,18 @@
+             if (!proc_nvidia_agp)
+                 goto failed;
+ 
+-            entry = NV_CREATE_PROC_FILE("status", proc_nvidia_agp,
+-                nv_procfs_read_agp_status, NULL, NULL, nv);
++            entry = proc_create_data("status", NV_PROC_RO, proc_nvidia_agp,
++                nv_procfs_read_agp_status, nv);
+             if (!entry)
+                 goto failed;
+ 
+-            entry = NV_CREATE_PROC_FILE("host-bridge", proc_nvidia_agp,
+-                nv_procfs_read_agp_info, NULL, NULL, NULL);
++            entry = proc_create_data("host-bridge", NV_PROC_RO, proc_nvidia_agp,
++                nv_procfs_read_agp_info, NULL);
+             if (!entry)
+                 goto failed;
+ 
+-            entry = NV_CREATE_PROC_FILE("gpu", proc_nvidia_agp,
+-                nv_procfs_read_agp_info, NULL, NULL, nv);
++            entry = proc_create_data("gpu", NV_PROC_RO, proc_nvidia_agp,
++                nv_procfs_read_agp_info, nv);
+             if (!entry)
+                 goto failed;
+         }