config/version: set version to 3.1.3

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.3"
 
 # OS_VERSION: OS Version
   OS_VERSION="3.2"

packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.26.01-PR2890.patch

@@ -1,29 +0,0 @@
-From 86a63c5040e307dcb633a5934ab1b3f9114009f5 Mon Sep 17 00:00:00 2001
-From: arnova <arnova@void.org>
-Date: Sun, 23 Jun 2013 23:16:55 +0200
-Subject: [PATCH] changed: Make more obvious we're passing a CFileItem
-
----
- xbmc/music/infoscanner/MusicInfoScanner.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp
-index 84a155c..f93d613 100644
---- a/xbmc/music/infoscanner/MusicInfoScanner.cpp
-+++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp
-@@ -1009,8 +1009,10 @@ void CMusicInfoScanner::FindArtForAlbums(VECALBUMS &albums, const CStdString &pa
-     }
-   }
-   if (albums.size() == 1 && !albumArt.empty())
--  { // assign to folder thumb as well
--    CMusicThumbLoader::SetCachedImage(path, "thumb", albumArt);
-+  {
-+    // assign to folder thumb as well
-+    CFileItem albumItem(path, true);
-+    CMusicThumbLoader::SetCachedImage(albumItem, "thumb", albumArt);
-   }
- }
- 
--- 
-1.8.1.6
-

packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.26.03-PR2890.patch

@@ -1,68 +0,0 @@
-From 94817e6fa85e2e0b39d1f0f96795435a4256fe7b Mon Sep 17 00:00:00 2001
-From: arnova <arnova@void.org>
-Date: Sun, 7 Jul 2013 12:27:08 +0200
-Subject: [PATCH] fixed: MusicInfoTag loader locked up after
- 9752e490e40e69d53e9dbb10a972dff533192570
-
----
- xbmc/BackgroundInfoLoader.cpp | 6 +++++-
- xbmc/BackgroundInfoLoader.h   | 1 +
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/BackgroundInfoLoader.cpp b/xbmc/BackgroundInfoLoader.cpp
-index 8e488d0..1cd6e62 100644
---- a/xbmc/BackgroundInfoLoader.cpp
-+++ b/xbmc/BackgroundInfoLoader.cpp
-@@ -32,6 +32,7 @@
-   m_pObserver=NULL;
-   m_pProgressCallback=NULL;
-   m_pVecItems = NULL;
-+  m_bIsLoading = false;
- }
- 
- CBackgroundInfoLoader::~CBackgroundInfoLoader()
-@@ -88,6 +89,7 @@ void CBackgroundInfoLoader::Run()
-       }
-     }
- 
-+    m_bIsLoading = false;
-     OnLoaderFinish();
-   }
-   catch (...)
-@@ -110,6 +112,7 @@ void CBackgroundInfoLoader::Load(CFileItemList& items)
- 
-   m_pVecItems = &items;
-   m_bStop = false;
-+  m_bIsLoading = true;
- 
-   m_thread = new CThread(this, "BackgroundLoader");
-   m_thread->Create();
-@@ -136,11 +139,12 @@ void CBackgroundInfoLoader::StopThread()
-   }
-   m_vecItems.clear();
-   m_pVecItems = NULL;
-+  m_bIsLoading = false;
- }
- 
- bool CBackgroundInfoLoader::IsLoading()
- {
--  return m_thread != NULL;
-+  return m_bIsLoading;
- }
- 
- void CBackgroundInfoLoader::SetObserver(IBackgroundLoaderObserver* pObserver)
-diff --git a/xbmc/BackgroundInfoLoader.h b/xbmc/BackgroundInfoLoader.h
-index 3a214a3..3cf28db 100644
---- a/xbmc/BackgroundInfoLoader.h
-+++ b/xbmc/BackgroundInfoLoader.h
-@@ -63,6 +63,7 @@ class CBackgroundInfoLoader : public IRunnable
-   std::vector<CFileItemPtr> m_vecItems; // FileItemList would delete the items and we only want to keep a reference.
-   CCriticalSection m_lock;
- 
-+  volatile bool m_bIsLoading;
-   volatile bool m_bStop;
-   CThread *m_thread;
- 
--- 
-1.8.1.6
-

packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.26.04-PR2890.patch

@@ -1,31 +0,0 @@
-From fe1856c912e47a86081d08e25d95b2efcc3e14ac Mon Sep 17 00:00:00 2001
-From: arnova <arnova@void.org>
-Date: Mon, 8 Jul 2013 08:29:37 +0200
-Subject: [PATCH] fixed: Little fixup for
- 94817e6fa85e2e0b39d1f0f96795435a4256fe7b (thanks JM)
-
----
- xbmc/BackgroundInfoLoader.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/BackgroundInfoLoader.cpp b/xbmc/BackgroundInfoLoader.cpp
-index 1cd6e62..43dfb49 100644
---- a/xbmc/BackgroundInfoLoader.cpp
-+++ b/xbmc/BackgroundInfoLoader.cpp
-@@ -89,11 +89,12 @@ void CBackgroundInfoLoader::Run()
-       }
-     }
- 
--    m_bIsLoading = false;
-     OnLoaderFinish();
-+    m_bIsLoading = false;
-   }
-   catch (...)
-   {
-+    m_bIsLoading = false;
-     CLog::Log(LOGERROR, "%s - Unhandled exception", __FUNCTION__);
-   }
- }
--- 
-1.8.1.6
-

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;
+         }