Date: Mon, 22 Feb 2016 14:17:50 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409347 - in head/emulators/ppsspp: . files Message-ID: <201602221417.u1MEHoZ3081439@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Feb 22 14:17:50 2016 New Revision: 409347 URL: https://svnweb.freebsd.org/changeset/ports/409347 Log: 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 Added: head/emulators/ppsspp/files/patch-system-libpng16 (contents, props changed) Deleted: head/emulators/ppsspp/files/patch-CMakeLists.txt head/emulators/ppsspp/files/patch-Core_Screenshot.cpp head/emulators/ppsspp/files/patch-ext_native_image_png__load.cpp head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp Modified: head/emulators/ppsspp/Makefile (contents, props changed) head/emulators/ppsspp/distinfo (contents, props changed) Modified: head/emulators/ppsspp/Makefile ============================================================================== --- head/emulators/ppsspp/Makefile Mon Feb 22 14:17:26 2016 (r409346) +++ head/emulators/ppsspp/Makefile Mon Feb 22 14:17:50 2016 (r409347) @@ -2,7 +2,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.1.1 +DISTVERSION?= 1.2.1 PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands @@ -23,7 +23,7 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/ USE_GITHUB= yes GH_ACCOUNT= hrydgard:DEFAULT,lang Kingcom:ext_armips GH_PROJECT= ${PORTNAME}-lang:lang armips:ext_armips -GH_TAGNAME?= c0db1fc:lang a0b878f:ext_armips +GH_TAGNAME?= b7da552:lang 9b225d9:ext_armips CONFLICTS_INSTALL?= ${PORTNAME}-devel-[0-9]* Modified: head/emulators/ppsspp/distinfo ============================================================================== --- head/emulators/ppsspp/distinfo Mon Feb 22 14:17:26 2016 (r409346) +++ head/emulators/ppsspp/distinfo Mon Feb 22 14:17:50 2016 (r409347) @@ -1,8 +1,8 @@ SHA256 (ppsspp.1) = 8e335555393a6400c97d5f6d23798af801f88b909181bb5af676dfdcb4f8f8be SIZE (ppsspp.1) = 1507 -SHA256 (hrydgard-ppsspp-v1.1.1_GH0.tar.gz) = 4bcd1cc1b3b1f50f5ebbde8dfd47aceffebc07624c03ea651e80c87ce5f68cc8 -SIZE (hrydgard-ppsspp-v1.1.1_GH0.tar.gz) = 14771667 -SHA256 (hrydgard-ppsspp-lang-c0db1fc_GH0.tar.gz) = 0eb8e2a076e3d1920a76420e1f6d470d8b34a5eba227a744e0828fa7602192bd -SIZE (hrydgard-ppsspp-lang-c0db1fc_GH0.tar.gz) = 214596 -SHA256 (Kingcom-armips-a0b878f_GH0.tar.gz) = 64623bbddda609f9692904e6b6823b1d2d4dd0149349f2be9edcc600bf12bafa -SIZE (Kingcom-armips-a0b878f_GH0.tar.gz) = 136535 +SHA256 (hrydgard-ppsspp-v1.2.1_GH0.tar.gz) = 20c086b1f104a45a9aa2226342f7aaf58e569b6152527c7c87cb787a6c5834cd +SIZE (hrydgard-ppsspp-v1.2.1_GH0.tar.gz) = 15062700 +SHA256 (hrydgard-ppsspp-lang-b7da552_GH0.tar.gz) = d268a3adad33e99f05262c71d7d8390e5ac104ad953972fc0068ba6d0d131e60 +SIZE (hrydgard-ppsspp-lang-b7da552_GH0.tar.gz) = 228103 +SHA256 (Kingcom-armips-9b225d9_GH0.tar.gz) = 76dd401235f1ff8624d1f6302f5f725676eedbba39fd54ad4a19ac4c7af81fdd +SIZE (Kingcom-armips-9b225d9_GH0.tar.gz) = 145559 Added: head/emulators/ppsspp/files/patch-system-libpng16 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/ppsspp/files/patch-system-libpng16 Mon Feb 22 14:17:50 2016 (r409347) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602221417.u1MEHoZ3081439>