Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Feb 2021 22:27:34 +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: r564655 - in head/emulators/ppsspp: . files
Message-ID:  <202102072227.117MRYE2093525@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Feb  7 22:27:34 2021
New Revision: 564655
URL: https://svnweb.freebsd.org/changeset/ports/564655

Log:
  emulators/ppsspp: update to 1.11
  
  - Retire OLDJOY option due to increasing difficulting of rebasing
  
  Changes:	https://ppsspp.org/#news
  Changes:	https://github.com/hrydgard/ppsspp/compare/v1.10.3...v1.11
  Reported by:	GitHub (watch releases)

Deleted:
  head/emulators/ppsspp/files/extra-patch-old-joy
Modified:
  head/emulators/ppsspp/Makefile   (contents, props changed)
  head/emulators/ppsspp/distinfo   (contents, props changed)
  head/emulators/ppsspp/files/pkg-message.in   (contents, props changed)
  head/emulators/ppsspp/pkg-plist   (contents, props changed)

Modified: head/emulators/ppsspp/Makefile
==============================================================================
--- head/emulators/ppsspp/Makefile	Sun Feb  7 22:22:21 2021	(r564654)
+++ head/emulators/ppsspp/Makefile	Sun Feb  7 22:27:34 2021	(r564655)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
-DISTVERSION?=	1.10.3
+DISTVERSION?=	1.11
 PORTREVISION?=	0
 CATEGORIES=	emulators
 # XXX Get from Debian once #697821 lands
@@ -28,7 +28,8 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrydgard
 GH_TUPLE?=	hrydgard:glslang:8.13.3559-76-gd0850f87:glslang/ext/glslang \
-		hrydgard:${PORTNAME}-lang:1c64b8f:lang/assets/lang \
+		hrydgard:miniupnp:miniupnpd_2_1-354-g7e229dd:miniupnp/ext/miniupnp \
+		hrydgard:${PORTNAME}-lang:567b225:lang/assets/lang \
 		KhronosGroup:SPIRV-Cross:2019-05-20-60-ga1f7c8dc:SPIRV/ext/SPIRV-Cross \
 		Kingcom:armips:v0.10.0-28-g7885552:armips/ext/armips
 
@@ -41,7 +42,7 @@ USE_GL=		gl glew glu
 CMAKE_ON=	USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP USE_SYSTEM_SNAPPY USE_WAYLAND_WSI
 CMAKE_OFF=	USE_DISCORD
 SUB_FILES=	pkg-message
-PORTDATA=	assets ${PORTNAME}
+PORTDATA=	assets
 
 DESKTOP_ENTRIES="PPSSPP" \
 		"" \
@@ -50,7 +51,7 @@ DESKTOP_ENTRIES="PPSSPP" \
 		"Game;Emulator;" \
 		""
 
-OPTIONS_DEFINE=	OLDJOY VULKAN
+OPTIONS_DEFINE=	VULKAN
 OPTIONS_DEFAULT=VULKAN
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	LIBRETRO QT5 SDL
@@ -61,8 +62,6 @@ LIBRETRO_DESC=	libretro core for games/retroarch
 LIBRETRO_CMAKE_BOOL=	LIBRETRO
 LIBRETRO_PLIST_FILES=	lib/libretro/${PORTNAME}_libretro.so
 LIBRETRO_VARS=	CONFLICTS_INSTALL= DESKTOP_ENTRIES= PLIST= PORTDATA= PKGMESSAGE= SUB_FILES=
-OLDJOY_DESC=	Old joystick support with fixed button mappings (deprecated)
-OLDJOY_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-old-joy
 QT5_USES=	qt:5 sdl
 QT5_USE=	QT=qmake_build,buildtools_build,linguisttools_build,gui,multimedia,opengl,widgets
 QT5_USE+=	SDL=sdl2 # audio, joystick
@@ -85,21 +84,10 @@ post-patch:
 		${WRKSRC}/git-version.cmake
 
 do-install-QT5-on do-install-SDL-on:
-# cmake doesn't pack assets into the app unlike qmake
-	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \
-		"${PORTDATA:N${PORTNAME}}" ${STAGEDIR}${DATADIR})
-# Install the app alongside assets to avoid warnings with GetExeDirectory()
-	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${EXENAME} \
-		${STAGEDIR}${DATADIR}/${PORTNAME}
-	${LN} -sf ../${DATADIR_REL}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
+	${MV} ${STAGEDIR}${PREFIX}/bin/${EXENAME} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
-	(cd ${WRKSRC}/icons && ${COPYTREE_SHARE} \
-		"hicolor" ${STAGEDIR}${PREFIX}/share/icons)
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	${INSTALL_DATA} ${WRKSRC}/icons/icon-512.svg \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
 
 do-install-LIBRETRO-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H}

Modified: head/emulators/ppsspp/distinfo
==============================================================================
--- head/emulators/ppsspp/distinfo	Sun Feb  7 22:22:21 2021	(r564654)
+++ head/emulators/ppsspp/distinfo	Sun Feb  7 22:27:34 2021	(r564655)
@@ -1,12 +1,14 @@
-TIMESTAMP = 1594551856
+TIMESTAMP = 1612734236
 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b
 SIZE (ppsspp.1) = 1598
-SHA256 (hrydgard-ppsspp-v1.10.3_GH0.tar.gz) = 92a0931c0817529202679f926632510658f3aeea83e2a1663f9cce595b505421
-SIZE (hrydgard-ppsspp-v1.10.3_GH0.tar.gz) = 16956980
+SHA256 (hrydgard-ppsspp-v1.11_GH0.tar.gz) = 2e7be70623a34b0d3900d4b2b4011b15e83b7915b70c3a3f4b301faed5274523
+SIZE (hrydgard-ppsspp-v1.11_GH0.tar.gz) = 30064888
 SHA256 (hrydgard-glslang-8.13.3559-76-gd0850f87_GH0.tar.gz) = d4484a9401b976c35e6522e02fb765f99e2675933c9d98aabb4b4f05ac964b1a
 SIZE (hrydgard-glslang-8.13.3559-76-gd0850f87_GH0.tar.gz) = 3135708
-SHA256 (hrydgard-ppsspp-lang-1c64b8f_GH0.tar.gz) = e8125e5228c0c6f323a3b80da1d4f636532844e723f10d5de1b892621f8e9d96
-SIZE (hrydgard-ppsspp-lang-1c64b8f_GH0.tar.gz) = 620586
+SHA256 (hrydgard-miniupnp-miniupnpd_2_1-354-g7e229dd_GH0.tar.gz) = 6d0d7b179b4720771e90a84a6e233251305e1bdada1573276bc225e41364f5d9
+SIZE (hrydgard-miniupnp-miniupnpd_2_1-354-g7e229dd_GH0.tar.gz) = 438700
+SHA256 (hrydgard-ppsspp-lang-567b225_GH0.tar.gz) = 7f52741014ffaa442b51036f5e37844d66e6652fb726a5781ba194d1758a1a51
+SIZE (hrydgard-ppsspp-lang-567b225_GH0.tar.gz) = 658751
 SHA256 (KhronosGroup-SPIRV-Cross-2019-05-20-60-ga1f7c8dc_GH0.tar.gz) = 2a07055247a14c0112d6e35634de93f832ac88e08828d9147e3a20d8d46600b2
 SIZE (KhronosGroup-SPIRV-Cross-2019-05-20-60-ga1f7c8dc_GH0.tar.gz) = 816026
 SHA256 (Kingcom-armips-v0.10.0-28-g7885552_GH0.tar.gz) = 040a8d01b1c0e65b77ede9dd6713b6f6290346a29d300138454335362a396d6c

Modified: head/emulators/ppsspp/files/pkg-message.in
==============================================================================
--- head/emulators/ppsspp/files/pkg-message.in	Sun Feb  7 22:22:21 2021	(r564654)
+++ head/emulators/ppsspp/files/pkg-message.in	Sun Feb  7 22:27:34 2021	(r564655)
@@ -2,11 +2,10 @@
 { type: install
   message: <<EOM
 Known issues:
-- %%DATADIR%%/assets/gamecontrollerdb.txt cannot be used
-  as is because SDL_JoystickGetGUID is a stub on FreeBSD. Create the
-  file using controllermap (or antimicro) then check with testgamecontroller
-  it's detected (pay attention to guid). If you have trouble making it
-  work try OLDJOY option for v1.3 behavior.
+- Default assignment of joystick buttons requires evdev-based driver e.g.,
+  hgame(4) on FreeBSD >= 13.0, sysutils/iichid or multimedia/webcamd.
+  If your joystick isn't detected consider defining SDL_GAMECONTROLLERCONFIG
+  in environ(7) after generating the entry via controllermap (or antimicro).
 EOM
 }
 ]

Modified: head/emulators/ppsspp/pkg-plist
==============================================================================
--- head/emulators/ppsspp/pkg-plist	Sun Feb  7 22:22:21 2021	(r564654)
+++ head/emulators/ppsspp/pkg-plist	Sun Feb  7 22:27:34 2021	(r564655)
@@ -1,4 +1,6 @@
 bin/ppsspp
+@comment share/applications/PPSSPPSDL.desktop
+@comment share/applications/PPSSPPQt.desktop
 share/icons/hicolor/128x128/apps/ppsspp.png
 share/icons/hicolor/16x16/apps/ppsspp.png
 share/icons/hicolor/24x24/apps/ppsspp.png
@@ -8,5 +10,5 @@ share/icons/hicolor/48x48/apps/ppsspp.png
 share/icons/hicolor/512x512/apps/ppsspp.png
 share/icons/hicolor/64x64/apps/ppsspp.png
 share/icons/hicolor/96x96/apps/ppsspp.png
-share/icons/hicolor/scalable/apps/ppsspp.svg
 share/man/man1/ppsspp.1.gz
+share/pixmaps/ppsspp.svg



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102072227.117MRYE2093525>