svn commit: r387685 - in head/emulators/ppsspp: . files

[Jan Beich]

Author: jbeich
Date: Wed May 27 22:54:35 2015
New Revision: 387685
URL: https://svnweb.freebsd.org/changeset/ports/387685

Log:
  emulators/ppsspp: switch SDL=on to system libpng
  
  Do not wait for upstream release if a vulnerability is found. [1]
  QT* already use system libpng via QImage in x11-toolkits/qt*-gui.
  
  GitHub:		hrydgard/native#273 [1]
  Security:	CVE-2014-9495 [1]

Added:
  head/emulators/ppsspp/files/patch-Core_Screenshot.cpp   (contents, props changed)
  head/emulators/ppsspp/files/patch-native_image_png__load.cpp   (contents, props changed)
Modified:
  head/emulators/ppsspp/Makefile   (contents, props changed)
  head/emulators/ppsspp/files/patch-CMakeLists.txt   (contents, props changed)

Modified: head/emulators/ppsspp/Makefile
==============================================================================
--- head/emulators/ppsspp/Makefile	Wed May 27 22:54:08 2015	(r387684)
+++ head/emulators/ppsspp/Makefile	Wed May 27 22:54:35 2015	(r387685)
@@ -3,7 +3,7 @@
 PORTNAME=	ppsspp
 PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 .ifndef GITHUB_GROUPS
 MASTER_SITES=	https://codeload.github.com/${GH_ACCOUNT}/${PORTNAME}-lang/tar.gz/52c757e?dummy=/:lang \
@@ -52,6 +52,8 @@ QT4_USE=	QT4=qmake_build,moc_build,rcc_b
 QT5_USES=	qmake:outsource
 QT5_USE=	QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets
 SDL_USES=	cmake:outsource ninja
+SDL_BUILD_DEPENDS=	png>=1.6:${PORTSDIR}/graphics/png
+SDL_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 SDL_LDFLAGS=	-L${LOCALBASE}/lib # ffmpeg
 
 .include <bsd.port.options.mk>

Modified: head/emulators/ppsspp/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/ppsspp/files/patch-CMakeLists.txt	Wed May 27 22:54:08 2015	(r387684)
+++ head/emulators/ppsspp/files/patch-CMakeLists.txt	Wed May 27 22:54:35 2015	(r387685)
@@ -20,3 +20,17 @@
  		add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64)
  	endif()
  	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+@@ -525,9 +527,10 @@ target_link_libraries(libzip ${ZLIB_LIBR
+ include_directories(native/ext/libzip)
+ set(LIBZIP_LIBRARY libzip)
+ 
+-# 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)

Added: head/emulators/ppsspp/files/patch-Core_Screenshot.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/ppsspp/files/patch-Core_Screenshot.cpp	Wed May 27 22:54:35 2015	(r387685)
@@ -0,0 +1,11 @@
+--- 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
+ 

Added: head/emulators/ppsspp/files/patch-native_image_png__load.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/ppsspp/files/patch-native_image_png__load.cpp	Wed May 27 22:54:35 2015	(r387685)
@@ -0,0 +1,11 @@
+--- native/image/png_load.cpp.orig	2015-02-23 23:22:58 UTC
++++ 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"