svn commit: r397030 - in head/emulators: ppsspp ppsspp-devel ppsspp-devel/files

[Jan Beich]

Author: jbeich
Date: Tue Sep 15 23:57:04 2015
New Revision: 397030
URL: https://svnweb.freebsd.org/changeset/ports/397030

Log:
  emulators/ppsspp-devel: update to 1.0.1.2668
  
  - "native" was merged into main "ppsspp" repo
  
  Changes:	https://github.com/hrydgard/ppsspp/compare/86a02fe...1b4b60d (before merge)
  Changes:	https://github.com/hrydgard/ppsspp/compare/cf0697e...253ed9f (after merge)

Added:
  head/emulators/ppsspp-devel/files/patch-ext_native_image_png__load.cpp   (contents, props changed)
     - copied, changed from r396959, head/emulators/ppsspp-devel/files/patch-native_image_png__load.cpp
Deleted:
  head/emulators/ppsspp-devel/files/patch-native_image_png__load.cpp
Modified:
  head/emulators/ppsspp-devel/Makefile   (contents, props changed)
  head/emulators/ppsspp-devel/distinfo   (contents, props changed)
  head/emulators/ppsspp/Makefile   (contents, props changed)

Modified: head/emulators/ppsspp-devel/Makefile
==============================================================================
--- head/emulators/ppsspp-devel/Makefile	Tue Sep 15 23:21:11 2015	(r397029)
+++ head/emulators/ppsspp-devel/Makefile	Tue Sep 15 23:57:04 2015	(r397030)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-DISTVERSION=	1.0.1-866
-DISTVERSIONSUFFIX=	-g86a02fe
+DISTVERSION=	1.0.1-2668
+DISTVERSIONSUFFIX=	-g253ed9f
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
-GH_TAGNAME=	e22d7a5:lang da38466:native a0b878f:ext_armips
+GH_TAGNAME=	e22d7a5:lang a0b878f:ext_armips
 
 CONFLICTS_INSTALL?=	${PORTNAME}-[0-9]*
 

Modified: head/emulators/ppsspp-devel/distinfo
==============================================================================
--- head/emulators/ppsspp-devel/distinfo	Tue Sep 15 23:21:11 2015	(r397029)
+++ head/emulators/ppsspp-devel/distinfo	Tue Sep 15 23:57:04 2015	(r397030)
@@ -1,8 +1,6 @@
-SHA256 (hrydgard-ppsspp-v1.0.1-866-g86a02fe_GH0.tar.gz) = 8ab120647d3156b2575997465b5cafa439949c45e11c4ae3d6a2ea745cc5f002
-SIZE (hrydgard-ppsspp-v1.0.1-866-g86a02fe_GH0.tar.gz) = 13551999
+SHA256 (hrydgard-ppsspp-v1.0.1-2668-g253ed9f_GH0.tar.gz) = 53126bbbc64e0e9fb61f4ffe65d3d87f79f68803bbf3dcc67bcb387b1a00d270
+SIZE (hrydgard-ppsspp-v1.0.1-2668-g253ed9f_GH0.tar.gz) = 14919158
 SHA256 (hrydgard-ppsspp-lang-e22d7a5_GH0.tar.gz) = b481a44c75b646d99909e3acd1f59614e7c05463e73c3827a662d9cf298e84cb
 SIZE (hrydgard-ppsspp-lang-e22d7a5_GH0.tar.gz) = 210229
-SHA256 (hrydgard-native-da38466_GH0.tar.gz) = ae83263682b95aa0a737c16e731ff21783061d0e0c9abd5bb25cacfe863e7173
-SIZE (hrydgard-native-da38466_GH0.tar.gz) = 1400382
 SHA256 (Kingcom-armips-a0b878f_GH0.tar.gz) = 64623bbddda609f9692904e6b6823b1d2d4dd0149349f2be9edcc600bf12bafa
 SIZE (Kingcom-armips-a0b878f_GH0.tar.gz) = 136535

Copied and modified: head/emulators/ppsspp-devel/files/patch-ext_native_image_png__load.cpp (from r396959, head/emulators/ppsspp-devel/files/patch-native_image_png__load.cpp)
==============================================================================
--- head/emulators/ppsspp-devel/files/patch-native_image_png__load.cpp	Tue Sep 15 13:23:07 2015	(r396959, copy source)
+++ head/emulators/ppsspp-devel/files/patch-ext_native_image_png__load.cpp	Tue Sep 15 23:57:04 2015	(r397030)
@@ -1,5 +1,5 @@
---- native/image/png_load.cpp.orig	2015-02-23 23:22:58 UTC
-+++ native/image/png_load.cpp
+--- 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>

Modified: head/emulators/ppsspp/Makefile
==============================================================================
--- head/emulators/ppsspp/Makefile	Tue Sep 15 23:21:11 2015	(r397029)
+++ head/emulators/ppsspp/Makefile	Tue Sep 15 23:57:04 2015	(r397030)
@@ -20,10 +20,15 @@ LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/m
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	hrydgard:DEFAULT,lang,native Kingcom:ext_armips
-GH_PROJECT=	${PORTNAME}-lang:lang native:native armips:ext_armips
+GH_ACCOUNT=	hrydgard:DEFAULT,lang Kingcom:ext_armips
+GH_PROJECT=	${PORTNAME}-lang:lang armips:ext_armips
 GH_TAGNAME?=	52c757e:lang 52ce9c1:native a0b878f:ext_armips
 
+.ifndef PKGNAMESUFFIX
+GH_ACCOUNT+=	hrydgard:native
+GH_PROJECT+=	native:native
+.endif
+
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-[0-9]*
 
 USES=		compiler:c++11-lib pkgconfig