[mupen64plus-input-sdl] 154/196: Rebase patches on 2.0

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:00:36 UTC 2015 

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-input-sdl.

commit 1c153e674a959f711adb18386e6e548052dfe9f1
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 10:07:15 2013 +0200

    Rebase patches on 2.0
---
 debian/changelog                        |  2 ++
 debian/patches/cflags_gnu_source.patch  | 17 -----------------
 debian/patches/sdl2_forcefeedback.patch | 16 ++++++++--------
 debian/patches/sdl2_keysym.patch        |  4 ++--
 debian/patches/sdl2_mousemode.patch     |  6 +++---
 debian/patches/series                   |  1 -
 6 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56c28e7..3f0bbaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mupen64plus-input-sdl (2.0-1) UNRELEASED; urgency=low
   * debian/patches:
     - Update sdl2_forcefeedback.patch, Support rumble effects when only
       a single effect can be registered
+    - Remove upstream merged cflags_gnu_source.patch
+    - Rebase sdl2_keysym.patch and sdl2_mousemode.patch on 2.0
   * debian/control:
     - Build-Depend on debhelper 9.20130604 for support of parameters when
       detecting targets in dh_auto_*
diff --git a/debian/patches/cflags_gnu_source.patch b/debian/patches/cflags_gnu_source.patch
deleted file mode 100644
index 6bf0527..0000000
--- a/debian/patches/cflags_gnu_source.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add CFLAGS -D_GNU_SOURCE to allow usage of strcasestr
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 688c7cde515a301595f5ff25aa929b1aebdbd158..e056a1d52bb666bb49b170cb57434c8e702337a2 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -117,7 +117,7 @@ endif
- # base CFLAGS, LDLIBS, and LDFLAGS
- OPTFLAGS ?= -O3 -flto
- WARNFLAGS ?= -Wall
--CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src -D_GNU_SOURCE=1
- LDFLAGS += $(SHARED)
- 
- # Since we are building a shared library, we must compile with -fPIC on some architectures
diff --git a/debian/patches/sdl2_forcefeedback.patch b/debian/patches/sdl2_forcefeedback.patch
index 39f80bf..d6171e4 100644
--- a/debian/patches/sdl2_forcefeedback.patch
+++ b/debian/patches/sdl2_forcefeedback.patch
@@ -3,7 +3,7 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/src/plugin.c b/src/plugin.c
-index 8ce635c592f35d774d0ab8fadd25160328d03796..5adf21a600be08306ad1c9d93df81a2b38f2723b 100644
+index 26b1814fd9ce666d5dda1f550f438210e642f603..9e553b1463040b1359e95667e6de2957e8e0abf1 100644
 --- a/src/plugin.c
 +++ b/src/plugin.c
 @@ -111,7 +111,7 @@ static int romopen = 0;         // is a rom opened
@@ -12,9 +12,9 @@ index 8ce635c592f35d774d0ab8fadd25160328d03796..5adf21a600be08306ad1c9d93df81a2b
  
 -#ifdef __linux__
 +#if __linux__ && !SDL_VERSION_ATLEAST(2,0,0)
- static struct ff_effect ffeffect[3];
- static struct ff_effect ffstrong[3];
- static struct ff_effect ffweak[3];
+ static struct ff_effect ffeffect[4];
+ static struct ff_effect ffstrong[4];
+ static struct ff_effect ffweak[4];
 @@ -402,7 +402,15 @@ EXPORT void CALL ControllerCommand(int Control, unsigned char *Command)
                  unsigned int dwAddress = (Command[3] << 8) + (Command[4] & 0xE0);
                if (dwAddress == PAK_IO_RUMBLE && *Data)
@@ -132,7 +132,7 @@ index 8ce635c592f35d774d0ab8fadd25160328d03796..5adf21a600be08306ad1c9d93df81a2b
      DIR* dp;
      struct dirent* ep;
      unsigned long features[4];
-@@ -760,6 +848,16 @@ static void InitiateRumble(int cntrl)
+@@ -763,6 +851,16 @@ static void InitiateRumble(int cntrl)
  #endif /* __linux__ */
  }
  
@@ -149,7 +149,7 @@ index 8ce635c592f35d774d0ab8fadd25160328d03796..5adf21a600be08306ad1c9d93df81a2b
  /******************************************************************
    Function: InitiateControllers
    Purpose:  This function initialises how each of the controllers
-@@ -790,10 +888,13 @@ EXPORT void CALL InitiateControllers(CONTROL_INFO ControlInfo)
+@@ -793,10 +891,13 @@ EXPORT void CALL InitiateControllers(CONTROL_INFO ControlInfo)
      for( i = 0; i < 4; i++ )
      {
          // test for rumble support for this joystick
@@ -163,7 +163,7 @@ index 8ce635c592f35d774d0ab8fadd25160328d03796..5adf21a600be08306ad1c9d93df81a2b
      }
  
      DebugMessage(M64MSG_INFO, "%s version %i.%i.%i initialized.", PLUGIN_NAME, VERSION_PRINTF_SPLIT(PLUGIN_VERSION));
-@@ -830,12 +931,10 @@ EXPORT void CALL RomClosed(void)
+@@ -833,12 +934,10 @@ EXPORT void CALL RomClosed(void)
      int i;
  
      // close joysticks
@@ -180,7 +180,7 @@ index 8ce635c592f35d774d0ab8fadd25160328d03796..5adf21a600be08306ad1c9d93df81a2b
  
      // quit SDL joystick subsystem
      SDL_QuitSubSystem( SDL_INIT_JOYSTICK );
-@@ -871,15 +970,10 @@ EXPORT int CALL RomOpen(void)
+@@ -874,15 +973,10 @@ EXPORT int CALL RomOpen(void)
          }
  
      // open joysticks
diff --git a/debian/patches/sdl2_keysym.patch b/debian/patches/sdl2_keysym.patch
index e742306..da756a3 100644
--- a/debian/patches/sdl2_keysym.patch
+++ b/debian/patches/sdl2_keysym.patch
@@ -6,7 +6,7 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index fb21916a6a79723b2934cfeb0320b2f24f485e8d..688c7cde515a301595f5ff25aa929b1aebdbd158 100644
+index 0e3a3a9846140c62b2e89174d35bd24fb80699bf..e056a1d52bb666bb49b170cb57434c8e702337a2 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
 @@ -256,6 +256,7 @@ OBJDIR = _obj$(POSTFIX)
@@ -18,7 +18,7 @@ index fb21916a6a79723b2934cfeb0320b2f24f485e8d..688c7cde515a301595f5ff25aa929b1a
  
  ifeq ($(OS),MINGW)
 diff --git a/src/config.c b/src/config.c
-index b97fcea1149aa6839f537655f62ba6f9f380b0da..c4b1ff5fdb8611b86be2f8429239a2c0906df4a6 100644
+index 1a6fa5542372c8d9d872d499c01eed4fb69f0071..5865f72cf39a760481bd4c635ea96cd58eef08c2 100644
 --- a/src/config.c
 +++ b/src/config.c
 @@ -29,6 +29,7 @@
diff --git a/debian/patches/sdl2_mousemode.patch b/debian/patches/sdl2_mousemode.patch
index 7585b76..46bd88d 100644
--- a/debian/patches/sdl2_mousemode.patch
+++ b/debian/patches/sdl2_mousemode.patch
@@ -3,7 +3,7 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/src/plugin.c b/src/plugin.c
-index 5adf21a600be08306ad1c9d93df81a2b38f2723b..5f4839247d59c9fce5455e6696d6a2f8e7691ea9 100644
+index 9e553b1463040b1359e95667e6de2957e8e0abf1..16ad6f7c146c77ef0daf677f22e6a077d8ceec42 100644
 --- a/src/plugin.c
 +++ b/src/plugin.c
 @@ -306,7 +306,7 @@ doSdlKeys(unsigned char* keystate)
@@ -61,7 +61,7 @@ index 5adf21a600be08306ad1c9d93df81a2b38f2723b..5f4839247d59c9fce5455e6696d6a2f8
          {
              mousex_residual = 0;
              mousey_residual = 0;
-@@ -941,7 +957,7 @@ EXPORT void CALL RomClosed(void)
+@@ -944,7 +960,7 @@ EXPORT void CALL RomClosed(void)
  
      // release/ungrab mouse
  #if SDL_VERSION_ATLEAST(2,0,0)
@@ -70,7 +70,7 @@ index 5adf21a600be08306ad1c9d93df81a2b38f2723b..5f4839247d59c9fce5455e6696d6a2f8
  #else
      SDL_WM_GrabInput( SDL_GRAB_OFF );
  #endif
-@@ -978,10 +994,12 @@ EXPORT int CALL RomOpen(void)
+@@ -981,10 +997,12 @@ EXPORT int CALL RomOpen(void)
      // grab mouse
      if (controller[0].mouse || controller[1].mouse || controller[2].mouse || controller[3].mouse)
      {
diff --git a/debian/patches/series b/debian/patches/series
index 9938805..33f561e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 sdl2_forcefeedback.patch
 sdl2_keysym.patch
 sdl2_mousemode.patch
-cflags_gnu_source.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git

More information about the Pkg-games-commits mailing list