Attachment #227233 for bug #257806

Lines 1-14 Link Here

(-)b/games/retroarch/Makefile (-7 / +5 lines)
1	# Created by: Yuri Victorovich <yuri@rawbw.com>	1	# Created by: Yuri Victorovich <yuri@rawbw.com>
2		2
3	PORTNAME= RetroArch	3	PORTNAME= RetroArch
4	PORTVERSION= 1.9.0	4	PORTVERSION= 1.9.7
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	PORTREVISION= 2
7	CATEGORIES= games emulators	6	CATEGORIES= games emulators
8		7
9	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
10	PATCHFILES+= 618c83d4ca1b8144377747076e28ac962e492392.patch:-p1
11
12	MAINTAINER= greg@unrelenting.technology	8	MAINTAINER= greg@unrelenting.technology
13	COMMENT= Cross-platform entertainment system based on libretro API	9	COMMENT= Cross-platform entertainment system based on libretro API
14		10
Lines 17-23 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
17		13
18	LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \	14	LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \
19	libdrm.so:graphics/libdrm \	15	libdrm.so:graphics/libdrm \
20	libass.so:multimedia/libass	16	libass.so:multimedia/libass \
		17	libfribidi.so:converters/fribidi \
		18	libfontconfig.so:x11-fonts/fontconfig
21	BUILD_DEPENDS= vulkan-loader>0:graphics/vulkan-loader \	19	BUILD_DEPENDS= vulkan-loader>0:graphics/vulkan-loader \
22	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers	20	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
23	RUN_DEPENDS= retroarch-assets<=0:games/retroarch-assets	21	RUN_DEPENDS= retroarch-assets<=0:games/retroarch-assets
Lines 25-31 RUN_DEPENDS= retroarch-assets<=0:games/retroarch-assets Link Here
25	USES= compiler:c++11-lib gmake pkgconfig python:3.6+ shebangfix ssl	23	USES= compiler:c++11-lib gmake pkgconfig python:3.6+ shebangfix ssl
26		24
27	OPTIONS_DEFINE= CACA FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11 DOCS	25	OPTIONS_DEFINE= CACA FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11 DOCS
28	OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11	26	OPTIONS_DEFAULT=FFMPEG OSS SDL OPENGL OPENAL V4L FREETYPE WAYLAND UDEV QT X11
29	FFMPEG_DESC= On-the-fly recording of gameplay with libavcodec	27	FFMPEG_DESC= On-the-fly recording of gameplay with libavcodec
30	WAYLAND_DESC= Wayland display support	28	WAYLAND_DESC= Wayland display support
31	UDEV_DESC= udev device hotplug support	29	UDEV_DESC= udev device hotplug support

Lines 1-5 Link Here

(-)b/games/retroarch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1598401167	1	TIMESTAMP = 1628839619
2	SHA256 (libretro-RetroArch-v1.9.0_GH0.tar.gz) = 39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a	2	SHA256 (libretro-RetroArch-v1.9.7_GH0.tar.gz) = a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
3	SIZE (libretro-RetroArch-v1.9.0_GH0.tar.gz) = 39152024	3	SIZE (libretro-RetroArch-v1.9.7_GH0.tar.gz) = 40107807
4	SHA256 (618c83d4ca1b8144377747076e28ac962e492392.patch) = 965b73683058b887aa0ce96cd1186a61d1491d00fc0d3a96531aaa3a6eed45de	4	SHA256 (618c83d4ca1b8144377747076e28ac962e492392.patch) = 965b73683058b887aa0ce96cd1186a61d1491d00fc0d3a96531aaa3a6eed45de
5	SIZE (618c83d4ca1b8144377747076e28ac962e492392.patch) = 1573	5	SIZE (618c83d4ca1b8144377747076e28ac962e492392.patch) = 1573




https://github.com/KhronosGroup/glslang/issues/1869

--- deps/glslang/glslang/glslang/Include/PoolAlloc.h.orig	2020-03-21 22:21:53 UTC
+++ deps/glslang/glslang/glslang/Include/PoolAlloc.h
@@ -304,7 +304,6 @@ class pool_allocator { (public)
     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
 
-    void setAllocator(TPoolAllocator* a) { allocator = *a; }
     TPoolAllocator& getAllocator() const { return allocator; }
 
 protected:




--- 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"

Removed Link Here

(-)a/games/retroarch/files/patch-libretro-common_net_net__ifinfo.c (-11 lines)
1	--- libretro-common/net/net_ifinfo.c.orig 2020-08-07 22:06:53 UTC
2	+++ libretro-common/net/net_ifinfo.c
3	@@ -50,6 +50,8 @@
4	#include <netinet/in.h>
5	#endif
6
7	+#include <netinet/in.h>
8	+
9	void net_ifinfo_free(net_ifinfo_t *list)
10	{
11	unsigned k;

Lines 4-10 etc/retroarch.cfg Link Here

(-)b/games/retroarch/pkg-plist (-1 / +1 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/metainfo/com.libretro.RetroArch.appdata.xml
8	%%PORTDOCS%%%%DOCSDIR%%/COPYING	7	%%PORTDOCS%%%%DOCSDIR%%/COPYING
9	%%PORTDOCS%%%%DOCSDIR%%/README.md	8	%%PORTDOCS%%%%DOCSDIR%%/README.md
		9	share/metainfo/com.libretro.RetroArch.appdata.xml
10	share/pixmaps/retroarch.svg	10	share/pixmaps/retroarch.svg

Return to bug 257806

Removed Link Here

(-)a/games/retroarch/files/patch-deps_glslang_glslang_glslang_Include_PoolAlloc.h (-12 lines)
1	https://github.com/KhronosGroup/glslang/issues/1869
2
3	--- deps/glslang/glslang/glslang/Include/PoolAlloc.h.orig 2020-03-21 22:21:53 UTC
4	+++ deps/glslang/glslang/glslang/Include/PoolAlloc.h
5	@@ -304,7 +304,6 @@ class pool_allocator { (public)
6	size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
7	size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
8
9	- void setAllocator(TPoolAllocator* a) { allocator = *a; }
10	TPoolAllocator& getAllocator() const { return allocator; }
11
12	protected:

Removed Link Here

(-)a/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"