From 27f8a89dfaf5d1155bfa7d7fd7a6b4168b717b22 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 9 Aug 2014 02:49:50 +0200
Subject: ppsspp: update to 0.9.9

---
 .../emulators/ppsspp/bump-version-to-0.9.8.patch   | 22 ----------------------
 pkgs/misc/emulators/ppsspp/default.nix             |  9 +++------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch b/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch
deleted file mode 100644
index 5e474d6f7477..000000000000
--- a/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 48f6bf352154511d5acddfe44dd241c6a9ed92d7 Mon Sep 17 00:00:00 2001
-From: Bhavin <bhavin192@users.noreply.github.com>
-Date: Tue, 6 May 2014 22:44:58 +0530
-Subject: [PATCH] Update vaersion to 0.9.8
-
-It was 0.9.6 :(
----
- Qt/Settings.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Qt/Settings.pri b/Qt/Settings.pri
-index 8b4c1d7..67949f2 100644
---- a/Qt/Settings.pri
-+++ b/Qt/Settings.pri
-@@ -1,4 +1,4 @@
--VERSION = 0.9.6
-+VERSION = 0.9.8
- DEFINES += USING_QT_UI USE_FFMPEG
- unix:!qnx:!symbian:!mac: CONFIG += linux
- maemo5|contains(MEEGO_EDITION,harmattan): CONFIG += maemo
---
-1.9.3
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 975de0f52701..ced8e1344dad 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -3,21 +3,18 @@
 }:
 
 let
-  version = "0.9.8";
+  version = "0.9.9";
   fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF");
 in stdenv.mkDerivation {
   name = "PPSSPP-${version}";
 
   src = fetchgit {
     url = "https://github.com/hrydgard/ppsspp.git";
-    sha256 = "11sqhb2m3502dzbizahh1w2dl7jv3fipwxyrmryj8fyaqqw0i36q";
-    rev = "cbc46be3f91cb8558fbb4b175b14e8e16cbf0243";
+    sha256 = "1m7awac87wrwys22qwbr0589im1ilm0dv30wp945xg30793rivvj";
+    rev = "b421e29391b34d997b2c99ce2bdc74a0df5bb472";
     fetchSubmodules = true;
   };
 
-  # Upstream forgot to bump a version in one file.
-  patches = [ ./bump-version-to-0.9.8.patch ];
-
   buildInputs = [ zlib libpng pkgconfig qt4 ]
                 ++ (if withGamepads then [ SDL ] else [ ]);
 
-- 
cgit 1.4.1