diff --git a/_servicedata b/_servicedata
index cea0faa..d4f2970 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/hrydgard/ppsspp.git
- f4d8bfdf187f909e7e64ca63d49ea7c9ee13d146
\ No newline at end of file
+ 386c9d4fcf559ea0b22f509bf680f36fc541fcda
\ No newline at end of file
diff --git a/ppsspp-1.5.4~git20180412.tar.xz b/ppsspp-1.5.4~git20180412.tar.xz
deleted file mode 100644
index ef6b41a..0000000
--- a/ppsspp-1.5.4~git20180412.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4951e70036d18e226bf9bbe63945585a6b6ef70307115b31ec0122260fdce954
-size 160107456
diff --git a/ppsspp-1.5.4~git20180422.tar.xz b/ppsspp-1.5.4~git20180422.tar.xz
new file mode 100644
index 0000000..23972af
--- /dev/null
+++ b/ppsspp-1.5.4~git20180422.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25a0fa3937919f61dd2faf9908b5304579a73170274a6b4338e60da0db9d6968
+size 160103552
diff --git a/ppsspp.changes b/ppsspp.changes
index a5ff3ad..134eee1 100644
--- a/ppsspp.changes
+++ b/ppsspp.changes
@@ -1,3 +1,92 @@
+-------------------------------------------------------------------
+Wed Apr 25 15:21:49 UTC 2018 - pousaduarte@gmail.com
+
+- Restore SDL build
+
+-------------------------------------------------------------------
+Mon Apr 23 12:21:13 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180422:
+ * Depal: Reapply texture when bounds change.
+
+-------------------------------------------------------------------
+Sun Apr 22 16:23:36 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180422:
+ * README: Add more to the issue template.
+ * README: Cleanup and move some out to history.
+ * Android: Add missing graphics shutdown calls.
+
+-------------------------------------------------------------------
+Sat Apr 21 16:07:25 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180421:
+ * Fix build with ffmpeg 4.0
+
+-------------------------------------------------------------------
+Sat Apr 21 11:16:31 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180421:
+ * Update UWP.vcxproj
+ * Fixed Certification and img issues
+
+-------------------------------------------------------------------
+Fri Apr 20 12:15:27 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180420:
+ * Oops, meant to commit this.
+ * Disable the loading state string display, creates too much translation work for 1.6
+ * Android: Buildfix.
+
+-------------------------------------------------------------------
+Thu Apr 19 12:24:00 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180418:
+ * Conditionally revert "Remove the bad orientation hack. Seems the Nexus 5X bug is fixed."
+
+-------------------------------------------------------------------
+Tue Apr 17 18:41:42 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180417:
+ * Replay: Skip recording virtual disc reads.
+
+-------------------------------------------------------------------
+Mon Apr 16 12:47:56 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180415:
+ * add support for File app on iOS 11
+
+-------------------------------------------------------------------
+Sat Apr 14 22:43:26 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180414:
+ * Vulkan: Fix shutdown crash when device lost called.
+ * Android: Avoid overload shadowing.
+ * GLES: GlPushBuffer was a little too friendly.
+ * Vulkan: Fix cache file error handling warnings.
+ * Vulkan: Fix a log formatting issue.
+
+-------------------------------------------------------------------
+Sat Apr 14 11:12:59 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180414:
+ * Fix glitch in MGS: Acid perf hack. yeah, slippery slope..
+ * Shader depal: fix bilinear filter coord
+ * Implement shader depal for GL as well, but disabled by default.
+ * Let's try it on SR2 as well.
+ * Add a queue processing hack for Sonic Rivals too. Now it's fast.
+ * Vulkan: Semi-gross hack that massively improves the perf of MGS2:Acid.
+ * Fix various bugs.
+ * Shader depal: Implement bilinear filtering.
+ * Implement shader depal for Vulkan. See #10908. Bilinear filter not yet implemented.
+
+-------------------------------------------------------------------
+Fri Apr 13 12:16:31 UTC 2018 - pousaduarte@gmail.com
+
+- Update to version 1.5.4~git20180413:
+ * Just add some constants for the GL texture slots.
+ * Vulkan/D3D11: Make some space in the base uniform buffer by consolidating the spline parameters into one variable.
+
-------------------------------------------------------------------
Thu Apr 12 12:59:25 UTC 2018 - pousaduarte@gmail.com
diff --git a/ppsspp.spec b/ppsspp.spec
index ae520cf..7de994d 100644
--- a/ppsspp.spec
+++ b/ppsspp.spec
@@ -17,7 +17,7 @@
Name: ppsspp
-Version: 1.5.4~git20180412
+Version: 1.5.4~git20180422
Release: 0
Summary: PlayStation Portable Emulator
License: GPL-2.0+
@@ -27,18 +27,23 @@ Source: %{name}-%{version}.tar.xz
BuildRequires: gcc-c++
BuildRequires: cmake >= 3.6
-BuildRequires: Mesa-devel
-BuildRequires: libzip-devel
-BuildRequires: snappy-devel
-BuildRequires: unzip
BuildRequires: fdupes
+
+BuildRequires: unzip
+
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(glew)
BuildRequires: pkgconfig(sdl2)
-BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(libpng)
+
+BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(libzip)
+BuildRequires: snappy-devel
+
+BuildRequires: glslang-devel
BuildRequires: wayland-devel
+BuildRequires: Mesa-devel
#Qt deps:
BuildRequires: pkgconfig(Qt5Core)
@@ -82,7 +87,16 @@ Required assets for PPSSPP GUI
%prep
%setup -q
-sed -i -e 's|png17|png16|g' CMakeLists.txt
+sed -i \
+-e 's|png17|png16|g' \
+CMakeLists.txt
+
+#Use system libpng
+find ./ \
+-type f \( -name "*.cpp" -o -name "*.h" \) -exec \
+sed -i \
+-e 's|^#include [\"<]libpng1[0-9]/png.h[\">]|#include |g' \
+{} \;
echo "// This is a generated file.
@@ -93,6 +107,7 @@ const char *PPSSPP_GIT_VERSION = \"%{version}\";
" > git-version.cpp
%build
+
#Restore -DUSE_SYSTEM_FFMPEG="ON" \ once ffmpeg bug is fixed upstream
mkdir build-qt build
@@ -117,7 +132,7 @@ cmake .. \
-DCMAKE_SKIP_RPATH="YES" \
-Wno-dev
-#%%make_jobs
+%make_jobs
%install
mkdir -p %{buildroot}%{_bindir}
@@ -143,7 +158,7 @@ install -m 755 -D build-qt/PPSSPPQt %{buildroot}%{_libexecdir}/%{name}/%{name}-q
ln %{buildroot}%{_libexecdir}/%{name}/%{name}-qt %{buildroot}%{_libexecdir}/%{name}/%{name}
#Failing sdl2 build
-#install -m 755 -D build/PPSSPPSDL %%{buildroot}%%{_libexecdir}/%%{name}/%%{name}
+install -m 755 -D build/PPSSPPSDL %%{buildroot}%%{_libexecdir}/%%{name}/%%{name}
mv assets %{buildroot}%{_libexecdir}/%{name}/
mkdir -p %{buildroot}%{_datadir}/pixmaps