[mupen64plus-core] 301/310: Remove upstream merged two_events_interrupt.patch

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:58:27 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 41dcbfd72c36f999980ce36aecc4a6a24853e2c8
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri May 1 14:49:27 2015 +0200

    Remove upstream merged two_events_interrupt.patch
---
 debian/changelog                                     |  2 ++
 debian/patches/bitstream-font.patch                  | 10 +++++-----
 debian/patches/disable_recompiler_disassembler.patch | 12 ++++++------
 debian/patches/printf_fixup.patch                    | 10 +++++-----
 debian/patches/series                                |  1 -
 debian/patches/two_events_interrupt.patch            | 18 ------------------
 6 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5135f68..1794f76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ mupen64plus-core (2.5-1) UNRELEASED; urgency=medium
     - Update years
     - Fix errors in paths to specific files
     - Add new copyright information
+  * debian/patches:
+    - Remove upstream merged two_events_interrupt.patch
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 28 Sep 2014 23:57:04 +0200
 
diff --git a/debian/patches/bitstream-font.patch b/debian/patches/bitstream-font.patch
index a47bf2f..edbe78b 100644
--- a/debian/patches/bitstream-font.patch
+++ b/debian/patches/bitstream-font.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 23004d334d88e7e49f107f86d6ad4d73374a4f2b..b82286d69545084e99c54afd4813f1a8a8d887fa 100644
+index 56a30a3f41880b1f075b6050feae21779b239bda..f4f26b43f76cea3561d0db2d5103d253f299ffe1 100755
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -557,6 +557,7 @@ install: $(TARGET)
+@@ -633,6 +633,7 @@ install: $(TARGET)
  	$(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
  	$(INSTALL) -m 0644 ../../data/* "$(DESTDIR)$(SHAREDIR)"
@@ -16,10 +16,10 @@ index 23004d334d88e7e49f107f86d6ad4d73374a4f2b..b82286d69545084e99c54afd4813f1a8
  	$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
  	-$(LDCONFIG) "$(DESTDIR)$(LIBDIR)"
 diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
-index 91bed5ec9504864fb30de02176e5bc3283de659b..e70c261e881ae269d6cd55ef8e53817d9bd1e01e 100644
+index 3ccf9ae5df4000e7f76e6261a7f96e29f278f804..9908282bdb7e1c157da9e8d0171d5d73ee7a7636 100644
 --- a/src/osd/osd.cpp
 +++ b/src/osd/osd.cpp
-@@ -40,7 +40,7 @@ extern "C" {
+@@ -46,7 +46,7 @@ extern "C" {
      #include "plugin/plugin.h"
  }
  
@@ -28,7 +28,7 @@ index 91bed5ec9504864fb30de02176e5bc3283de659b..e70c261e881ae269d6cd55ef8e53817d
  
  typedef void (APIENTRYP PTRGLACTIVETEXTURE)(GLenum texture);
  static PTRGLACTIVETEXTURE pglActiveTexture = NULL;
-@@ -231,7 +231,7 @@ void osd_init(int width, int height)
+@@ -237,7 +237,7 @@ void osd_init(int width, int height)
          return;
      }
  
diff --git a/debian/patches/disable_recompiler_disassembler.patch b/debian/patches/disable_recompiler_disassembler.patch
index ac93afc..f693ca5 100644
--- a/debian/patches/disable_recompiler_disassembler.patch
+++ b/debian/patches/disable_recompiler_disassembler.patch
@@ -10,10 +10,10 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index b82286d69545084e99c54afd4813f1a8a8d887fa..d0b68fa0b2970b121e998a5b6a882b977bbe64cd 100644
+index f4f26b43f76cea3561d0db2d5103d253f299ffe1..7d5e8489147e96972af43023a3b11db1d23a82f4 100755
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -503,7 +503,7 @@ ifeq ($(DEBUGGER), 1)
+@@ -575,7 +575,7 @@ ifeq ($(DEBUGGER), 1)
  	$(SRCDIR)/debugger/dbg_decoder.c \
  	$(SRCDIR)/debugger/dbg_memory.c \
  	$(SRCDIR)/debugger/dbg_breakpoints.c
@@ -23,12 +23,12 @@ index b82286d69545084e99c54afd4813f1a8a8d887fa..d0b68fa0b2970b121e998a5b6a882b97
  
  # generate a list of object files to build, make a temporary directory for them
 diff --git a/src/debugger/dbg_memory.c b/src/debugger/dbg_memory.c
-index ffb72312e5d4908ea47f201e8073dc25acacbd78..1650fc441ab22a37a8a0e17fc7dd9168a866ccaa 100644
+index f11304b4b6029650fa145de1b937b8164b694ff4..55f84be1fe886b705aab76b4fa1536483046b542 100644
 --- a/src/debugger/dbg_memory.c
 +++ b/src/debugger/dbg_memory.c
-@@ -75,7 +75,7 @@ static MEMBREAKREAD(read_romd, 8);
- 
- static MEMBREAKWRITE(write_rom, 8);
+@@ -42,7 +42,7 @@
+ #include "si/si_controller.h"
+ #include "vi/vi_controller.h"
  
 -#if !defined(NO_ASM) && (defined(__i386__) || defined(__x86_64__))
 +#if !defined(NO_ASM) && (defined(__i386__) || defined(__x86_64__)) && 0
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
index bd8566c..7e75d62 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@ -6,7 +6,7 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/src/api/callbacks.h b/src/api/callbacks.h
-index 50b67a661b64642041de6042a87a19894ca2876f..55a84bcb9c61339b2795a0c91add3f04d83c0ab8 100644
+index de260c72c1f6a72c70514f4c57ba5f5e2d3943c0..697ef5c026797c32c95f773767f190dd175dcebe 100644
 --- a/src/api/callbacks.h
 +++ b/src/api/callbacks.h
 @@ -32,7 +32,7 @@
@@ -19,10 +19,10 @@ index 50b67a661b64642041de6042a87a19894ca2876f..55a84bcb9c61339b2795a0c91add3f04
  
  #endif /* API_CALLBACKS_H */
 diff --git a/src/debugger/dbg_decoder.c b/src/debugger/dbg_decoder.c
-index 6cd56ba7bac99e08b81374c5c2cdc900d2fb127d..99ff7a92b62a8dde15124abc7eaa070d59daa90b 100644
+index 94cbdc81c70eaedadc4933eb0b198aa9bfa94446..1a036745072800c5e2789d6bf2a536c9644dedcf 100644
 --- a/src/debugger/dbg_decoder.c
 +++ b/src/debugger/dbg_decoder.c
-@@ -228,6 +228,11 @@ lookup_rel_lo16 ( struct r4k_dis_t * state,
+@@ -229,6 +229,11 @@ lookup_rel_lo16 ( struct r4k_dis_t * state,
  static int
  db_printf ( struct r4k_dis_t * state,
              char * fmt, 
@@ -35,10 +35,10 @@ index 6cd56ba7bac99e08b81374c5c2cdc900d2fb127d..99ff7a92b62a8dde15124abc7eaa070d
  {
      int l;
 diff --git a/src/main/main.h b/src/main/main.h
-index 6c7df2a90bf4201de31bdd7e9d253b3fe8fa2da1..9c24a0e4ae8ea33b414199727a0aac0eaf2ebccd 100644
+index 3b4f72c5fe0340832ab13d8270eccf4045ea8236..e556170a63416a9759a3d85942f491ade48411c3 100644
 --- a/src/main/main.h
 +++ b/src/main/main.h
-@@ -42,7 +42,7 @@ void new_frame(void);
+@@ -72,7 +72,7 @@ void new_frame(void);
  void new_vi(void);
  
  int  main_set_core_defaults(void);
diff --git a/debian/patches/series b/debian/patches/series
index 85b98e8..c2b7fb9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 bitstream-font.patch
 printf_fixup.patch
 disable_recompiler_disassembler.patch
-two_events_interrupt.patch
diff --git a/debian/patches/two_events_interrupt.patch b/debian/patches/two_events_interrupt.patch
deleted file mode 100644
index 659b4a2..0000000
--- a/debian/patches/two_events_interrupt.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Don't insert a second interrupt event from same type
-Forwarded: no
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/r4300/interupt.c b/src/r4300/interupt.c
-index 3be39acb8a61c6099182fcdf8f374963daef9d01..d44551cf0484677a21109be10592a539821cf8f7 100644
---- a/src/r4300/interupt.c
-+++ b/src/r4300/interupt.c
-@@ -173,6 +173,8 @@ void add_interupt_event(int type, unsigned int delay)
-    
-     if (get_event(type)) {
-         DebugMessage(M64MSG_WARNING, "two events of type 0x%x in interrupt queue", type);
-+	/* Hack for Wipeout and Perfect Dark */
-+	return;
-     }
-    
-     if (q == NULL)

-- 
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