Attachment #253107 for bug #281080

Lines 1-5 Link Here

(-)b/emulators/ares/Makefile (-6 / +13 lines)
1	PORTNAME= ares	1	PORTNAME= ares
2	DISTVERSION= 139.20240823	2	DISTVERSION= 139.20240825
3	CATEGORIES= emulators	3	CATEGORIES= emulators
4		4
5	MAINTAINER= bsdcode@disroot.org	5	MAINTAINER= bsdcode@disroot.org
Lines 9-19 WWW= https://ares-emu.net Link Here
9	LICENSE= ISCL	9	LICENSE= ISCL
10	LICENSE_FILE= ${WRKSRC}/LICENSE	10	LICENSE_FILE= ${WRKSRC}/LICENSE
11		11
		12	BUILD_DEPENDS= ${LOCALBASE}/include/librashader/librashader_ld.h:devel/librashader
		13
12	USES= compiler:c++17-lang gmake gnome localbase:ldflags pkgconfig \	14	USES= compiler:c++17-lang gmake gnome localbase:ldflags pkgconfig \
13	xorg	15	xorg
14	USE_GITHUB= yes	16	USE_GITHUB= yes
15	GH_ACCOUNT= ares-emulator	17	GH_ACCOUNT= ares-emulator
16	GH_TAGNAME= 3cd82c8	18	GH_TAGNAME= efb7f61
17	USE_GNOME= gtksourceview3	19	USE_GNOME= gtksourceview3
18	USE_XORG= x11 xext xrandr	20	USE_XORG= x11 xext xrandr
19		21
Lines 29-36 MAKE_ARGS= compiler=${CC} \ Link Here
29	symbols=false \	31	symbols=false \
30	threaded=true	32	threaded=true
31		33
32	SUB_FILES= pkg-message	34	CFLAGS+= -DLIBRA_RUNTIME_OPENGL
33	SUB_LIST= LIBRASHADER=${_LIBRASHADER}
34		35
35	OPTIONS_DEFINE= DEBUG DOCS HOTKEYS NVIDIA OPENMP SHADER	36	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 \	37	OPTIONS_DEFAULT= A26 ALSA AO CV FC GB GBA GLX MD MS MSX MYVISION N64 NG \
Lines 157-163 SFC_MAKE_ARGS= cores+=sfc Link Here
157		158
158	SG_MAKE_ARGS= cores+=sg	159	SG_MAKE_ARGS= cores+=sg
159		160
160	SHADER_RUN_DEPENDS= ${LOCALBASE}/${_SHADERS}/bilinear.slangp:games/libretro-shaders-slang	161	SHADER_RUN_DEPENDS= ${LOCALBASE}/${_SHADERS}/bilinear.slangp:games/libretro-shaders-slang \
		162	${LOCALBASE}/lib/librashader.so:devel/librashader
161	SHADER_MAKE_ARGS= librashader=true	163	SHADER_MAKE_ARGS= librashader=true
162	SHADER_MAKE_ARGS_OFF= librashader=false	164	SHADER_MAKE_ARGS_OFF= librashader=false
163	SHADER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-desktop-ui_desktop-ui.cpp	165	SHADER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-desktop-ui_desktop-ui.cpp
Lines 176-182 XLIB_MAKE_ARGS= ruby+=input.xlib Link Here
176	XVIDEO_USE= XORG=xv	178	XVIDEO_USE= XORG=xv
177	XVIDEO_MAKE_ARGS= ruby+=video.xvideo	179	XVIDEO_MAKE_ARGS= ruby+=video.xvideo
178		180
179	_LIBRASHADER= 0.3.3
180	_SHADERS= share/libretro/shaders/shaders_slang	181	_SHADERS= share/libretro/shaders/shaders_slang
181		182
182	.include <bsd.port.options.mk>	183	.include <bsd.port.options.mk>
Lines 185-190 _SHADERS= share/libretro/shaders/shaders_slang Link Here
185	LLD_UNSAFE= yes	186	LLD_UNSAFE= yes
186	.endif	187	.endif
187		188
		189	post-patch:
		190	${REINPLACE_CMD} 's\|/usr/local\|${LOCALBASE}\|g' \
		191	${WRKSRC}/hiro/GNUmakefile
		192	${REINPLACE_CMD} 's\|"librashader_ld.h"\|<librashader/librashader_ld.h>\|g' \
		193	${WRKSRC}/ruby/video/opengl/opengl.hpp
		194
188	post-patch-SHADER-on:	195	post-patch-SHADER-on:
189	${REINPLACE_CMD} 's\|@@SHADERS@@\|${LOCALBASE}/${_SHADERS}/\|g' \	196	${REINPLACE_CMD} 's\|@@SHADERS@@\|${LOCALBASE}/${_SHADERS}/\|g' \
190	${WRKSRC}/desktop-ui/desktop-ui.cpp	197	${WRKSRC}/desktop-ui/desktop-ui.cpp

Lines 1-3 Link Here

(-)b/emulators/ares/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1724488423	1	TIMESTAMP = 1724663853
2	SHA256 (ares-emulator-ares-139.20240823-3cd82c8_GH0.tar.gz) = ac559920cb8d54e94b37fcdae3d65343c62bd9d6fb658e97dfbb6ec5304498ff	2	SHA256 (ares-emulator-ares-139.20240825-efb7f61_GH0.tar.gz) = 8d4a410b9141399ec0d592edc34ca8dd35d582a87cae3f4ec5fdacc8a1c3c64e
3	SIZE (ares-emulator-ares-139.20240823-3cd82c8_GH0.tar.gz) = 50955635	3	SIZE (ares-emulator-ares-139.20240825-efb7f61_GH0.tar.gz) = 50956365

Lines 1-9 Link Here

(-)b/emulators/ares/files/patch-desktop-ui_GNUmakefile (-3 / +5 lines)
1	--- desktop-ui/GNUmakefile.orig 2024-08-09 17:39:54 UTC	1	--- desktop-ui/GNUmakefile.orig 2024-08-25 09:06:06 UTC
2	+++ desktop-ui/GNUmakefile	2	+++ desktop-ui/GNUmakefile
3	@@ -8,6 +8,8 @@ flags += -I. -I.. -I../ares -I../thirdparty -I../third	3	@@ -7,7 +7,9 @@ librashader := true
		4	local := true
4	lto := true	5	lto := true
5	librashader := true	6	librashader := true
6	flags += -I. -I.. -I../ares -I../thirdparty -I../thirdparty/librashader/include -DMIA_LIBRARY	7	-flags += -I. -I.. -I../ares -I../thirdparty -I../thirdparty/librashader/include -DMIA_LIBRARY
		8	+flags += -I. -I.. -I../ares -I../thirdparty -DMIA_LIBRARY
7	+flags += $(CFLAGS)	9	+flags += $(CFLAGS)
8	+options += $(LDFLAGS)	10	+options += $(LDFLAGS)
9		11

Removed Link Here

(-)a/emulators/ares/files/patch-hiro_GNUmakefile (-11 lines)
1	--- hiro/GNUmakefile.orig 2024-08-14 11:19:20 UTC
2	+++ hiro/GNUmakefile
3	@@ -62,7 +62,7 @@ ifneq ($(filter $(platform),linux bsd),)
4	else ifeq ($(hiro),gtk3-se)
5	flags += -DHiro_SourceEdit
6	hiro.flags = $(flags.cpp) -DHIRO_GTK=3 $(shell $(pkg_config) --cflags gtk+-3.0 gtksourceview-3.0) -Wno-deprecated-declarations
7	- hiro.options = -L/usr/local/lib -lX11 $(shell $(pkg_config) --libs gtk+-3.0 gtksourceview-3.0)
8	+ hiro.options = -lX11 $(shell $(pkg_config) --libs gtk+-3.0 gtksourceview-3.0)
9	else ifeq ($(hiro),qt4)
10	moc = /usr/local/lib/qt4/bin/moc
11	hiro.flags = $(flags.cpp) -DHIRO_QT=4 $(shell $(pkg_config) --cflags QtCore QtGui)




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
- 

Return to bug 281080

Lines 23-40 locks all hotkey execution in the unpaused state of the emulator. This can be a Link Here

(-)b/emulators/ares/pkg-message (-13 lines)
23	convenience for gamepad-only users who want to assign hotkey actions to gamepad	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.	24	buttons but who don't have enough free unassigned buttons left on the gamepad.
25		25
26	ares uses librashader for its shader support. This library is not available in
27	the FreeBSD ports tree yet, but it is being worked on, see
28	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280470. In the meantime users
29	have to compile the library themselves if they want to actually use shaders:
30
31	$ su root -c 'pkg install rust-nightly'
32	$ fetch https://github.com/SnowflakePowered/librashader/archive/refs/tags/librashader-v%%LIBRASHADER%%.tar.gz
33	$ tar -xf librashader-v%%LIBRASHADER%%.tar.gz
34	$ cd librashader-librashader-v%%LIBRASHADER%%
35	$ cargo run -p librashader-build-script -- --profile release
36	$ su root -c 'cp target/release/librashader.so %%LOCALBASE%%/lib'
37
38	The port uses the shaders from games/libretro-shaders-slang by default. Users	26	The port uses the shaders from games/libretro-shaders-slang by default. Users
39	can curate and utilize their own provided collection of shaders by putting them	27	can curate and utilize their own provided collection of shaders by putting them
40	into the user data directory	28	into the user data directory
41	-