Attachment #192309 for bug #227345




# $FreeBSD$

PORTNAME=	RetroArch
PORTVERSION=	1.7.1
DISTVERSIONPREFIX=	v
CATEGORIES=	games emulators
CATEGORIES=	games

MAINTAINER=	yuri@FreeBSD.org
COMMENT=	Cross-platform entertainment system based on libretro API


BROKEN_powerpc64=	fails to compile: features_cpu.c: undefined reference to __mftb

OPTIONS_DEFINE=	FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL PYTHON V4L FREETYPE WAYLAND
OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL PYTHON V4L FREETYPE
FFMPEG_DESC=	On-the-fly recording of gameplay with libavcodec
NETPLAY_DESC=	Peer-to-peer netplay
PYTHON_DESC=	Script support in shaders
WAYLAND_DESC=	Wayland display support

FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
FFMPEG_CONFIGURE_ENABLE=ffmpeg

OPENGL_CONFIGURE_ENABLE=opengl
OPENAL_USES=		openal:soft
OPENAL_CONFIGURE_ENABLE=al
NETPLAY_CONFIGURE_ENABLE=	netplay
PYTHON_CONFIGURE_ENABLE=python
PYTHON_USES=		python:3.6
V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
V4L_CONFIGURE_ENABLE=	v4l2
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
FREETYPE_CONFIGURE_ENABLE=	freetype
WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
			${LOCALBASE}/include/linux/kd.h:graphics/svgalib
WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
			libwayland-server.so:graphics/wayland \
			libwayland-egl.so:graphics/mesa-libs
WAYLAND_CONFIGURE_ENABLE=	wayland

CONFIGURE_ARGS+=--enable-threads --disable-udev
LDFLAGS+=	-pthread
CONFIGURE_ARGS+=--enable-threads
CONFIGURE_ENV+=	MAN_DIR=${MANPREFIX}/man

USES=		compiler:c++11-lib gmake pkgconfig shebangfix
USE_GITHUB=	yes
GH_ACCOUNT=	libretro
SUB_FILES=	pkg-message
HAS_CONFIGURE=	yes
CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc
USE_XORG=	x11 xcb xext xinerama xv xxf86vm
LLD_UNSAFE=	yes


post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch
	@${REINPLACE_CMD} \
		-e 's|# libretro_directory =|libretro_directory = "${PREFIX}/lib/libretro"|' \
		-e 's|# libretro_info_path =|libretro_info_path = "${PREFIX}/share/libretro/info"|' \
		-e 's|# assets_directory =|assets_directory = "${PREFIX}/share/libretro/assets"|' \
		-e 's|# video_shader_dir =|video_shader_dir = "${PREFIX}/share/libretro/shaders"|' \
		-e 's|# video_filter_dir =|video_filter_dir = "${PREFIX}/lib/retroarch/filters/video"|' \
		-e 's|# audio_filter_dir =|audio_filter_dir = "${PREFIX}/lib/retroarch/filters/audio"|' \
		-e 's|# joypad_autoconfig_dir =|joypad_autoconfig_dir = "${PREFIX}/share/retroarch/autoconfig"|' \
		-e 's|# menu_show_core_updater = true|menu_show_core_updater = false|' \
		${STAGEDIR}${PREFIX}/etc/retroarch.cfg

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)i/games/retroarch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1468710318	1	TIMESTAMP = 1523101469
2	SHA256 (libretro-RetroArch-v1.3.6_GH0.tar.gz) = bed4201e49b2e97809e97df07d08c752879af0274feec93965a07cf6140759f5	2	SHA256 (libretro-RetroArch-v1.7.1_GH0.tar.gz) = e9189c7da6b2ca0142528eca14f26104ee322f052f8609203d90b60938d8d3f3
3	SIZE (libretro-RetroArch-v1.3.6_GH0.tar.gz) = 11967473	3	SIZE (libretro-RetroArch-v1.7.1_GH0.tar.gz) = 20540496




--- input/input_keymaps.c.orig	2018-04-07 12:02:13 UTC
+++ input/input_keymaps.c
@@ -44,7 +44,7 @@
 #include "SDL.h"
 #endif
 
-#ifdef __linux__
+#if defined(__linux__) || defined(HAVE_WAYLAND)
 #include <linux/input.h>
 #include <linux/kd.h>
 #endif
@@ -845,7 +845,7 @@ const struct rarch_key_map rarch_key_map_x11[] = {
 };
 #endif
 
-#ifdef __linux__
+#if defined(__linux__) || defined(HAVE_WAYLAND)
 const struct rarch_key_map rarch_key_map_linux[] = {
    { KEY_BACKSPACE, RETROK_BACKSPACE },
    { KEY_TAB, RETROK_TAB },

Lines 1-8 Link Here

(-)i/games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h (-4 / +4 lines)
1	--- libretro-common/include/streams/interface_stream.h.orig 2016-05-02 20:17:12 UTC	1	--- libretro-common/include/streams/interface_stream.h.orig 2018-02-19 12:43:32 UTC
2	+++ libretro-common/include/streams/interface_stream.h	2	+++ libretro-common/include/streams/interface_stream.h
3	@@ -29,6 +29,8 @@	3	@@ -32,6 +32,8 @@
4	#include <retro_common_api.h>	4
5	#include <boolean.h>	5	RETRO_BEGIN_DECLS
6		6
7	+#include <sys/types.h>	7	+#include <sys/types.h>
8	+	8	+

Lines 1-8 Link Here

(-)i/games/retroarch/files/patch-libretro-common_net_net__ifinfo.c (-4 / +4 lines)
1	--- libretro-common/net/net_ifinfo.c.orig 2016-07-04 20:02:01 UTC	1	--- libretro-common/net/net_ifinfo.c.orig 2018-02-19 12:43:32 UTC
2	+++ libretro-common/net/net_ifinfo.c	2	+++ libretro-common/net/net_ifinfo.c
3	@@ -44,6 +44,8 @@	3	@@ -48,6 +48,8 @@
4		4	#include <netinet/in.h>
5	#include <net/net_ifinfo.h>	5	#endif
6		6
7	+#include <netinet/in.h>	7	+#include <netinet/in.h>
8	+	8	+

Lines 1-6 Link Here

(-)i/games/retroarch/files/patch-libretro-common_rthreads_rthreads.c (-2 / +2 lines)
1	--- libretro-common/rthreads/rthreads.c.orig 2016-07-16 23:05:18 UTC	1	--- libretro-common/rthreads/rthreads.c.orig 2018-02-19 12:43:32 UTC
2	+++ libretro-common/rthreads/rthreads.c	2	+++ libretro-common/rthreads/rthreads.c
3	@@ -57,6 +57,8 @@	3	@@ -66,6 +66,8 @@
4	#include <mach/mach.h>	4	#include <mach/mach.h>
5	#endif	5	#endif
6		6




The headers are bundled and the library is dynamically loaded,
so avoid requiring libvulkan at build time.

--- qb/config.libs.sh.orig	2018-02-19 12:43:32 UTC
+++ qb/config.libs.sh
@@ -465,13 +465,9 @@ fi
 check_lib '' STRCASESTR "$CLIB" strcasestr
 check_lib '' MMAP "$CLIB" mmap
 
-if [ "$HAVE_VULKAN" != "no" ] && [ "$OS" = 'Win32' ]; then
-   HAVE_VULKAN=yes
-else
-   check_lib '' VULKAN -lvulkan vkCreateInstance
-fi
+HAVE_VULKAN=yes
 
-check_pkgconf PYTHON python3
+check_pkgconf PYTHON python-3.6
 
 if [ "$HAVE_MATERIALUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH" != 'no' ]; then
    if [ "$HAVE_RGUI" = 'no' ]; then

Removed Link Here

(-)c/games/retroarch/files/patch-qb_qb.params.sh (-14 lines)
1	--- qb/qb.params.sh.orig 2016-07-15 20:24:15 UTC
2	+++ qb/qb.params.sh
3	@@ -79,7 +79,10 @@ parse_input() # Parse stuff :V
4	opt_exists "${arg%%=*}" "$1"
5	eval "$opt=\"$val\""
6	;;
7	- -h\|--help) print_help; exit 0;;
8	+ --x-*)
9	+ ;;
10	+ --build*)
11	+ ;;
12	*) echo "Unknown option $1"; exit 1;;
13	esac
14	shift

Lines 3-7 bin/retroarch-cg2glsl Link Here

(-)i/games/retroarch/pkg-plist (-1 / +3 lines)
3	etc/retroarch.cfg	3	etc/retroarch.cfg
4	man/man6/retroarch-cg2glsl.6.gz	4	man/man6/retroarch-cg2glsl.6.gz
5	man/man6/retroarch.6.gz	5	man/man6/retroarch.6.gz
6	share/pixmaps/retroarch.svg
7	share/applications/retroarch.desktop	6	share/applications/retroarch.desktop
		7	share/doc/retroarch/COPYING
		8	share/doc/retroarch/README.md
		9	share/pixmaps/retroarch.svg

Return to bug 227345

Lines 2-11 Link Here

(-)i/games/retroarch/Makefile (-15 / +23 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= RetroArch	4	PORTNAME= RetroArch
5	PORTVERSION= 1.3.6	5	PORTVERSION= 1.7.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 9	7	CATEGORIES= games emulators
8	CATEGORIES= games
9		8
10	MAINTAINER= yuri@FreeBSD.org	9	MAINTAINER= yuri@FreeBSD.org
11	COMMENT= Cross-platform entertainment system based on libretro API	10	COMMENT= Cross-platform entertainment system based on libretro API
Lines 19-30 LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \ Link Here
19		18
20	BROKEN_powerpc64= fails to compile: features_cpu.c: undefined reference to __mftb	19	BROKEN_powerpc64= fails to compile: features_cpu.c: undefined reference to __mftb
21		20
22	OPTIONS_DEFINE= FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO	21	OPTIONS_DEFINE= FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL PYTHON V4L FREETYPE WAYLAND
23	OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO	22	OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL PYTHON V4L FREETYPE
24	FFMPEG_DESC= On-the-fly recording of gameplay with libavcodec	23	FFMPEG_DESC= On-the-fly recording of gameplay with libavcodec
25	NETPLAY_DESC= Peer-to-peer netplay
26	PYTHON_DESC= Script support in shaders	24	PYTHON_DESC= Script support in shaders
27	FBO_DESC= OpenGL render-to-texture	25	WAYLAND_DESC= Wayland display support
28		26
29	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg	27	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
30	FFMPEG_CONFIGURE_ENABLE=ffmpeg	28	FFMPEG_CONFIGURE_ENABLE=ffmpeg
Lines 42-67 OPENGL_USE= GL=gl,egl,gbm Link Here
42	OPENGL_CONFIGURE_ENABLE=opengl	40	OPENGL_CONFIGURE_ENABLE=opengl
43	OPENAL_USES= openal:soft	41	OPENAL_USES= openal:soft
44	OPENAL_CONFIGURE_ENABLE=al	42	OPENAL_CONFIGURE_ENABLE=al
45	NETPLAY_CONFIGURE_ENABLE= netplay
46	PYTHON_CONFIGURE_ENABLE=python	43	PYTHON_CONFIGURE_ENABLE=python
47	PYTHON_USES= python:3.4+	44	PYTHON_USES= python:3.6
48	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l	45	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
49	V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat	46	V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat
50	V4L_CONFIGURE_ENABLE= v4l2	47	V4L_CONFIGURE_ENABLE= v4l2
51	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2	48	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
52	FREETYPE_CONFIGURE_ENABLE= freetype	49	FREETYPE_CONFIGURE_ENABLE= freetype
53	FBO_CONFIGURE_ENABLE= fbo	50	WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
		51	${LOCALBASE}/include/linux/kd.h:graphics/svgalib
		52	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
		53	libwayland-server.so:graphics/wayland \
		54	libwayland-egl.so:graphics/mesa-libs
		55	WAYLAND_CONFIGURE_ENABLE= wayland
54		56
55	CFLAGS+= -pthread	57	CONFIGURE_ARGS+=--enable-threads --disable-udev
56	LDFLAGS+= -pthread
57	CONFIGURE_ARGS+=--enable-threads
58	CONFIGURE_ENV+= MAN_DIR=${MANPREFIX}/man	58	CONFIGURE_ENV+= MAN_DIR=${MANPREFIX}/man
59		59
60	USES= compiler:c++11-lib gmake pkgconfig shebangfix	60	USES= compiler:c++11-lib gmake pkgconfig shebangfix
61	USE_GITHUB= yes	61	USE_GITHUB= yes
62	GH_ACCOUNT= libretro	62	GH_ACCOUNT= libretro
63	SUB_FILES= pkg-message	63	SUB_FILES= pkg-message
64	GNU_CONFIGURE= yes	64	HAS_CONFIGURE= yes
65	CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc	65	CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc
66	USE_XORG= x11 xcb xext xinerama xv xxf86vm	66	USE_XORG= x11 xcb xext xinerama xv xxf86vm
67	LLD_UNSAFE= yes	67	LLD_UNSAFE= yes
Lines 87-93 post-patch-PYTHON-on: Link Here
87		87
88	post-install:	88	post-install:
89	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch	89	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch
90	@${REINPLACE_CMD} -e 's\|# libretro_directory =\|libretro_directory = "${PREFIX}/libexec/libretro"\|' \	90	@${REINPLACE_CMD} \
		91	-e 's\|# libretro_directory =\|libretro_directory = "${PREFIX}/lib/libretro"\|' \
		92	-e 's\|# libretro_info_path =\|libretro_info_path = "${PREFIX}/share/libretro/info"\|' \
		93	-e 's\|# assets_directory =\|assets_directory = "${PREFIX}/share/libretro/assets"\|' \
		94	-e 's\|# video_shader_dir =\|video_shader_dir = "${PREFIX}/share/libretro/shaders"\|' \
		95	-e 's\|# video_filter_dir =\|video_filter_dir = "${PREFIX}/lib/retroarch/filters/video"\|' \
		96	-e 's\|# audio_filter_dir =\|audio_filter_dir = "${PREFIX}/lib/retroarch/filters/audio"\|' \
		97	-e 's\|# joypad_autoconfig_dir =\|joypad_autoconfig_dir = "${PREFIX}/share/retroarch/autoconfig"\|' \
		98	-e 's\|# menu_show_core_updater = true\|menu_show_core_updater = false\|' \
91	${STAGEDIR}${PREFIX}/etc/retroarch.cfg	99	${STAGEDIR}${PREFIX}/etc/retroarch.cfg
92		100
93	.include <bsd.port.mk>	101	.include <bsd.port.mk>

Added Link Here

(-)i/games/retroarch/files/patch-input_input__keymaps.c (+20 lines)
1	--- input/input_keymaps.c.orig 2018-04-07 12:02:13 UTC
2	+++ input/input_keymaps.c
3	@@ -44,7 +44,7 @@
4	#include "SDL.h"
5	#endif
6
7	-#ifdef __linux__
8	+#if defined(__linux__) \|\| defined(HAVE_WAYLAND)
9	#include <linux/input.h>
10	#include <linux/kd.h>
11	#endif
12	@@ -845,7 +845,7 @@ const struct rarch_key_map rarch_key_map_x11[] = {
13	};
14	#endif
15
16	-#ifdef __linux__
17	+#if defined(__linux__) \|\| defined(HAVE_WAYLAND)
18	const struct rarch_key_map rarch_key_map_linux[] = {
19	{ KEY_BACKSPACE, RETROK_BACKSPACE },
20	{ KEY_TAB, RETROK_TAB },

Added Link Here

(-)i/games/retroarch/files/patch-qb_config.libs.sh (+21 lines)
1	The headers are bundled and the library is dynamically loaded,
2	so avoid requiring libvulkan at build time.
3
4	--- qb/config.libs.sh.orig 2018-02-19 12:43:32 UTC
5	+++ qb/config.libs.sh
6	@@ -465,13 +465,9 @@ fi
7	check_lib '' STRCASESTR "$CLIB" strcasestr
8	check_lib '' MMAP "$CLIB" mmap
9
10	-if [ "$HAVE_VULKAN" != "no" ] && [ "$OS" = 'Win32' ]; then
11	- HAVE_VULKAN=yes
12	-else
13	- check_lib '' VULKAN -lvulkan vkCreateInstance
14	-fi
15	+HAVE_VULKAN=yes
16
17	-check_pkgconf PYTHON python3
18	+check_pkgconf PYTHON python-3.6
19
20	if [ "$HAVE_MATERIALUI" != 'no' ] \|\| [ "$HAVE_XMB" != 'no' ] \|\| [ "$HAVE_ZARCH" != 'no' ]; then
21	if [ "$HAVE_RGUI" = 'no' ]; then