From nobody Tue Aug 27 17:38:42 2024 X-Original-To: dev-commits-ports-main@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 4WtZXL3cLhz52X7q; Tue, 27 Aug 2024 17:38:42 +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 4WtZXL3418z4VYv; Tue, 27 Aug 2024 17:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724780322; 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=fICgReClpYGofUM5GmLKaxZCwlBjUwJe2CLQp8ycxWg=; b=hlrG6dopYMH6rxBIJZGo9ucdA6Melpq0rjr6CUBD3Bbz73p9gLGhFThxUYMo9fHEyW3YaP VG2wRa13ca9gAsZJfjPqamzdP5EeWwTIRWm5jZwUFj8QnBuPDJFVKU//t7/9k2kwEX8ToT p9b3ZobFhLYo5f7VywFhKrEgxS8hSw8UqS3U1Jt5+zfo7COvI0X5EiI2Q+PoRtfsIhaZTJ P6r7jFQ03jTn00ouRc3oxGCoD9K0KOKjFAI3O2cIeqfKbV+saPd2QrjrMwqWhL+erCvemm wmegm/Tse0NFoM6HrBgrNszw/ozAS+qCjD7EJ6NuxKPIGO/rlBd52PN2Y0HGZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724780322; a=rsa-sha256; cv=none; b=l4TBovqYFSC5sO9F/EV/c65BHaUOa9WJlAcPvflVXWDSxHGu2e8hvydDHoaBkkrv044DL2 YrTA5JjV65GNKykaVHhA9JdCdu+ZJBXK6DcbB7r3y22cXj4+M96M7O2xfYpzF4fOQMySRz hcU23K2fekTPJyNlunc1SxNCRFAsI4PpKHLA49SciP5FcWI1bdqgwsBqY2TsKqIHAoFOSO yp3Yt+dWMl06x4FjWNspmq02TzfMEm+hpqVRrPQYXfVtN4DAl6+l8bl5gZnhi+ZGvCdnSD 19m+p/1fUFLu0ejclMouZZOPjBvyHJ/ovjmo+BauG0LpY4AsNfbYOYE8O7lxHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724780322; 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=fICgReClpYGofUM5GmLKaxZCwlBjUwJe2CLQp8ycxWg=; b=ubczT524D81Mzbm6N/Cng9G3lfaAKfR7Y4tiqOCPl11VQVpgFE2b1BE9HCh7K3LTtngd/n HIcx+NQ/05vn7s3aNkihcR1tYvSy1Aec1jB/6VgE8oBwfXayRN1r3d2xsSSW59T9bXWNes IsE/UM7/UPGfAFC3u2jg+959MBSiNRMLezpQHvWKVOvWVhahhValM9UCZ7SyzCmM65VyRF mKPHO2J2TIYGVw/ZKpJpwiZ+TguVA2oHLepTY0am3V0xHDxXuhNWCkW9wOuDy2vBKkIomG 4sm4JXDrke8+Xcz8g8W7QrtR9E9gtIAFHpKeHuDKWbgVA/u0mUFkGK/byX1ZxA== 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 4WtZXL2TdVz10Pv; Tue, 27 Aug 2024 17:38:42 +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 47RHcgU5041743; Tue, 27 Aug 2024 17:38:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47RHcgof041740; Tue, 27 Aug 2024 17:38:42 GMT (envelope-from git) Date: Tue, 27 Aug 2024 17:38:42 GMT Message-Id: <202408271738.47RHcgof041740@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: b772f1f7b081 - main - emulators/ares: Update 139.20240823 =?utf-8?Q?=E2=86=92?= 139.20240825 and unbundle librashader dependency List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b772f1f7b08121988afc02f0dc70a4ce07e72e7d Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b772f1f7b08121988afc02f0dc70a4ce07e72e7d commit b772f1f7b08121988afc02f0dc70a4ce07e72e7d Author: Stefan Schlosser AuthorDate: 2024-08-27 17:35:50 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-27 17:38:22 +0000 emulators/ares: Update 139.20240823 → 139.20240825 and unbundle librashader dependency Commit changes: https://github.com/ares-emulator/ares/compare/3cd82c8..efb7f61 PR: 281080 --- emulators/ares/Makefile | 21 ++++++++++++++------- emulators/ares/distinfo | 6 +++--- emulators/ares/files/patch-hiro_GNUmakefile | 11 ----------- .../ares/{files/pkg-message.in => pkg-message} | 12 ------------ 4 files changed, 17 insertions(+), 33 deletions(-) diff --git a/emulators/ares/Makefile b/emulators/ares/Makefile index 869f4ec3bd15..0f3c9edd7c7a 100644 --- a/emulators/ares/Makefile +++ b/emulators/ares/Makefile @@ -1,5 +1,5 @@ PORTNAME= ares -DISTVERSION= 139.20240823 +DISTVERSION= 139.20240825 CATEGORIES= emulators MAINTAINER= bsdcode@disroot.org @@ -13,7 +13,7 @@ USES= compiler:c++17-lang gmake gnome localbase:ldflags pkgconfig \ xorg USE_GITHUB= yes GH_ACCOUNT= ares-emulator -GH_TAGNAME= 3cd82c8 +GH_TAGNAME= efb7f61 USE_GNOME= gtksourceview3 USE_XORG= x11 xext xrandr @@ -29,9 +29,6 @@ MAKE_ARGS= compiler=${CC} \ symbols=false \ threaded=true -SUB_FILES= pkg-message -SUB_LIST= LIBRASHADER=${_LIBRASHADER} - OPTIONS_DEFINE= DEBUG DOCS HOTKEYS NVIDIA OPENMP SHADER OPTIONS_DEFAULT= A26 ALSA AO CV FC GB GBA GLX MD MS MSX MYVISION N64 NG \ NGP OPENAL OPENMP OSS PCE PERFORMANCE PS1 SDLAUDIO \ @@ -157,9 +154,12 @@ SFC_MAKE_ARGS= cores+=sfc SG_MAKE_ARGS= cores+=sg -SHADER_RUN_DEPENDS= ${LOCALBASE}/${_SHADERS}/bilinear.slangp:games/libretro-shaders-slang +SHADER_BUILD_DEPENDS= ${LOCALBASE}/include/librashader/librashader.h:devel/librashader +SHADER_RUN_DEPENDS= ${LOCALBASE}/${_SHADERS}/bilinear.slangp:games/libretro-shaders-slang \ + ${LOCALBASE}/lib/librashader.so:devel/librashader SHADER_MAKE_ARGS= librashader=true SHADER_MAKE_ARGS_OFF= librashader=false +SHADER_CFLAGS= -DLIBRA_RUNTIME_OPENGL SHADER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-desktop-ui_desktop-ui.cpp SPEC_MAKE_ARGS= cores+=spec @@ -176,7 +176,6 @@ XLIB_MAKE_ARGS= ruby+=input.xlib XVIDEO_USE= XORG=xv XVIDEO_MAKE_ARGS= ruby+=video.xvideo -_LIBRASHADER= 0.3.3 _SHADERS= share/libretro/shaders/shaders_slang .include @@ -185,7 +184,15 @@ _SHADERS= share/libretro/shaders/shaders_slang LLD_UNSAFE= yes .endif +post-patch: + ${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/hiro/GNUmakefile + post-patch-SHADER-on: + ${REINPLACE_CMD} 's|-I../thirdparty/librashader/include||g' \ + ${WRKSRC}/desktop-ui/GNUmakefile + ${REINPLACE_CMD} 's|"librashader_ld.h"||g' \ + ${WRKSRC}/ruby/video/opengl/opengl.hpp ${REINPLACE_CMD} 's|@@SHADERS@@|${LOCALBASE}/${_SHADERS}/|g' \ ${WRKSRC}/desktop-ui/desktop-ui.cpp diff --git a/emulators/ares/distinfo b/emulators/ares/distinfo index 74c15f75fd96..3ad7898531d2 100644 --- a/emulators/ares/distinfo +++ b/emulators/ares/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724488423 -SHA256 (ares-emulator-ares-139.20240823-3cd82c8_GH0.tar.gz) = ac559920cb8d54e94b37fcdae3d65343c62bd9d6fb658e97dfbb6ec5304498ff -SIZE (ares-emulator-ares-139.20240823-3cd82c8_GH0.tar.gz) = 50955635 +TIMESTAMP = 1724663853 +SHA256 (ares-emulator-ares-139.20240825-efb7f61_GH0.tar.gz) = 8d4a410b9141399ec0d592edc34ca8dd35d582a87cae3f4ec5fdacc8a1c3c64e +SIZE (ares-emulator-ares-139.20240825-efb7f61_GH0.tar.gz) = 50956365 diff --git a/emulators/ares/files/patch-hiro_GNUmakefile b/emulators/ares/files/patch-hiro_GNUmakefile deleted file mode 100644 index c3f6b4fe5a2d..000000000000 --- a/emulators/ares/files/patch-hiro_GNUmakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- hiro/GNUmakefile.orig 2024-08-14 11:19:20 UTC -+++ hiro/GNUmakefile -@@ -62,7 +62,7 @@ ifneq ($(filter $(platform),linux bsd),) - else ifeq ($(hiro),gtk3-se) - flags += -DHiro_SourceEdit - hiro.flags = $(flags.cpp) -DHIRO_GTK=3 $(shell $(pkg_config) --cflags gtk+-3.0 gtksourceview-3.0) -Wno-deprecated-declarations -- hiro.options = -L/usr/local/lib -lX11 $(shell $(pkg_config) --libs gtk+-3.0 gtksourceview-3.0) -+ hiro.options = -lX11 $(shell $(pkg_config) --libs gtk+-3.0 gtksourceview-3.0) - else ifeq ($(hiro),qt4) - moc = /usr/local/lib/qt4/bin/moc - hiro.flags = $(flags.cpp) -DHIRO_QT=4 $(shell $(pkg_config) --cflags QtCore QtGui) diff --git a/emulators/ares/files/pkg-message.in b/emulators/ares/pkg-message similarity index 67% rename from emulators/ares/files/pkg-message.in rename to emulators/ares/pkg-message index 70eef70b8788..839b14b86e30 100644 --- a/emulators/ares/files/pkg-message.in +++ b/emulators/ares/pkg-message @@ -23,18 +23,6 @@ locks all hotkey execution in the unpaused state of the emulator. This can be a convenience for gamepad-only users who want to assign hotkey actions to gamepad buttons but who don't have enough free unassigned buttons left on the gamepad. -ares uses librashader for its shader support. This library is not available in -the FreeBSD ports tree yet, but it is being worked on, see -https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280470. In the meantime users -have to compile the library themselves if they want to actually use shaders: - - $ su root -c 'pkg install rust-nightly' - $ fetch https://github.com/SnowflakePowered/librashader/archive/refs/tags/librashader-v%%LIBRASHADER%%.tar.gz - $ tar -xf librashader-v%%LIBRASHADER%%.tar.gz - $ cd librashader-librashader-v%%LIBRASHADER%% - $ cargo run -p librashader-build-script -- --profile release - $ su root -c 'cp target/release/librashader.so %%LOCALBASE%%/lib' - The port uses the shaders from games/libretro-shaders-slang by default. Users can curate and utilize their own provided collection of shaders by putting them into the user data directory