update dosbox-x patches

Author: Hancock33

package/batocera/emulators/dosbox-x/001-dosboxconf.patch

@@ -1,8 +1,8 @@
 diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
-index aedb5d82f..8bfb4642b 100644
+index c500868b2..4417f9842 100644
 --- a/src/gui/sdlmain.cpp
 +++ b/src/gui/sdlmain.cpp
-@@ -830,7 +830,7 @@ const char *modifier;
+@@ -931,7 +931,7 @@ const char *modifier;
  #elif defined(HAIKU)
  #define DEFAULT_CONFIG_FILE             "~/config/settings/dosbox-x/dosbox-x.conf"
  #else /*linux freebsd*/
@@ -12,33 +12,33 @@ index aedb5d82f..8bfb4642b 100644
 
  #if C_SET_PRIORITY
 diff --git a/src/misc/cross.cpp b/src/misc/cross.cpp
-index 36e558c8c..8cadd571d 100644
+index 2ba476994..b4375352e 100644
 --- a/src/misc/cross.cpp
 +++ b/src/misc/cross.cpp
-@@ -167,7 +167,7 @@ void Cross::GetPlatformConfigDir(std::string& in) {
- #elif !defined(HX_DOS)
- 	const char *xdg_conf_home = getenv("XDG_CONFIG_HOME");
- 	const std::string conf_home = xdg_conf_home && xdg_conf_home[0] == '/' ? xdg_conf_home: "~/.config";
--	in = conf_home + "/dosbox-x";
-+	in = conf_home + "/dosbox";
- 	ResolveHomedir(in);
+@@ -194,7 +194,7 @@ std::string Cross::GetPlatformConfigDir()
+         ? xdg_conf_home
+         : "~/.config";
+ 
+-    dir = conf_home + "/dosbox-x";
++    dir = conf_home + "/dosbox";
+     ResolveHomedir(dir);
  #endif
- 	//LOG_MSG("Config dir: %s", in.c_str());
-@@ -180,7 +180,7 @@ void Cross::GetPlatformConfigName(std::string& in) {
- #elif defined(MACOSX)
- #define DEFAULT_CONFIG_FILE "DOSBox-X " VERSION " Preferences"
- #else /*linux freebsd*/
+ 
+@@ -216,7 +216,7 @@ std::string Cross::GetPlatformConfigName()
+ #elif defined(OS2) && defined(C_SDL2)
+ #define DEFAULT_CONFIG_FILE "dosbox-x-" PACKAGE_VERSION ".conf"
+ #else /* linux, freebsd */
 -#define DEFAULT_CONFIG_FILE "dosbox-x-" VERSION ".conf"
 +#define DEFAULT_CONFIG_FILE "dosboxx.conf"
  #endif
- 	in = DEFAULT_CONFIG_FILE;
- }
-@@ -204,7 +204,7 @@ void Cross::CreatePlatformConfigDir(std::string& in) {
- #elif !defined(HX_DOS)
- 	const char *xdg_conf_home = getenv("XDG_CONFIG_HOME");
- 	const std::string conf_home = xdg_conf_home && xdg_conf_home[0] == '/' ? xdg_conf_home: "~/.config";
--	in = conf_home + "/dosbox-x";
-+	in = conf_home + "/dosbox";
- 	ResolveHomedir(in);
- 	mkdir(in.c_str(),0700);
+ 
+     name = DEFAULT_CONFIG_FILE;
+@@ -250,7 +250,7 @@ std::string Cross::CreatePlatformConfigDir()
+     const char* xdg_conf_home = getenv("XDG_CONFIG_HOME");
+     const std::string conf_home =
+         (xdg_conf_home && xdg_conf_home[0] == '/') ? xdg_conf_home : "~/.config";
+-    path = conf_home + "/dosbox-x";
++    path = conf_home + "/dosbox";
+     ResolveHomedir(path);
+     mkdir(path.c_str(), 0700);
  #endif

package/batocera/emulators/dosbox-x/002-map_mouse.patch

@@ -1,16 +1,16 @@
 diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp
-index 1f1ddebbf..fade2789f 100644
+index ebe31c9e6..5c0cfd4fa 100644
 --- a/src/gui/sdl_mapper.cpp
 +++ b/src/gui/sdl_mapper.cpp
-@@ -93,6 +93,7 @@
+@@ -94,6 +94,7 @@
  #define MAX_VJOY_HATS           16
  #define MAX_VJOY_AXES           8
 
 +#define MOUSE_OFFSET            8
 
  class CEvent;
  class CKeyEvent;
-@@ -3045,6 +3046,21 @@ public:
+@@ -3063,6 +3064,21 @@ public:
  	uint8_t button;
  };
 
@@ -32,7 +32,7 @@ index 1f1ddebbf..fade2789f 100644
  //! \brief Joystick axis event handling for the mapper
  class CJAxisEvent : public CContinuousEvent {
  public:
-@@ -3917,6 +3933,16 @@ static CMouseButtonEvent * AddMouseButtonEvent(Bitu x,Bitu y,Bitu dx,Bitu dy,cha
+@@ -3937,6 +3953,16 @@ static CMouseButtonEvent * AddMouseButtonEvent(Bitu x,Bitu y,Bitu dx,Bitu dy,cha
  	return event;
  }
 
@@ -49,7 +49,7 @@ index 1f1ddebbf..fade2789f 100644
  static CJAxisEvent * AddJAxisButton(Bitu x,Bitu y,Bitu dx,Bitu dy,char const * const title,Bitu stick,Bitu axis,bool positive,CJAxisEvent * opposite_axis) {
      char buf[64];
      sprintf(buf,"jaxis_%d_%d%s",(int)stick,(int)axis,positive ? "+" : "-");
-@@ -4045,6 +4071,16 @@ static void CreateLayout(void) {
+@@ -4065,6 +4091,16 @@ static void CreateLayout(void) {
 
  #undef XO
  #undef YO