emulators/ppsspp: update to 1.2.1

- Back out r388231 now that DragonFly updated its GCC past 5.2
- Make it easier to back out r387685 in future by concatenating patches

Changes:	http://ppsspp.org/#news

1 files changed, 40 insertions, 0 deletions

diff --git a/emulators/ppsspp/files/patch-system-libpng16 b/emulators/ppsspp/files/patch-system-libpng16
new file mode 100644
index 000000000000..49ba2533067f
--- /dev/null
+++ b/emulators/ppsspp/files/patch-system-libpng16
@@ -0,0 +1,40 @@
+Make build glue accept libpng 1.6.x and don't hardcode suffix
+
+--- CMakeLists.txt.orig	2015-11-19 15:07:48 UTC
++++ CMakeLists.txt
+@@ -709,9 +709,10 @@ else()
+ 	set(LIBZIP_LIBRARY libzip)
+ endif()
+ 
+-# FindPNG does a few things we don't want. So do it ourselves. Fixed to libpng17
+-find_path(PNG_PNG_INCLUDE_DIR NAMES "libpng17/png.h")
+-find_library(PNG_LIBRARY NAMES png17 libpng17)
++find_package(PkgConfig)
++pkg_check_modules(PNG libpng>=1.6)
++set(PNG_LIBRARY ${PNG_LIBRARIES})
++set(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS})
+ find_package(PackageHandleStandardArgs)
+ find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
+ if (PNG_FOUND)
+--- Core/Screenshot.cpp.orig	2015-02-26 20:05:06 UTC
++++ Core/Screenshot.cpp
+@@ -18,7 +18,7 @@
+ #ifdef USING_QT_UI
+ #include <QtGui/QImage>
+ #else
+-#include <libpng17/png.h>
++#include "png.h"
+ #include "ext/jpge/jpge.h"
+ #endif
+ 
+--- ext/native/image/png_load.cpp.orig	2015-09-06 20:37:59 UTC
++++ ext/native/image/png_load.cpp
+@@ -5,7 +5,7 @@
+ #ifdef USING_QT_UI
+ #include <QtGui/QImage>
+ #else
+-#include "libpng17/png.h"
++#include "png.h"
+ #endif
+ 
+ #include "png_load.h"