Attachment #220981 for bug #252189




# $FreeBSD: head/games/retroarch/Makefile 559022 2020-12-23 20:12:14Z jbeich $

PORTNAME=	RetroArch
PORTVERSION=	1.9.0
PORTREVISIION=	1
DISTVERSIONPREFIX=	v
CATEGORIES=	games emulators

PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+=	27a9997279c14c6727390d4254c2377561cb8a19.patch:-p1
PATCHFILES+=	c53f8ba96b024c0e01b7060d9a76cf93268b519a.patch:-p1
PATCHFILES+=	618c83d4ca1b8144377747076e28ac962e492392.patch:-p1
PATCHFILES+=	f9ae48c3f687cf652a4ef73b5f991ac74c7c5d17.patch:-p1
PATCHFILES+=	f646fea03fdecc62af5ffe983f51e2c7ea8bc786.patch:-p1

MAINTAINER=	greg@unrelenting.technology
COMMENT=	Cross-platform entertainment system based on libretro API


USES=		compiler:c++11-lib gmake pkgconfig python:3.6+ shebangfix ssl

OPTIONS_DEFINE=	CACA FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11 DOCS
OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11
FFMPEG_DESC=	On-the-fly recording of gameplay with libavcodec
WAYLAND_DESC=	Wayland display support
UDEV_DESC=	udev device hotplug support
QT_DESC=	Qt based desktop-style GUI

DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tl}

CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
CACA_CONFIGURE_ENABLE=	caca




TIMESTAMP = 1598401167
SHA256 (libretro-RetroArch-v1.9.0_GH0.tar.gz) = 39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
SIZE (libretro-RetroArch-v1.9.0_GH0.tar.gz) = 39152024
SHA256 (27a9997279c14c6727390d4254c2377561cb8a19.patch) = 611ea7f21322ac852f36356e5489f0ae1877bd4a76fcc60734ecb7f7e6173ea9
SIZE (27a9997279c14c6727390d4254c2377561cb8a19.patch) = 798
SHA256 (c53f8ba96b024c0e01b7060d9a76cf93268b519a.patch) = 6545e100430d0893c34b0caae262410d2507d8e75b66a99622d6ccf333f54e80
SIZE (c53f8ba96b024c0e01b7060d9a76cf93268b519a.patch) = 659
SHA256 (618c83d4ca1b8144377747076e28ac962e492392.patch) = 965b73683058b887aa0ce96cd1186a61d1491d00fc0d3a96531aaa3a6eed45de
SIZE (618c83d4ca1b8144377747076e28ac962e492392.patch) = 1573
SHA256 (f9ae48c3f687cf652a4ef73b5f991ac74c7c5d17.patch) = cb27ed17d7f68f4bac0c1f521cbed98b52fb3b317eb460f72eed89c6677ca530
SIZE (f9ae48c3f687cf652a4ef73b5f991ac74c7c5d17.patch) = 1317
SHA256 (f646fea03fdecc62af5ffe983f51e2c7ea8bc786.patch) = 89c675442e55007b3588a3cb4490984f391b81d48ac2f10fbff42a67bf6e61eb
SIZE (f646fea03fdecc62af5ffe983f51e2c7ea8bc786.patch) = 625




--- input/input_keymaps.c.orig	2020-08-07 22:06:53 UTC
+++ input/input_keymaps.c
@@ -50,10 +50,8 @@
 #include "SDL.h"
 #endif
 
-#if defined(__linux__) || defined(__linux__) && defined(HAVE_WAYLAND)
 #include <linux/input.h>
 #include <linux/kd.h>
-#endif
 
 #ifdef HAVE_X11
 #include "input/include/xfree86_keycodes.h"

Lines 1-8 Link Here

(-)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 2020-08-07 22:06:53 UTC
2	+++ libretro-common/net/net_ifinfo.c	2	+++ libretro-common/net/net_ifinfo.c
3	@@ -44,6 +44,8 @@	3	@@ -50,6 +50,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 4-9 Link Here

(-)games/retroarch/pkg-plist (-2 / +2 lines)
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/applications/retroarch.desktop	6	share/applications/retroarch.desktop
7	share/doc/retroarch/COPYING	7	%%PORTDOCS%%%%DOCSDIR%%/COPYING
8	share/doc/retroarch/README.md	8	%%PORTDOCS%%%%DOCSDIR%%/README.md
9	share/pixmaps/retroarch.svg	9	share/pixmaps/retroarch.svg

Return to bug 252189

Lines 2-18 Link Here

(-)games/retroarch/Makefile (-7 / +4 lines)
2	# $FreeBSD: head/games/retroarch/Makefile 559022 2020-12-23 20:12:14Z jbeich $	2	# $FreeBSD: head/games/retroarch/Makefile 559022 2020-12-23 20:12:14Z jbeich $
3		3
4	PORTNAME= RetroArch	4	PORTNAME= RetroArch
5	PORTVERSION= 1.8.5	5	PORTVERSION= 1.9.0
6	PORTREVISIION= 1
7	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
8	CATEGORIES= games emulators	7	CATEGORIES= games emulators
9		8
10	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/	9	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
11	PATCHFILES+= 27a9997279c14c6727390d4254c2377561cb8a19.patch:-p1
12	PATCHFILES+= c53f8ba96b024c0e01b7060d9a76cf93268b519a.patch:-p1
13	PATCHFILES+= 618c83d4ca1b8144377747076e28ac962e492392.patch:-p1	10	PATCHFILES+= 618c83d4ca1b8144377747076e28ac962e492392.patch:-p1
14	PATCHFILES+= f9ae48c3f687cf652a4ef73b5f991ac74c7c5d17.patch:-p1
15	PATCHFILES+= f646fea03fdecc62af5ffe983f51e2c7ea8bc786.patch:-p1
16		11
17	MAINTAINER= greg@unrelenting.technology	12	MAINTAINER= greg@unrelenting.technology
18	COMMENT= Cross-platform entertainment system based on libretro API	13	COMMENT= Cross-platform entertainment system based on libretro API
Lines 29-40 Link Here
29		24
30	USES= compiler:c++11-lib gmake pkgconfig python:3.6+ shebangfix ssl	25	USES= compiler:c++11-lib gmake pkgconfig python:3.6+ shebangfix ssl
31		26
32	OPTIONS_DEFINE= CACA FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11	27	OPTIONS_DEFINE= CACA FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11 DOCS
33	OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11	28	OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11
34	FFMPEG_DESC= On-the-fly recording of gameplay with libavcodec	29	FFMPEG_DESC= On-the-fly recording of gameplay with libavcodec
35	WAYLAND_DESC= Wayland display support	30	WAYLAND_DESC= Wayland display support
36	UDEV_DESC= udev device hotplug support	31	UDEV_DESC= udev device hotplug support
37	QT_DESC= Qt based desktop-style GUI	32	QT_DESC= Qt based desktop-style GUI
		33
		34	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:tl}
38		35
39	CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca	36	CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca
40	CACA_CONFIGURE_ENABLE= caca	37	CACA_CONFIGURE_ENABLE= caca

Lines 1-13 Link Here

(-)games/retroarch/distinfo (-11 / +3 lines)
1	TIMESTAMP = 1585830388	1	TIMESTAMP = 1598401167
2	SHA256 (libretro-RetroArch-v1.8.5_GH0.tar.gz) = f29b6dd9b18f874571803afac760b7fc99dc177dd079b38216b7576bd7d86dd4	2	SHA256 (libretro-RetroArch-v1.9.0_GH0.tar.gz) = 39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
3	SIZE (libretro-RetroArch-v1.8.5_GH0.tar.gz) = 38437050	3	SIZE (libretro-RetroArch-v1.9.0_GH0.tar.gz) = 39152024
4	SHA256 (27a9997279c14c6727390d4254c2377561cb8a19.patch) = 611ea7f21322ac852f36356e5489f0ae1877bd4a76fcc60734ecb7f7e6173ea9
5	SIZE (27a9997279c14c6727390d4254c2377561cb8a19.patch) = 798
6	SHA256 (c53f8ba96b024c0e01b7060d9a76cf93268b519a.patch) = 6545e100430d0893c34b0caae262410d2507d8e75b66a99622d6ccf333f54e80
7	SIZE (c53f8ba96b024c0e01b7060d9a76cf93268b519a.patch) = 659
8	SHA256 (618c83d4ca1b8144377747076e28ac962e492392.patch) = 965b73683058b887aa0ce96cd1186a61d1491d00fc0d3a96531aaa3a6eed45de	4	SHA256 (618c83d4ca1b8144377747076e28ac962e492392.patch) = 965b73683058b887aa0ce96cd1186a61d1491d00fc0d3a96531aaa3a6eed45de
9	SIZE (618c83d4ca1b8144377747076e28ac962e492392.patch) = 1573	5	SIZE (618c83d4ca1b8144377747076e28ac962e492392.patch) = 1573
10	SHA256 (f9ae48c3f687cf652a4ef73b5f991ac74c7c5d17.patch) = cb27ed17d7f68f4bac0c1f521cbed98b52fb3b317eb460f72eed89c6677ca530
11	SIZE (f9ae48c3f687cf652a4ef73b5f991ac74c7c5d17.patch) = 1317
12	SHA256 (f646fea03fdecc62af5ffe983f51e2c7ea8bc786.patch) = 89c675442e55007b3588a3cb4490984f391b81d48ac2f10fbff42a67bf6e61eb
13	SIZE (f646fea03fdecc62af5ffe983f51e2c7ea8bc786.patch) = 625

Line 0 Link Here

(-)games/retroarch/files/patch-input_input__keymaps.c (+13 lines)
	1	--- input/input_keymaps.c.orig 2020-08-07 22:06:53 UTC
	2	+++ input/input_keymaps.c
	3	@@ -50,10 +50,8 @@
	4	#include "SDL.h"
	5	#endif
	6
	7	-#if defined(__linux__) \|\| defined(__linux__) && defined(HAVE_WAYLAND)
	8	#include <linux/input.h>
	9	#include <linux/kd.h>
	10	-#endif
	11
	12	#ifdef HAVE_X11
	13	#include "input/include/xfree86_keycodes.h"