Attachment #253050 for bug #281023

View | Details | Raw Unified | Return to bug 281023
Collapse All | Expand All




PORTNAME=	ares
DISTVERSION=	139.20240823
PORTREVISION=	1
CATEGORIES=	emulators

MAINTAINER=	bsdcode@disroot.org

		xorg
USE_GITHUB=	yes
GH_ACCOUNT=	ares-emulator
GH_TAGNAME=	3cd82c8
USE_GNOME=	gtksourceview3
USE_XORG=	x11 xext xrandr


		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 \
			SDLINPUT SFC SG SHADER SPEC UDEV UHID WS XLIB XVIDEO

FC_DESC=		NES / Famicom
GBA_DESC=		Game Boy Advance
GB_DESC=		Game Boy
HOTKEYS_DESC=		Inofficial hotkeys locking patch
MD_DESC=		Mega Drive / Genesis
MSX_DESC=		MSX
MS_DESC=		Master System / Mark III

GLX_USE=		GL=gl
GLX_MAKE_ARGS=		ruby+=video.glx

HOTKEYS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-hotkeys

MD_MAKE_ARGS=		cores+=md

MSX_MAKE_ARGS=		cores+=msx

XVIDEO_USE=		XORG=xv
XVIDEO_MAKE_ARGS=	ruby+=video.xvideo

_LIBRASHADER=		0.3.3
_SHADERS=		share/libretro/shaders/shaders_slang

.include <bsd.port.options.mk>

Lines 1-3 Link Here

(-)b/emulators/ares/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1723230097	1	TIMESTAMP = 1724488423
2	SHA256 (ares-emulator-ares-139.20240809-a76847d_GH0.tar.gz) = e1a47c0b8d55214ae4980c7d8248f8024e70b04cfcf7b21cd6a0f0dcd1e3e9b2	2	SHA256 (ares-emulator-ares-139.20240823-3cd82c8_GH0.tar.gz) = ac559920cb8d54e94b37fcdae3d65343c62bd9d6fb658e97dfbb6ec5304498ff
3	SIZE (ares-emulator-ares-139.20240809-a76847d_GH0.tar.gz) = 50955748	3	SIZE (ares-emulator-ares-139.20240823-3cd82c8_GH0.tar.gz) = 50955635




--- desktop-ui/input/hotkeys.cpp.orig	2024-08-16 07:21:59 UTC
+++ desktop-ui/input/hotkeys.cpp
@@ -106,7 +106,9 @@ auto InputManager::createHotkeys() -> void {
     program.showMessage({"Selected state slot ", program.state.slot});
   }));
 
-  hotkeys.append(InputHotkey("Pause Emulation").onPress([&] {
+  InputHotkey pause("Pause Emulation");
+  pause.isPause = true;
+  hotkeys.append(pause.onPress([&] {
     if(!emulator) return;
     program.pause(!program.paused);
   }));
@@ -149,6 +151,9 @@ auto InputManager::pollHotkeys() -> void {
   }
 
   for(auto& hotkey : hotkeys) {
+    if(emulator && !hotkey.isPause && !program.paused) {
+      continue;
+    }
     auto state = hotkey.value();
     if(hotkey.state == 0 && state == 1 && hotkey.press) hotkey.press();
     if(hotkey.state == 1 && state == 0 && hotkey.release) hotkey.release();

--- desktop-ui/input/input.hpp.orig	2024-08-16 07:21:40 UTC
+++ desktop-ui/input/input.hpp
@@ -73,6 +73,8 @@ struct InputHotkey : InputDigital {
 
   const string name;
 
+  bool isPause = false;
+
 private:
   function<void ()> press;
   function<void ()> release;




--- nall/GNUmakefile.orig	2024-08-16 16:33:46 UTC
+++ nall/GNUmakefile
@@ -102,7 +102,7 @@ else
 else
   machine_opt := $(if $(findstring clang,$(compiler)),-print-target-triple,-dumpmachine)
   machine_str := $(shell $(compiler) $(machine_opt))
-  ifneq ($(filter i686-%,$(machine_str)),)
+  ifneq ($(filter i386-% i486-% i586-% i686-%,$(machine_str)),)
     machine := x86
   else ifneq ($(filter amd64-% x86_64-%,$(machine_str)),)
     machine := amd64
@@ -169,8 +169,6 @@ ifeq ($(build),debug)
   lto = false
   ifeq ($(cl),true)




Users are encouraged to compile the port on their systems with

    CFLAGS   ?= -O3
    CPUTYPE  ?= native | ... | x86-64-v3 | ... | skylake | ...
    WITH_LTO =  yes

This can improve the performance of demanding cores like the N64.

crashes or freezes while using the N64 core, see
https://github.com/ares-emulator/ares/issues/1547 and
https://github.com/Themaister/Granite/issues/133. As a workaround either try to
compile the port with the NVIDIA option set (recommended), or disable the NVIDIA
shader disk cache at startup with

    $ __GL_SHADER_DISK_CACHE=0 ares

The port provides the HOTKEYS option. This applies an inofficial patch which
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:

    $ doas 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
    $ doas cp target/release/librashader.so %%LOCALBASE%%/lib

- 

Return to bug 281023

Lines 1-6 Link Here

(-)b/emulators/ares/Makefile (-4 / +8 lines)
1	PORTNAME= ares	1	PORTNAME= ares
2	DISTVERSION= 139.20240809	2	DISTVERSION= 139.20240823
3	PORTREVISION= 1
4	CATEGORIES= emulators	3	CATEGORIES= emulators
5		4
6	MAINTAINER= bsdcode@disroot.org	5	MAINTAINER= bsdcode@disroot.org
Lines 14-20 USES= compiler:c++17-lang gmake gnome localbase:ldflags pkgconfig \ Link Here
14	xorg	13	xorg
15	USE_GITHUB= yes	14	USE_GITHUB= yes
16	GH_ACCOUNT= ares-emulator	15	GH_ACCOUNT= ares-emulator
17	GH_TAGNAME= a76847d	16	GH_TAGNAME= 3cd82c8
18	USE_GNOME= gtksourceview3	17	USE_GNOME= gtksourceview3
19	USE_XORG= x11 xext xrandr	18	USE_XORG= x11 xext xrandr
20		19
Lines 31-38 MAKE_ARGS= compiler=${CC} \ Link Here
31	threaded=true	30	threaded=true
32		31
33	SUB_FILES= pkg-message	32	SUB_FILES= pkg-message
		33	SUB_LIST= LIBRASHADER=${_LIBRASHADER}
34		34
35	OPTIONS_DEFINE= DEBUG DOCS NVIDIA OPENMP SHADER	35	OPTIONS_DEFINE= DEBUG DOCS HOTKEYS NVIDIA OPENMP SHADER
36	OPTIONS_DEFAULT= A26 ALSA AO CV FC GB GBA GLX MD MS MSX MYVISION N64 NG \	36	OPTIONS_DEFAULT= A26 ALSA AO CV FC GB GBA GLX MD MS MSX MYVISION N64 NG \
37	NGP OPENAL OPENMP OSS PCE PERFORMANCE PS1 SDLAUDIO \	37	NGP OPENAL OPENMP OSS PCE PERFORMANCE PS1 SDLAUDIO \
38	SDLINPUT SFC SG SHADER SPEC UDEV UHID WS XLIB XVIDEO	38	SDLINPUT SFC SG SHADER SPEC UDEV UHID WS XLIB XVIDEO
Lines 51-56 CV_DESC= ColecoVision Link Here
51	FC_DESC= NES / Famicom	51	FC_DESC= NES / Famicom
52	GBA_DESC= Game Boy Advance	52	GBA_DESC= Game Boy Advance
53	GB_DESC= Game Boy	53	GB_DESC= Game Boy
		54	HOTKEYS_DESC= Inofficial hotkeys locking patch
54	MD_DESC= Mega Drive / Genesis	55	MD_DESC= Mega Drive / Genesis
55	MSX_DESC= MSX	56	MSX_DESC= MSX
56	MS_DESC= Master System / Mark III	57	MS_DESC= Master System / Mark III
Lines 100-105 GLX_USES= gl Link Here
100	GLX_USE= GL=gl	101	GLX_USE= GL=gl
101	GLX_MAKE_ARGS= ruby+=video.glx	102	GLX_MAKE_ARGS= ruby+=video.glx
102		103
		104	HOTKEYS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-hotkeys
		105
103	MD_MAKE_ARGS= cores+=md	106	MD_MAKE_ARGS= cores+=md
104		107
105	MSX_MAKE_ARGS= cores+=msx	108	MSX_MAKE_ARGS= cores+=msx
Lines 173-178 XLIB_MAKE_ARGS= ruby+=input.xlib Link Here
173	XVIDEO_USE= XORG=xv	176	XVIDEO_USE= XORG=xv
174	XVIDEO_MAKE_ARGS= ruby+=video.xvideo	177	XVIDEO_MAKE_ARGS= ruby+=video.xvideo
175		178
		179	_LIBRASHADER= 0.3.3
176	_SHADERS= share/libretro/shaders/shaders_slang	180	_SHADERS= share/libretro/shaders/shaders_slang
177		181
178	.include <bsd.port.options.mk>	182	.include <bsd.port.options.mk>

Added Link Here

(-)b/emulators/ares/files/extra-patch-hotkeys (+35 lines)
1	--- desktop-ui/input/hotkeys.cpp.orig 2024-08-16 07:21:59 UTC
2	+++ desktop-ui/input/hotkeys.cpp
3	@@ -106,7 +106,9 @@ auto InputManager::createHotkeys() -> void {
4	program.showMessage({"Selected state slot ", program.state.slot});
5	}));
6
7	- hotkeys.append(InputHotkey("Pause Emulation").onPress([&] {
8	+ InputHotkey pause("Pause Emulation");
9	+ pause.isPause = true;
10	+ hotkeys.append(pause.onPress([&] {
11	if(!emulator) return;
12	program.pause(!program.paused);
13	}));
14	@@ -149,6 +151,9 @@ auto InputManager::pollHotkeys() -> void {
15	}
16
17	for(auto& hotkey : hotkeys) {
18	+ if(emulator && !hotkey.isPause && !program.paused) {
19	+ continue;
20	+ }
21	auto state = hotkey.value();
22	if(hotkey.state == 0 && state == 1 && hotkey.press) hotkey.press();
23	if(hotkey.state == 1 && state == 0 && hotkey.release) hotkey.release();
24
25	--- desktop-ui/input/input.hpp.orig 2024-08-16 07:21:40 UTC
26	+++ desktop-ui/input/input.hpp
27	@@ -73,6 +73,8 @@ struct InputHotkey : InputDigital {
28
29	const string name;
30
31	+ bool isPause = false;
32	+
33	private:
34	function<void ()> press;
35	function<void ()> release;

Lines 1-14 Link Here

(-)b/emulators/ares/files/patch-nall_GNUmakefile (-10 / +1 lines)
1	--- nall/GNUmakefile.orig 2024-08-14 12:07:36 UTC	1	--- nall/GNUmakefile.orig 2024-08-16 16:33:46 UTC
2	+++ nall/GNUmakefile	2	+++ nall/GNUmakefile
3	@@ -102,7 +102,7 @@ else
4	else
5	machine_opt := $(if $(findstring clang,$(compiler)),-print-target-triple,-dumpmachine)
6	machine_str := $(shell $(compiler) $(machine_opt))
7	- ifneq ($(filter i686-%,$(machine_str)),)
8	+ ifneq ($(filter i386-% i486-% i586-% i686-%,$(machine_str)),)
9	machine := x86
10	else ifneq ($(filter amd64-% x86_64-%,$(machine_str)),)
11	machine := amd64
12	@@ -169,8 +169,6 @@ ifeq ($(build),debug)	3	@@ -169,8 +169,6 @@ ifeq ($(build),debug)
13	lto = false	4	lto = false
14	ifeq ($(cl),true)	5	ifeq ($(cl),true)

Lines 4-10 Link Here

(-)b/emulators/ares/files/pkg-message.in (-7 / +11 lines)
4	Users are encouraged to compile the port on their systems with	4	Users are encouraged to compile the port on their systems with
5		5
6	CFLAGS ?= -O3	6	CFLAGS ?= -O3
7	CPUTYPE ?= native	7	CPUTYPE ?= native \| ... \| x86-64-v3 \| ... \| skylake \| ...
8	WITH_LTO = yes	8	WITH_LTO = yes
9		9
10	This can improve the performance of demanding cores like the N64.	10	This can improve the performance of demanding cores like the N64.
Lines 13-32 NVIDIA GPU users with versions >= 535 of the x11/nvidia-driver could encounter Link Here
13	crashes or freezes while using the N64 core, see	13	crashes or freezes while using the N64 core, see
14	https://github.com/ares-emulator/ares/issues/1547 and	14	https://github.com/ares-emulator/ares/issues/1547 and
15	https://github.com/Themaister/Granite/issues/133. As a workaround either try to	15	https://github.com/Themaister/Granite/issues/133. As a workaround either try to
16	compile the port with the NVIDIA option set, or disable the NVIDIA shader disk	16	compile the port with the NVIDIA option set (recommended), or disable the NVIDIA
17	cache at start with	17	shader disk cache at startup with
18		18
19	$ __GL_SHADER_DISK_CACHE=0 ares	19	$ __GL_SHADER_DISK_CACHE=0 ares
20		20
		21	The port provides the HOTKEYS option. This applies an inofficial patch which
		22	locks all hotkey execution in the unpaused state of the emulator. This can be a
		23	convenience for gamepad-only users who want to assign hotkey actions to gamepad
		24	buttons but who don't have enough free unassigned buttons left on the gamepad.
		25
21	ares uses librashader for its shader support. This library is not available in	26	ares uses librashader for its shader support. This library is not available in
22	the FreeBSD ports tree yet, but it is being worked on, see	27	the FreeBSD ports tree yet, but it is being worked on, see
23	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280470. In the meantime users	28	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280470. In the meantime users
24	have to compile the library themselves if they want to actually use shaders:	29	have to compile the library themselves if they want to actually use shaders:
25		30
26	$ doas pkg install rust-nightly	31	$ doas pkg install rust-nightly
27	$ fetch https://github.com/SnowflakePowered/librashader/archive/refs/tags/librashader-v0.3.0.tar.gz	32	$ fetch https://github.com/SnowflakePowered/librashader/archive/refs/tags/librashader-v%%LIBRASHADER%%.tar.gz
28	$ tar -xf librashader-v0.3.0.tar.gz	33	$ tar -xf librashader-v%%LIBRASHADER%%.tar.gz
29	$ cd librashader-librashader-v0.3.0	34	$ cd librashader-librashader-v%%LIBRASHADER%%
30	$ cargo run -p librashader-build-script -- --profile release	35	$ cargo run -p librashader-build-script -- --profile release
31	$ doas cp target/release/librashader.so %%LOCALBASE%%/lib	36	$ doas cp target/release/librashader.so %%LOCALBASE%%/lib
32		37
33	-