[mupen64plus-core] 237/310: Remove upstream merged patches

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:58:07 UTC 2015 

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit e9237068b11dc4165037ce9bd494dfb97a3e120a
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 10:01:27 2013 +0200

    Remove upstream merged patches
---
 debian/changelog                          |  4 ++-
 debian/patches/country_code_bits.patch    | 22 ----------------
 debian/patches/disable_si_dma_busy.patch  | 44 -------------------------------
 debian/patches/sdl2_joystick_events.patch | 19 -------------
 debian/patches/sdl2_keyrepeat.patch       | 29 --------------------
 debian/patches/sdl2_resize.patch          | 34 ------------------------
 debian/patches/series                     |  5 ----
 7 files changed, 3 insertions(+), 154 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6006f5..af62d0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,13 @@ mupen64plus-core (2.0-1) UNRELEASED; urgency=low
   * debian/patches:
     - Add multiple_main.patch, Fix multiple definitions of main in same
       namespace
-    - Add disable_si_dma_busy.patch, Revert implementation of DMA busy bit
     - Remove dejavu-font.patch, Don't use Dejavu fonts because upstream
       uses other font
     - Add bitstream-font.patch, Use font from ttf-bitstream-vera instead
       of installing own copy with libmupen64plus2
+    - Remove upstream merged country_code_bits.patch,
+      sdl2_joystick_events.patch, sdl2_keyrepeat.patch and
+      sdl2_resize.patch
   * debian/control:
     - Build-Depend on debhelper 9.20130604 for support of parameters when
       detecting targets in dh_auto_*
diff --git a/debian/patches/country_code_bits.patch b/debian/patches/country_code_bits.patch
deleted file mode 100644
index 7bc649e..0000000
--- a/debian/patches/country_code_bits.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Ignore upper 8 bit of countrycode when checking for PAL/NTSC system
- Only the lower 8 bits are checked by the country code to system type check to
- decide whether a PAL or NTSC system should be emulated. 8707bea8b73c
- ("1. Update msvc11 project file to visual studio 2012 (msvc11)") changed the
- type to be checked to 16 bit and forgot to mask the upper 8 bits out when doing
- the system check.
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/main/rom.c b/src/main/rom.c
-index be26b0cd684740ad626ce2b6a30801c59c4fc54f..5cd1b3e7cfd5bc13de6279b261c7929f63db2fc8 100644
---- a/src/main/rom.c
-+++ b/src/main/rom.c
-@@ -238,7 +238,7 @@ m64p_error close_rom(void)
- // Get the system type associated to a ROM country code.
- static m64p_system_type rom_country_code_to_system_type(unsigned short country_code)
- {
--    switch (country_code)
-+    switch (country_code & 0xFF)
-     {
-         // PAL codes
-         case 0x44:
diff --git a/debian/patches/disable_si_dma_busy.patch b/debian/patches/disable_si_dma_busy.patch
deleted file mode 100644
index 7155594..0000000
--- a/debian/patches/disable_si_dma_busy.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Revert implementation of DMA busy bit
- The implementation of the SI regiser DMA busy bit caused regressions in
- other programs/roms. The message spam caused in commercial games can be
- tolerated until the cause of the regression is better understood.
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/memory/dma.c b/src/memory/dma.c
-index 7d23b0007e8e1f8bf8d46d20f2e3bf170928b50c..8d606d40e4d430f704ea99055ea42adabab1ee54 100644
---- a/src/memory/dma.c
-+++ b/src/memory/dma.c
-@@ -353,10 +353,6 @@ void dma_si_write(void)
-     }
- 
-     update_pif_write();
--
--    // TODO: under what circumstances should bits 1 or 3 be set?
--    si_register.si_stat |= 1;
--
-     update_count();
-     add_interupt_event(SI_INT, /*0x100*/0x900);
- }
-@@ -378,9 +374,6 @@ void dma_si_read(void)
-         rdram[si_register.si_dram_addr/4+i] = sl(PIF_RAM[i]);
-     }
- 
--    // TODO: under what circumstances should bits 1 or 3 be set?
--    si_register.si_stat |= 1;
--
-     update_count();
-     add_interupt_event(SI_INT, /*0x100*/0x900);
- }
-diff --git a/src/r4300/interupt.c b/src/r4300/interupt.c
-index f44da5b995bb11cbdeda08a0e0c0e5d5c345df52..32255597cdd54dc65b8cc5eb68e94b3f50be7a67 100644
---- a/src/r4300/interupt.c
-+++ b/src/r4300/interupt.c
-@@ -445,7 +445,6 @@ void gen_interupt(void)
-             remove_interupt_event();
-             MI_register.mi_intr_reg |= 0x02;
-             si_register.si_stat |= 0x1000;
--            si_register.si_stat &= ~0x1;
-             if (MI_register.mi_intr_reg & MI_register.mi_intr_mask_reg)
-                 Cause = (Cause | 0x400) & 0xFFFFFF83;
-             else
diff --git a/debian/patches/sdl2_joystick_events.patch b/debian/patches/sdl2_joystick_events.patch
deleted file mode 100644
index 286d609..0000000
--- a/debian/patches/sdl2_joystick_events.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Simply open joystick when needed in SDL2
- The joysticks in SDL2 use reference counting and return just a new reference
- when trying to reopen a joystick. SDL_JoystickOpened is not needed in SDL2.
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/main/eventloop.c b/src/main/eventloop.c
-index fb33aa10f0ca208c4100ca215cf89f78ca1f2a6a..85a06d77d09f2cbca9b1e15cf18e0ede89be0e75 100644
---- a/src/main/eventloop.c
-+++ b/src/main/eventloop.c
-@@ -356,7 +356,7 @@ void event_initialize(void)
-             if (!SDL_WasInit(SDL_INIT_JOYSTICK))
-                 SDL_InitSubSystem(SDL_INIT_JOYSTICK);
- #if SDL_VERSION_ATLEAST(2,0,0)
--#warning SDL_JoystickOpened unsupported
-+            SDL_JoystickOpen(device);
- #else
-             if (!SDL_JoystickOpened(device))
-                 SDL_JoystickOpen(device);
diff --git a/debian/patches/sdl2_keyrepeat.patch b/debian/patches/sdl2_keyrepeat.patch
deleted file mode 100644
index 595dacf..0000000
--- a/debian/patches/sdl2_keyrepeat.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Ignore key repeats caused by the OS keyrepeat setting
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/main/eventloop.c b/src/main/eventloop.c
-index e16141d6b775ed7410069d78aebaab2668c5f84e..fb33aa10f0ca208c4100ca215cf89f78ca1f2a6a 100644
---- a/src/main/eventloop.c
-+++ b/src/main/eventloop.c
-@@ -246,6 +246,9 @@ static int SDLCALL event_sdl_filter(void *userdata, SDL_Event *event)
- 
-         case SDL_KEYDOWN:
- #if SDL_VERSION_ATLEAST(1,3,0)
-+            if (event->key.repeat)
-+                return 0;
-+
-             event_sdl_keydown(event->key.keysym.scancode, event->key.keysym.mod);
- #else
-             event_sdl_keydown(event->key.keysym.sym, event->key.keysym.mod);
-@@ -362,9 +365,7 @@ void event_initialize(void)
-     }
- 
-     /* set up SDL event filter and disable key repeat */
--#if SDL_VERSION_ATLEAST(2,0,0)
--#warning SDL_EnableKeyRepeat unsupported
--#else
-+#if !SDL_VERSION_ATLEAST(2,0,0)
-     SDL_EnableKeyRepeat(0, 0);
- #endif
-     SDL_SetEventFilter(event_sdl_filter, NULL);
diff --git a/debian/patches/sdl2_resize.patch b/debian/patches/sdl2_resize.patch
deleted file mode 100644
index d8ba519..0000000
--- a/debian/patches/sdl2_resize.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Fix compiling against SDL2
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/main/eventloop.c b/src/main/eventloop.c
-index 633a697399c9b9efb793749d5b70022db08c8ce9..e16141d6b775ed7410069d78aebaab2668c5f84e 100644
---- a/src/main/eventloop.c
-+++ b/src/main/eventloop.c
-@@ -259,12 +259,25 @@ static int SDLCALL event_sdl_filter(void *userdata, SDL_Event *event)
- #endif
-             return 0;
- 
-+#if SDL_VERSION_ATLEAST(2,0,0)
-+        case SDL_WINDOWEVENT:
-+            switch (event->window.event) {
-+                case SDL_WINDOWEVENT_RESIZED:
-+                    // call the video plugin.  if the video plugin supports resizing, it will resize its viewport and call
-+                    // VidExt_ResizeWindow to update the window manager handling our opengl output window
-+                    gfx.resizeVideoOutput(event->window.data1, event->window.data2);
-+                    return 0;  // consumed the event
-+                    break;
-+            }
-+            break;
-+#else
-         case SDL_VIDEORESIZE:
-             // call the video plugin.  if the video plugin supports resizing, it will resize its viewport and call
-             // VidExt_ResizeWindow to update the window manager handling our opengl output window
-             gfx.resizeVideoOutput(event->resize.w, event->resize.h);
-             return 0;  // consumed the event
-             break;
-+#endif
- 
-         // if joystick action is detected, check if it's mapped to a special function
-         case SDL_JOYAXISMOTION:
diff --git a/debian/patches/series b/debian/patches/series
index 8f647c8..ba57ee0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,5 @@
 bitstream-font.patch
 printf_fixup.patch
 disable_recompiler_disassembler.patch
-sdl2_resize.patch
-country_code_bits.patch
-sdl2_keyrepeat.patch
-sdl2_joystick_events.patch
 sdl2_keysym.patch
 multiple_main.patch
-disable_si_dma_busy.patch

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

More information about the Pkg-games-commits mailing list