From nobody Sat Jan 4 02:27:19 2025 X-Original-To: dev-commits-ports-all@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 4YQ48m2jvNz5j3bq; Sat, 04 Jan 2025 02:27:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQ48m23K0z4jS6; Sat, 4 Jan 2025 02:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735957640; 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=9Vli6/H5IaesDpb0utU0Tcc7SToQEgvvxDkWIqw7hD8=; b=RmWyHbh6M2+rDiHpX6BE/csLL4k8wTBosIN6Sr02UFL7Au8YWRLCc+hTBSs0E2+hKsGY0+ 5lMIACAZ/U6g9rGLyC8yXmZBAqJtHhpscBhJL7CgNrqTeWYcm8e5jh0oXD0gF253WhLW5Y Fk9e/IzCO0JDsQRu0R3O3cSu/18BIr3txMdGGz25IqDzihqjNdfDG/H5ih23acy++JQRsm Z1GfdQB/IBFXUT+OX6dfYDUQIyfCYyhWeH9GD1rLvzof7I9jlMGJ0f/NulqA79ACNzWTvI 3/xDtE7MviVKE6EObHQNz+JtkI+iHDVd6efeCuU08OSLVhH/PqEPrxjLpp0ANg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735957640; 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=9Vli6/H5IaesDpb0utU0Tcc7SToQEgvvxDkWIqw7hD8=; b=MLbWk7SC9VY6ttKIAmx2E5Nzmqw5VMWjYolxa1Hbh7SEBWUz6w5WyTwN07Xy3syGwTJCts l5x9xUVVhHVp9FnaS+gimMwaBuDhr0imPxbqZ3JYVEBXRs8MkzqsY8aoLiRCAA8NfNGZD/ uADWoO21/jMMIAeCYlqMDgu9+v2VahW8LPj1brS1ZiHo7UWsCKFPqcIyXjpvdxUJGn2FhY SPq2e1X2skuetGJYhpSl81HHDgHs8joSMbjN17Nu8jWBWAHEBQioKHGtikXDuclf9OMBsF wLcliBjNxUtty8wD9Y1sEVRUUyLvNu2Lw0AP+hk6nGtk7usqeVzBDHy+1Wx98A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735957640; a=rsa-sha256; cv=none; b=sBsXlM8iq7ce+eReWnHWZOXi53D5Y/aVl72KXQNqP4ojWSfCTe1gDbGqG90JHbtkza/uwl /r+FxNESSEk4zMaFcLxiOCFL5vUs100O51Nwxevbssis0mOMmXBgC4h/atoJW7xrZ/eiym cH+2gwO9ZeVJZOgGr4g9EuDE52cByLaOMTgh8JeEfAbPGIM2oV/Z3euug2EHMNoeL8pdBs g9zMOB/Ca+1dfLymiTGZ7jvAKB0QAZT67B0SlDFIrDftQocjd1qx94rpxrm5rm/99NuVOd howE918SilBOv885bIi4wuZBjuzoQh84vbvF+9ZQc3x9g2N8gNwixWEbhU/NXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ48m122fzZ0X; Sat, 04 Jan 2025 02:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5042RJ1q058649; Sat, 4 Jan 2025 02:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5042RJOv058646; Sat, 4 Jan 2025 02:27:19 GMT (envelope-from git) Date: Sat, 4 Jan 2025 02:27:19 GMT Message-Id: <202501040227.5042RJOv058646@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: fb4c16ee0f14 - main - emulators/{ppsspp,rpcs3,yuzu}: temporarily expand USES=elfctl List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: fb4c16ee0f141edc110224bf43efe8c295f3b8b9 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb4c16ee0f141edc110224bf43efe8c295f3b8b9 commit fb4c16ee0f141edc110224bf43efe8c295f3b8b9 Author: Jan Beich AuthorDate: 2025-01-04 01:28:47 +0000 Commit: Jan Beich CommitDate: 2025-01-04 02:26:34 +0000 emulators/{ppsspp,rpcs3,yuzu}: temporarily expand USES=elfctl After a CMake upgrade some ports spuriously rebuild binaries. Unfortunately, USES=elfctl relies on BUILD_WRKSRC being immutable after build phase ends. PR: 283836 --- emulators/ppsspp/Makefile | 12 ++++++++---- emulators/rpcs3/Makefile | 9 +++++++-- emulators/yuzu/Makefile | 10 +++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 34daafeb57ff..a7b6168210be 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -1,6 +1,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v DISTVERSION?= 1.18.1 +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 @@ -69,16 +70,16 @@ LIBRETRO_CMAKE_BOOL= LIBRETRO LIBRETRO_PLIST_FILES= lib/libretro/${PORTNAME}_libretro.so LIBRETRO_VARS= CONFLICTS_INSTALL= DESKTOP_ENTRIES= PLIST= PORTDATA= PKGMESSAGE= SUB_FILES= QT5_LIB_DEPENDS= libpng.so:graphics/png -QT5_USES= desktop-file-utils elfctl qt:5 shared-mime-info sdl +QT5_USES= desktop-file-utils qt:5 shared-mime-info sdl QT5_USE= QT=qmake:build,buildtools:build,linguisttools:build,core,gui,multimedia,opengl,widgets QT5_USE+= SDL=sdl2 # audio, joystick QT5_CMAKE_BOOL= USING_QT_UI -QT5_VARS= EXENAME=PPSSPPQt ELF_FEATURES=+wxneeded:PPSSPPQt +QT5_VARS= EXENAME=PPSSPPQt SDL_CATEGORIES= wayland SDL_LIB_DEPENDS= libpng.so:graphics/png -SDL_USES= elfctl shared-mime-info sdl +SDL_USES= shared-mime-info sdl SDL_USE= SDL=sdl2 -SDL_VARS= EXENAME=PPSSPPSDL ELF_FEATURES=+wxneeded:PPSSPPSDL +SDL_VARS= EXENAME=PPSSPPSDL VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader post-patch: @@ -97,6 +98,9 @@ do-install-LIBRETRO-on: .endif do-install-QT5-on do-install-SDL-on: +.if exists(/usr/bin/elfctl) + ${ELFCTL} -e +wxneeded ${STAGEDIR}${PREFIX}/bin/* +.endif ${MV} ${STAGEDIR}${PREFIX}/bin/${EXENAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index d243801673af..2945252e753c 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,6 +2,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.34-17299 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g8ea27b0aca +PORTREVISION= 1 CATEGORIES= emulators wayland MAINTAINER= jbeich@FreeBSD.org @@ -38,7 +39,7 @@ GH_TUPLE= RPCS3:hidapi:hidapi-0.14.0-2-g8b43a97:hidapi/3rdparty/hidapi/hidapi \ wolfSSL:wolfssl:v5.7.6-stable:wolfssl/3rdparty/wolfssl/wolfssl \ xioTechnologies:Fusion:v1.2.7:fusion/3rdparty/fusion/fusion -USES= cmake elfctl gl iconv:wchar_t llvm:min=16,lib localbase:ldflags \ +USES= cmake gl iconv:wchar_t llvm:min=16,lib localbase:ldflags \ openal:soft pkgconfig python:build qt:6 xorg USE_GL= gl glew USE_QT= base multimedia svg @@ -47,7 +48,6 @@ CMAKE_ON= CMAKE_SKIP_RPATH ${CURL FFMPEG FLATBUFFERS LIBPNG PUGIXML XXHASH:L:S/^ CMAKE_ON+= BUNDLE_SPEEX # only used by cubeb tests CMAKE_OFF= USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS LDFLAGS+= -Wl,--as-needed # GLU -ELF_FEATURES= +wxneeded:bin/${PORTNAME} OPTIONS_DEFINE= ALSA EVDEV FAUDIO OPENCV PULSEAUDIO JACK SDL SNDIO VULKAN OPTIONS_DEFAULT=EVDEV FAUDIO OPENCV PULSEAUDIO JACK SDL SNDIO VULKAN @@ -99,4 +99,9 @@ post-patch: -e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake +post-install: +.if exists(/usr/bin/elfctl) + ${ELFCTL} -e +wxneeded ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +.endif + .include diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 48da3f999321..44961a14c1ea 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,6 +1,6 @@ PORTNAME= yuzu PORTVERSION= s20240301 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators wayland .if make(makesum) MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb @@ -66,7 +66,7 @@ GH_TUPLE= yuzu-mirror:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ lat9nq:tzdb_to_nx:221202-15-g9792969:tzdb_to_nx/externals/nx_tzdb/tzdb_to_nx \ yhirose:cpp-httplib:v0.14.1:cpp_httplib/externals/cpp-httplib -USES= cmake:testing elfctl localbase:ldflags pkgconfig sdl ssl +USES= cmake:testing localbase:ldflags pkgconfig sdl ssl USE_SDL= sdl2 WRKSRC= ${WRKDIR}/${PORTNAME} CMAKE_ON= Boost_USE_STATIC_LIBS @@ -79,7 +79,6 @@ CMAKE_OFF+= ${ARCH:Maarch64:C/.+/YUZU_USE_PRECOMPILED_HEADERS DYNARMIC_USE_PRECO CMAKE_OFF+= ${CMAKE_TESTING_ON} CMAKE_TESTING_ON= YUZU_TESTS LDFLAGS+= -Wl,--as-needed # Qt5Network -ELF_FEATURES= ${PLIST_FILES:Mbin/*:S/^/+wxneeded:/} PLIST_FILES= bin/${PORTNAME}-cmd \ bin/${PORTNAME}-room @@ -160,4 +159,9 @@ post-patch-VAAPI-off: @${REINPLACE_CMD} -i .nova '/pkg_check.*libva/d' \ ${WRKSRC}/CMakeLists.txt +post-install: +.if exists(/usr/bin/elfctl) + ${ELFCTL} -e +wxneeded ${STAGEDIR}${PREFIX}/bin/* +.endif + .include