From nobody Wed May 3 16:07:12 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QBMKD3QFrz490nX; Wed, 3 May 2023 16:07:12 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QBMKD2zSnz4Dm6; Wed, 3 May 2023 16:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683130032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQMEP5JKsgLCFdwccpM6w5/sthWiUe0MigTRrbdNosk=; b=kJ09yyBJZbgZP6V6PZKQw68vQjN+HHyEvmd1DcBOS9zr9EBdmhDaeYEyIBR1pAk/VXwxNF nKN9MbyZfD/Tu3JObztATjwoTulNud4djJvEdc8KfjKUd04PsbRVXoWeCXnJ7lfYEO+yA0 KUmPmOXVXGpeQ4lzwQ9Vm0Xie1MPt1irBJMTpSpbOCKiILnUcmQ4BDhYFjsBq2UHtxZIsd 8lTwcaXUfpB0H1jRAfv+WiXxymaC6nJbf9mFsVYtzYbCavRwltG65I5WYt6Wnhrt/PzzTu f0Wz7vho4VSgXUoN8J5EYJcPujR9A2n3ztMBdCkLp9A7sw8/tAX5nDZlQDRUAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683130032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQMEP5JKsgLCFdwccpM6w5/sthWiUe0MigTRrbdNosk=; b=cKknVpkF0nIk70qJhdhJHs2rkJroHGeWLemQtykohJ4mEbeP0zz36zXOvGUmMCbJ07Vw3l dG85TQBzzGcYOHWnnRbasbVY8rurbltQIpnnGQAm9py+OcRc7eOLaD3qq6m7CibkjUC1t8 ivVnu6JiD/uhtvMvzIz1ANwm/dVgWvUNKVcgI75JBuyA1bZ1uKTlYF389yzQGrI8YKXnS+ 7DsZl8/6CYO5kSMOqql26YcOh4kmuGvtGvgi+g5bg5R+J7UDE9bf7LyE8EKKVmPC/jJypx 1JI+jKGnK3YWHSuvyExr9aosiVLAci8ZQazZBImfufE6JZ7u6vL/RENR+ETgkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683130032; a=rsa-sha256; cv=none; b=JpiBRY3+/D/ZO32jqtoMd4K0RXePBa+jPJY6s89KjGES3pyrsd9juQ6iF2a1GRhFQm4EQQ 5O4Z3sX6o01iS8cbLB06gkfTB7DJ8n9Nj01wdwNlwM2IWUwNLU2/z3eXXam7D4LTzP8QiF aQUp5JCrcUAFCXMxJ8i/GmxNalV4ZVcLj92XyxpwSQA/U8UwNkVo6omhPAZi8VOJPMauqn DSqSDLCa4YhyvE4I8PN7ml9wWvZ2AdmL7gsM5tPwOVywm5h9vFzUhPTya4qrcT2j8HPF/6 zXtli/ZQAYeqYeGSwotkdY9bDvBQO8SQchY+/caHQA0Hk+9U/XmAe0oBEVrXeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QBMKD22KKzbvg; Wed, 3 May 2023 16:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 343G7CY0025031; Wed, 3 May 2023 16:07:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 343G7CdO025030; Wed, 3 May 2023 16:07:12 GMT (envelope-from git) Date: Wed, 3 May 2023 16:07:12 GMT Message-Id: <202305031607.343G7CdO025030@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: bea431a7e286 - 2023Q2 - emulators/ppsspp: unbreak with kern.elf*.allow_wx=0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: bea431a7e286e142667c7296a9559887de803cce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bea431a7e286e142667c7296a9559887de803cce commit bea431a7e286e142667c7296a9559887de803cce Author: Jan Beich AuthorDate: 2023-05-03 15:09:09 +0000 Commit: Jan Beich CommitDate: 2023-05-03 16:06:49 +0000 emulators/ppsspp: unbreak with kern.elf*.allow_wx=0 Common/MemoryUtil.cpp:194 E[MEMMAP]: Failed to allocate executable memory (1048576) errno=13 (cherry picked from commit f262cd70e926f5a1b558153f33e1604f066d83c1) --- emulators/ppsspp-qt5/Makefile | 2 +- emulators/ppsspp/Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/emulators/ppsspp-qt5/Makefile b/emulators/ppsspp-qt5/Makefile index 2b5cf472f7e3..41539a191451 100644 --- a/emulators/ppsspp-qt5/Makefile +++ b/emulators/ppsspp-qt5/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 57330de926cb..38e6c3a628c7 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -1,7 +1,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v DISTVERSION?= 1.14.4 -PORTREVISION?= 0 +PORTREVISION?= 1 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 @@ -63,17 +63,17 @@ 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= -QT5_USES= qt:5 sdl +QT5_USES= elfctl 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 +QT5_VARS= EXENAME=PPSSPPQt ELF_FEATURES=+wxneeded:PPSSPPQt SDL_CATEGORIES= wayland SDL_BUILD_DEPENDS= png>=1.6:graphics/png SDL_LIB_DEPENDS= libpng.so:graphics/png -SDL_USES= sdl +SDL_USES= elfctl sdl SDL_USE= SDL=sdl2 -SDL_VARS= EXENAME=PPSSPPSDL +SDL_VARS= EXENAME=PPSSPPSDL ELF_FEATURES=+wxneeded:PPSSPPSDL VULKAN_DESC= Vulkan renderer VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader