From owner-svn-ports-head@FreeBSD.ORG Wed May 27 22:54:37 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D09CA62; Wed, 27 May 2015 22:54:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AFE23F5; Wed, 27 May 2015 22:54:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4RMsbrP090352; Wed, 27 May 2015 22:54:37 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4RMsa6F090348; Wed, 27 May 2015 22:54:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201505272254.t4RMsa6F090348@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 27 May 2015 22:54:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387685 - in head/emulators/ppsspp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2015 22:54:37 -0000 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 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 + #else +-#include ++#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 + #else +-#include "libpng17/png.h" ++#include "png.h" + #endif + + #include "png_load.h"