From owner-svn-ports-all@freebsd.org Sat Jun 27 23:24:37 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CF6BC35EFAC; Sat, 27 Jun 2020 23:24:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vVFx57X7z4bWN; Sat, 27 Jun 2020 23:24:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB75FD2A5; Sat, 27 Jun 2020 23:24:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05RNOb7l010516; Sat, 27 Jun 2020 23:24:37 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05RNOaeI010506; Sat, 27 Jun 2020 23:24:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006272324.05RNOaeI010506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 27 Jun 2020 23:24:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540656 - in head/emulators: . libretro-ppsspp ppsspp ppsspp-qt5 ppsspp/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/emulators: . libretro-ppsspp ppsspp ppsspp-qt5 ppsspp/files X-SVN-Commit-Revision: 540656 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 23:24:37 -0000 Author: jbeich Date: Sat Jun 27 23:24:36 2020 New Revision: 540656 URL: https://svnweb.freebsd.org/changeset/ports/540656 Log: emulators/ppsspp: update to 1.10 - LIBRETRO option is now libretro-ppsspp port Changes: https://ppsspp.org/#news Changes: https://github.com/hrydgard/ppsspp/compare/v1.9.4...v1.10 Reported by: GitHub (watch releases) Added: head/emulators/libretro-ppsspp/ head/emulators/libretro-ppsspp/Makefile (contents, props changed) Deleted: head/emulators/ppsspp/files/patch-ext_glslang_CMakeLists.txt head/emulators/ppsspp/files/patch-ext_glslang_glslang_Include_PoolAlloc.h head/emulators/ppsspp/files/patch-system-libpng16 Modified: head/emulators/Makefile (contents, props changed) head/emulators/ppsspp-qt5/Makefile (contents, props changed) head/emulators/ppsspp/Makefile (contents, props changed) head/emulators/ppsspp/distinfo (contents, props changed) Modified: head/emulators/Makefile ============================================================================== --- head/emulators/Makefile Sat Jun 27 23:24:28 2020 (r540655) +++ head/emulators/Makefile Sat Jun 27 23:24:36 2020 (r540656) @@ -61,6 +61,7 @@ SUBDIR += klh10 SUBDIR += lib765 SUBDIR += libdsk + SUBDIR += libretro-ppsspp SUBDIR += libspectrum SUBDIR += linux-c7 SUBDIR += linux-power9-functional-sim Added: head/emulators/libretro-ppsspp/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/libretro-ppsspp/Makefile Sat Jun 27 23:24:36 2020 (r540656) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMEPREFIX= libretro- + +MASTERDIR= ${.CURDIR}/../ppsspp + +OPTIONS_SLAVE= LIBRETRO +OPTIONS_EXCLUDE=${OPTIONS_DEFINE} + +.include "${MASTERDIR}/Makefile" Modified: head/emulators/ppsspp-qt5/Makefile ============================================================================== --- head/emulators/ppsspp-qt5/Makefile Sat Jun 27 23:24:28 2020 (r540655) +++ head/emulators/ppsspp-qt5/Makefile Sat Jun 27 23:24:36 2020 (r540656) @@ -1,12 +1,12 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp OPTIONS_SLAVE= QT5 -# XXX https://github.com/hrydgard/ppsspp/blob/v1.6.3/Qt/QtMain.cpp#L533-L534 -OPTIONS_EXCLUDE=VULKAN +# XXX No VULKAN per https://github.com/hrydgard/ppsspp/blob/v1.10/Qt/QtMain.cpp#L711-L712 +OPTIONS_EXCLUDE=${OPTIONS_DEFINE} .include "${MASTERDIR}/Makefile" Modified: head/emulators/ppsspp/Makefile ============================================================================== --- head/emulators/ppsspp/Makefile Sat Jun 27 23:24:28 2020 (r540655) +++ head/emulators/ppsspp/Makefile Sat Jun 27 23:24:36 2020 (r540656) @@ -2,14 +2,17 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.9.4 -PORTREVISION?= 2 +DISTVERSION?= 1.10 +PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage DISTFILES= ${PORTNAME}.1:manpage EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 2c7290e98b81.patch:-p1 # https://github.com/hrydgard/ppsspp/pull/13061 + MAINTAINER= jbeich@FreeBSD.org COMMENT= PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS @@ -27,18 +30,17 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard -GH_TUPLE?= hrydgard:glslang:7.11.3214-63-gf9d08a25:glslang/ext/glslang \ - hrydgard:${PORTNAME}-lang:bfc3a51:lang/assets/lang \ +GH_TUPLE?= hrydgard:glslang:8.13.3559-76-gd0850f87:glslang/ext/glslang \ + hrydgard:${PORTNAME}-lang:d184ba2: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 CONFLICTS_INSTALL= ${PORTNAME}-* -USES= cmake compiler:c++11-lib gl localbase:ldflags pkgconfig sdl +USES= cmake compiler:c++11-lib gl localbase:ldflags pkgconfig EXCLUDE= libzip zlib EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} USE_GL= gl glew glu -USE_SDL= sdl2 # joystick CMAKE_ON= USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP USE_SYSTEM_SNAPPY USE_WAYLAND_WSI CMAKE_OFF= USE_DISCORD SUB_FILES= pkg-message @@ -54,22 +56,25 @@ DESKTOP_ENTRIES="PPSSPP" \ OPTIONS_DEFINE= OLDJOY VULKAN OPTIONS_DEFAULT=VULKAN OPTIONS_SINGLE= GUI -OPTIONS_SINGLE_GUI= QT5 SDL -OPTIONS_SLAVE?= LIBRETRO SDL +OPTIONS_SINGLE_GUI= LIBRETRO QT5 SDL +OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_EXCLUDE} ${OPTIONS_SINGLE_GUI} LIBRETRO_DESC= libretro core for games/retroarch LIBRETRO_CMAKE_BOOL= LIBRETRO LIBRETRO_PLIST_FILES= lib/libretro/${PORTNAME}_libretro.so -LIBRETRO_IMPLIES= SDL +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 -QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets +QT5_USES= qt:5 sdl +QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,gui,multimedia,opengl,widgets +QT5_USE+= SDL=sdl2 # audio, joystick QT5_CMAKE_BOOL= USING_QT_UI QT5_VARS= EXENAME=PPSSPPQt SDL_BUILD_DEPENDS= png>=1.6:graphics/png SDL_LIB_DEPENDS= libpng.so:graphics/png +SDL_USES= sdl +SDL_USE= SDL=sdl2 SDL_VARS= EXENAME=PPSSPPSDL VULKAN_DESC= Vulkan renderer VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader @@ -82,7 +87,7 @@ post-patch: @${REINPLACE_CMD} -e 's/"unknown"/"${DISTVERSIONFULL}"/' \ ${WRKSRC}/git-version.cmake -do-install: +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}) Modified: head/emulators/ppsspp/distinfo ============================================================================== --- head/emulators/ppsspp/distinfo Sat Jun 27 23:24:28 2020 (r540655) +++ head/emulators/ppsspp/distinfo Sat Jun 27 23:24:36 2020 (r540656) @@ -1,13 +1,15 @@ -TIMESTAMP = 1571254707 +TIMESTAMP = 1593249064 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.9.4_GH0.tar.gz) = d225096582e682921f6535aa486c737c7b9e94102d5bf5a45cc2763425846493 -SIZE (hrydgard-ppsspp-v1.9.4_GH0.tar.gz) = 17005789 -SHA256 (hrydgard-glslang-7.11.3214-63-gf9d08a25_GH0.tar.gz) = baf58cbd5a8614d2b0a446893fa201e7ccdb31e43322f55e1ad1dac7861a0893 -SIZE (hrydgard-glslang-7.11.3214-63-gf9d08a25_GH0.tar.gz) = 2947747 -SHA256 (hrydgard-ppsspp-lang-bfc3a51_GH0.tar.gz) = 1c57ade5c3f44a07f7fc128258a6c3e40edf8426d90149e9d0a1a3d4380ff490 -SIZE (hrydgard-ppsspp-lang-bfc3a51_GH0.tar.gz) = 549625 +SHA256 (hrydgard-ppsspp-v1.10_GH0.tar.gz) = 2fdcc55ed70ee8fe6d211e630fbec4a6f3109de4ab28bd8a31b1d98ee2dabbe4 +SIZE (hrydgard-ppsspp-v1.10_GH0.tar.gz) = 16951195 +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-d184ba2_GH0.tar.gz) = 4930e2dd751928890ecf0a684791bcd7d4e836aa4e254a3db6abab9513edd8b1 +SIZE (hrydgard-ppsspp-lang-d184ba2_GH0.tar.gz) = 620573 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 SIZE (Kingcom-armips-v0.10.0-28-g7885552_GH0.tar.gz) = 197207 +SHA256 (2c7290e98b81.patch) = 684c4445a548188632d16ac9972a6c43187c4e164d2883b4189ef87d7c7c07bc +SIZE (2c7290e98b81.patch) = 866