Attachment 192309 Details for Bug 227345 – retroarch.patch

[patch] retroarch.patch

retroarch.patch (text/plain), 8.64 KB, created by Val Packett on 2018-04-07 14:16:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2018-04-07 14:16:53 UTC

Size: 8.64 KB

patch

obsolete

>diff --git c/games/retroarch/Makefile i/games/retroarch/Makefile
>index c0747187d937..0d588e549cf9 100644
>--- c/games/retroarch/Makefile
>+++ i/games/retroarch/Makefile
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	RetroArch
>-PORTVERSION=	1.3.6
>+PORTVERSION=	1.7.1
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	9
>-CATEGORIES=	games
>+CATEGORIES=	games emulators
> 
> MAINTAINER=	yuri@FreeBSD.org
> COMMENT=	Cross-platform entertainment system based on libretro API
>@@ -19,12 +18,11 @@ LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
> 
> BROKEN_powerpc64=	fails to compile: features_cpu.c: undefined reference to __mftb
> 
>-OPTIONS_DEFINE=	FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO
>-OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO
>+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
>-FBO_DESC=	OpenGL render-to-texture
>+WAYLAND_DESC=	Wayland display support
> 
> FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
> FFMPEG_CONFIGURE_ENABLE=ffmpeg
>@@ -42,26 +40,28 @@ OPENGL_USE=		GL=gl,egl,gbm
> OPENGL_CONFIGURE_ENABLE=opengl
> OPENAL_USES=		openal:soft
> OPENAL_CONFIGURE_ENABLE=al
>-NETPLAY_CONFIGURE_ENABLE=	netplay
> PYTHON_CONFIGURE_ENABLE=python
>-PYTHON_USES=		python:3.4+
>+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
>-FBO_CONFIGURE_ENABLE=	fbo
>+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
> 
>-CFLAGS+=	-pthread
>-LDFLAGS+=	-pthread
>-CONFIGURE_ARGS+=--enable-threads
>+CONFIGURE_ARGS+=--enable-threads --disable-udev
> CONFIGURE_ENV+=	MAN_DIR=${MANPREFIX}/man
> 
> USES=		compiler:c++11-lib gmake pkgconfig shebangfix
> USE_GITHUB=	yes
> GH_ACCOUNT=	libretro
> SUB_FILES=	pkg-message
>-GNU_CONFIGURE=	yes
>+HAS_CONFIGURE=	yes
> CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc
> USE_XORG=	x11 xcb xext xinerama xv xxf86vm
> LLD_UNSAFE=	yes
>@@ -87,7 +87,15 @@ post-patch-PYTHON-on:
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch
>-	@${REINPLACE_CMD} -e 's|# libretro_directory =|libretro_directory = "${PREFIX}/libexec/libretro"|' \
>+	@${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>
>diff --git c/games/retroarch/distinfo i/games/retroarch/distinfo
>index cfa334ff55f1..904159c4fc74 100644
>--- c/games/retroarch/distinfo
>+++ i/games/retroarch/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1468710318
>-SHA256 (libretro-RetroArch-v1.3.6_GH0.tar.gz) = bed4201e49b2e97809e97df07d08c752879af0274feec93965a07cf6140759f5
>-SIZE (libretro-RetroArch-v1.3.6_GH0.tar.gz) = 11967473
>+TIMESTAMP = 1523101469
>+SHA256 (libretro-RetroArch-v1.7.1_GH0.tar.gz) = e9189c7da6b2ca0142528eca14f26104ee322f052f8609203d90b60938d8d3f3
>+SIZE (libretro-RetroArch-v1.7.1_GH0.tar.gz) = 20540496
>diff --git c/games/retroarch/files/patch-input_input__keymaps.c i/games/retroarch/files/patch-input_input__keymaps.c
>new file mode 100644
>index 000000000000..69762fb96a92
>--- /dev/null
>+++ i/games/retroarch/files/patch-input_input__keymaps.c
>@@ -0,0 +1,20 @@
>+--- 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 },
>diff --git c/games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h i/games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h
>index 0e2564dc0d4a..0aa985c09dba 100644
>--- c/games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h
>+++ i/games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h
>@@ -1,8 +1,8 @@
>---- libretro-common/include/streams/interface_stream.h.orig	2016-05-02 20:17:12 UTC
>+--- libretro-common/include/streams/interface_stream.h.orig	2018-02-19 12:43:32 UTC
> +++ libretro-common/include/streams/interface_stream.h
>-@@ -29,6 +29,8 @@
>- #include <retro_common_api.h>
>- #include <boolean.h>
>+@@ -32,6 +32,8 @@
>+ 
>+ RETRO_BEGIN_DECLS
>  
> +#include <sys/types.h>
> +
>diff --git c/games/retroarch/files/patch-libretro-common_net_net__ifinfo.c i/games/retroarch/files/patch-libretro-common_net_net__ifinfo.c
>index 580228ff99e4..1d25914c8fd4 100644
>--- c/games/retroarch/files/patch-libretro-common_net_net__ifinfo.c
>+++ i/games/retroarch/files/patch-libretro-common_net_net__ifinfo.c
>@@ -1,8 +1,8 @@
>---- libretro-common/net/net_ifinfo.c.orig	2016-07-04 20:02:01 UTC
>+--- libretro-common/net/net_ifinfo.c.orig	2018-02-19 12:43:32 UTC
> +++ libretro-common/net/net_ifinfo.c
>-@@ -44,6 +44,8 @@
>- 
>- #include <net/net_ifinfo.h>
>+@@ -48,6 +48,8 @@
>+ #include <netinet/in.h>
>+ #endif
>  
> +#include <netinet/in.h>
> +
>diff --git c/games/retroarch/files/patch-libretro-common_rthreads_rthreads.c i/games/retroarch/files/patch-libretro-common_rthreads_rthreads.c
>index 8160fa2bd923..09bd23c366f9 100644
>--- c/games/retroarch/files/patch-libretro-common_rthreads_rthreads.c
>+++ i/games/retroarch/files/patch-libretro-common_rthreads_rthreads.c
>@@ -1,6 +1,6 @@
>---- libretro-common/rthreads/rthreads.c.orig	2016-07-16 23:05:18 UTC
>+--- libretro-common/rthreads/rthreads.c.orig	2018-02-19 12:43:32 UTC
> +++ libretro-common/rthreads/rthreads.c
>-@@ -57,6 +57,8 @@
>+@@ -66,6 +66,8 @@
>  #include <mach/mach.h>
>  #endif
>  
>diff --git c/games/retroarch/files/patch-qb_config.libs.sh i/games/retroarch/files/patch-qb_config.libs.sh
>new file mode 100644
>index 000000000000..a500c8b09ae3
>--- /dev/null
>+++ i/games/retroarch/files/patch-qb_config.libs.sh
>@@ -0,0 +1,21 @@
>+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
>diff --git c/games/retroarch/files/patch-qb_qb.params.sh i/games/retroarch/files/patch-qb_qb.params.sh
>deleted file mode 100644
>index 85c0be20497f..000000000000
>--- c/games/retroarch/files/patch-qb_qb.params.sh
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- qb/qb.params.sh.orig	2016-07-15 20:24:15 UTC
>-+++ qb/qb.params.sh
>-@@ -79,7 +79,10 @@ parse_input() # Parse stuff :V
>- 				opt_exists "${arg%%=*}" "$1"
>- 				eval "$opt=\"$val\""
>- 			;;
>--			-h|--help) print_help; exit 0;;
>-+			--x-*)
>-+			;;
>-+			--build*)
>-+			;;
>- 			*) echo "Unknown option $1"; exit 1;;
>- 		esac
>- 		shift
>diff --git c/games/retroarch/pkg-plist i/games/retroarch/pkg-plist
>index e3eb48513247..4b9ae99db150 100644
>--- c/games/retroarch/pkg-plist
>+++ i/games/retroarch/pkg-plist
>@@ -3,5 +3,7 @@ bin/retroarch-cg2glsl
> etc/retroarch.cfg
> man/man6/retroarch-cg2glsl.6.gz
> man/man6/retroarch.6.gz
>-share/pixmaps/retroarch.svg
> share/applications/retroarch.desktop
>+share/doc/retroarch/COPYING
>+share/doc/retroarch/README.md
>+share/pixmaps/retroarch.svg

Actions: View | Diff

Attachments on bug 227345: 192309 | 192310 | 193058 | 200666 | 205273 | 212598 | 212979 | 213338 | 213461