mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 07:27:49 +00:00
retroplayer addons: remove upstreamed patches
This commit is contained in:
parent
58cb27a006
commit
8c216c89dd
@ -1,35 +0,0 @@
|
||||
From 2a00890a52ee21b63100e21dcb95940943ba6810 Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Serbinenko <phcoder@google.com>
|
||||
Date: Mon, 4 May 2020 18:11:21 +0200
|
||||
Subject: [PATCH] Fix declaration of ev_events
|
||||
|
||||
---
|
||||
libretro/retro_events.c | 1 +
|
||||
libretro/retro_events.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libretro/retro_events.c b/libretro/retro_events.c
|
||||
index 50f4364..0a9e3e9 100644
|
||||
--- a/libretro/retro_events.c
|
||||
+++ b/libretro/retro_events.c
|
||||
@@ -59,6 +59,7 @@ const uint8_t bit_values[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 };
|
||||
static uint8_t keyboard_translation[MAX_KEYSYMS];
|
||||
unsigned int last_input[PORTS_NUMBER] = {0,0};
|
||||
uint32_t padnum = 0;
|
||||
+bool (*ev_events)(void);
|
||||
|
||||
const uint8_t btnPAD[MAX_PADCFG][MAX_BUTTONS] = {
|
||||
{ // JOYSTICK CFG
|
||||
diff --git a/libretro/retro_events.h b/libretro/retro_events.h
|
||||
index 9f53d36..63e24b5 100644
|
||||
--- a/libretro/retro_events.h
|
||||
+++ b/libretro/retro_events.h
|
||||
@@ -154,7 +154,7 @@ typedef struct {
|
||||
#define JOY_EVENT_ID_Y 1
|
||||
|
||||
void ev_joysticks();
|
||||
-bool (*ev_events)(void);
|
||||
+extern bool (*ev_events)(void);
|
||||
void ev_combo_set(unsigned btn);
|
||||
void ev_init();
|
||||
|
@ -1,11 +0,0 @@
|
||||
diff -Naur a/Makefile b/Makefile
|
||||
--- a/Makefile 2017-06-12 09:00:49.000000000 -0700
|
||||
+++ b/Makefile 2017-07-14 13:23:42.430741116 -0700
|
||||
@@ -1,6 +1,6 @@
|
||||
DEBUG = 0
|
||||
USE_CXX03 = 0
|
||||
-HAVE_NEON=0
|
||||
+HAVE_NEON ?= 0
|
||||
|
||||
ifeq ($(platform),)
|
||||
platform = unix
|
@ -1,10 +0,0 @@
|
||||
--- libretro-dinothawr-02821dd/utils.hpp 2017-06-02 15:32:28.527780477 +0200
|
||||
+++ libretro-dinothawr-02821dd/utils.hpp 2017-06-02 15:24:23.781305524 +0200
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <limits>
|
||||
#include <memory>
|
||||
#include <errno.h>
|
||||
+#include <functional>
|
||||
|
||||
#include <pugixml/pugixml.hpp>
|
||||
|
@ -1,50 +0,0 @@
|
||||
From 6640ae1c834c31a776ad1d22c77ed919e8fe3c07 Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Serbinenko <phcoder@google.com>
|
||||
Date: Wed, 6 May 2020 02:02:59 +0200
|
||||
Subject: [PATCH] Emscripten fixes
|
||||
|
||||
---
|
||||
fuse/ui/widget/widget.c | 2 +-
|
||||
src/libretro.c | 2 +-
|
||||
zlib/gzguts.h | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/fuse/ui/widget/widget.c b/fuse/ui/widget/widget.c
|
||||
index 542a47f..0437cd5 100644
|
||||
--- a/fuse/ui/widget/widget.c
|
||||
+++ b/fuse/ui/widget/widget.c
|
||||
@@ -93,7 +93,7 @@ typedef struct widget_recurse_t {
|
||||
static widget_recurse_t widget_return[10]; /* The stack to recurse on */
|
||||
|
||||
/* The settings used whilst playing with an options dialog box */
|
||||
-settings_info widget_options_settings;
|
||||
+extern settings_info widget_options_settings;
|
||||
|
||||
static int widget_read_font( const char *filename )
|
||||
{
|
||||
diff --git a/src/libretro.c b/src/libretro.c
|
||||
index ba595b7..19948c6 100644
|
||||
--- a/src/libretro.c
|
||||
+++ b/src/libretro.c
|
||||
@@ -476,7 +476,7 @@ static int get_joystick(unsigned device)
|
||||
#ifdef GIT_VERSION
|
||||
static char version[] = PACKAGE_VERSION " " GIT_VERSION;
|
||||
#else
|
||||
-const char *fuse_githash;
|
||||
+extern const char *fuse_githash;
|
||||
static char version[] = PACKAGE_VERSION " .......";
|
||||
#endif
|
||||
|
||||
diff --git a/zlib/gzguts.h b/zlib/gzguts.h
|
||||
index 6463b71..8e83b1d 100644
|
||||
--- a/zlib/gzguts.h
|
||||
+++ b/zlib/gzguts.h
|
||||
@@ -18,7 +18,7 @@
|
||||
# define ZLIB_INTERNAL
|
||||
#endif
|
||||
|
||||
-#ifdef _IOS_ARM64
|
||||
+#if defined(_IOS_ARM64) || defined(EMSCRIPTEN)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user