From 3b9a488670db841aaf26bee9a293dd8e3dc56fcb Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Feb 12 2019 23:21:28 +0000 Subject: Cleanup old patches --- diff --git a/pcsxr-1.9.94-SDLjoyoverflowbug.patch b/pcsxr-1.9.94-SDLjoyoverflowbug.patch deleted file mode 100644 index 9dbd55d..0000000 --- a/pcsxr-1.9.94-SDLjoyoverflowbug.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN a/plugins/dfinput/cfg-gtk.c b/plugins/dfinput/cfg-gtk.c ---- a/plugins/dfinput/cfg-gtk.c 2013-11-09 16:24:16.000000000 -0500 -+++ b/plugins/dfinput/cfg-gtk.c 2017-05-30 08:46:57.799501874 -0400 -@@ -607,7 +607,7 @@ static void PopulateDevList() { - - n = SDL_NumJoysticks(); - for (j = 0; j < n; j++) { -- sprintf(buf, "%d: %s", j + 1, SDL_JoystickName(j)); -+ snprintf(buf, sizeof(buf), "%d: %s", j + 1, SDL_JoystickName(j)); - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, 0, buf, -1); - } diff --git a/pcsxr-1.9.94-missinginclude.patch b/pcsxr-1.9.94-missinginclude.patch deleted file mode 100644 index 87d031a..0000000 --- a/pcsxr-1.9.94-missinginclude.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/gui/GtkGui.c -+++ b/gui/GtkGui.c -@@ -33,6 +33,7 @@ - - #include "../libpcsxcore/plugins.h" - #include "../libpcsxcore/cheat.h" -+#include "../libpcsxcore/cdrom.h" - - #include "MemcardDlg.h" - #include "ConfDlg.h" ---- a/plugins/bladesio1/sio1.c -+++ b/plugins/bladesio1/sio1.c -@@ -30,7 +30,10 @@ - void AboutDlgProc(); - void ConfDlgProc(); - #else -+#include - #include -+#include -+#include - #endif - - #include "typedefs.h" ---- a/plugins/dfcdrom/cdr.c -+++ b/plugins/dfcdrom/cdr.c -@@ -20,6 +20,8 @@ - */ - - #include "cdr.h" -+#include -+#include - - #ifndef USE_NULL - static char *LibName = N_("CD-ROM Drive Reader"); ---- a/plugins/dfinput/pad.c -+++ b/plugins/dfinput/pad.c -@@ -22,6 +22,8 @@ - #include - #include - #endif -+#include -+#include - - #if SDL_VERSION_ATLEAST(2,0,0) - int has_haptic; ---- a/plugins/dfsound/cfg.c -+++ b/plugins/dfsound/cfg.c -@@ -26,6 +26,8 @@ - //////////////////////////////////////////////////////////////////////// - - #include -+#include -+#include - - //////////////////////////////////////////////////////////////////////// - // START EXTERNAL CFG TOOL ---- a/plugins/dfxvideo/cfg.c -+++ b/plugins/dfxvideo/cfg.c -@@ -20,6 +20,8 @@ - #include - #include - #include -+#include -+#include - - #undef FALSE - #undef TRUE ---- a/plugins/peopsxgl/stdafx.h -+++ b/plugins/peopsxgl/stdafx.h -@@ -62,6 +62,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include diff --git a/pcsxr-1.9.94-zlib129fix.patch b/pcsxr-1.9.94-zlib129fix.patch deleted file mode 100644 index 632e1ce..0000000 --- a/pcsxr-1.9.94-zlib129fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/pcsxr/configure.ac b/pcsxr/configure.ac -index 300bb18..128b4f9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -113,6 +113,9 @@ if test "x$have_xtest" = xno; then - AC_MSG_ERROR([unable to find xtest headers]) - fi - -+AC_CHECK_LIB(z, uncompress2, -+[ AC_DEFINE([HAVE_UNCOMPRESS2], [1], [Define if libz supports uncompress2]) ]) -+ - AM_CONDITIONAL(USE_LIBCDIO, false) - - AC_ARG_ENABLE(libcdio, [ --enable-libcdio use GNU libcdio for CD-ROM support (default=no)], -diff --git a/pcsxr/libpcsxcore/cdriso.c b/pcsxr/libpcsxcore/cdriso.c -index 04e866d..fb7f28a 100644 ---- a/libpcsxcore/cdriso.c -+++ b/libpcsxcore/cdriso.c -@@ -1219,6 +1219,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) - return ret; - } - -+#ifndef HAVE_UNCOMPRESS2 - static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) - { - static z_stream z; -@@ -1249,6 +1250,7 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo - *out_size -= z.avail_out; - return ret == 1 ? 0 : ret; - } -+#endif - - static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) - {