[mupen64plus] 127/262: Rebuild patches with git-dep3-format

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:59:25 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.

commit b92f234ee22f64cee0d8c91f8fabd918095ee772
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Sep 13 00:08:38 2009 +0200

    Rebuild patches with git-dep3-format
---
 debian/patches/as-needed.patch              | 13 ++---
 debian/patches/debian-archs.patch           |  9 +---
 debian/patches/default-optimisations.patch  |  9 +---
 debian/patches/dejavu-font.patch            |  9 +---
 debian/patches/destdir.patch                |  9 +---
 debian/patches/fix-7z-subfolder.patch       |  9 +---
 debian/patches/fix-desktop-file.patch       |  9 +---
 debian/patches/ftbfs-debugger.patch         |  9 +---
 debian/patches/ftbfs-dynarec.patch          |  9 +---
 debian/patches/ftbfs-glibc210.patch         | 12 ++---
 debian/patches/ftbfs-kfreebsd.patch         | 12 ++---
 debian/patches/glide64-noasm.patch          |  9 +---
 debian/patches/gtk-open-filter.patch        |  9 +---
 debian/patches/plugin-searchpath.patch      |  9 +---
 debian/patches/remove-gln64.patch           | 15 ++----
 debian/patches/remove-nondfsg-icons.patch   | 12 ++---
 debian/patches/rice-screenflickering.patch  |  9 +---
 debian/patches/rice-texturepack-crash.patch |  9 +---
 debian/patches/static-binutils-libs.patch   |  9 +---
 debian/patches/system-libbz2.patch          | 12 ++---
 debian/patches/system-libpng.patch          | 12 ++---
 debian/patches/system-zlib.patch            | 21 +++------
 debian/patches/version-string.patch         |  9 +---
 debian/patches/xdg-basedir.patch            | 73 ++++++++++-------------------
 24 files changed, 82 insertions(+), 235 deletions(-)

diff --git a/debian/patches/as-needed.patch b/debian/patches/as-needed.patch
index baafced..52d04be 100644
--- a/debian/patches/as-needed.patch
+++ b/debian/patches/as-needed.patch
@@ -1,14 +1,10 @@
 Description: Allow compilation using -Wl,--as-needed
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=236
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- blight_input/Makefile |    2 +-
- glN64/Makefile        |    2 +-
- rice_video/Makefile   |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
 
+---
 diff --git a/blight_input/Makefile b/blight_input/Makefile
-index 1948b0e..139cc25 100644
+index 1948b0e196d66b0ce8549a3fea75c114a54271b2..139cc25631e2b23702856faefff35e0090d4f72d 100644
 --- a/blight_input/Makefile
 +++ b/blight_input/Makefile
 @@ -48,7 +48,7 @@ clean:
@@ -21,7 +17,7 @@ index 1948b0e..139cc25 100644
  	$(STRIP) $@
  endif
 diff --git a/rice_video/Makefile b/rice_video/Makefile
-index 62131bf..3de7316 100644
+index 62131bf7d0c107d774557282152ded21194e0c32..3de7316d39f05db7e4a24fed47c96b8574e1be6b 100644
 --- a/rice_video/Makefile
 +++ b/rice_video/Makefile
 @@ -131,7 +131,7 @@ targets:
@@ -33,6 +29,3 @@ index 62131bf..3de7316 100644
  	$(STRIP) $@
  
  clean:
--- 
-1.6.3.1
-
diff --git a/debian/patches/debian-archs.patch b/debian/patches/debian-archs.patch
index 6195518..d9ab326 100644
--- a/debian/patches/debian-archs.patch
+++ b/debian/patches/debian-archs.patch
@@ -11,12 +11,10 @@ Bug: http://code.google.com/p/mupen64plus/issues/detail?id=260
 Bug-Debian: http://bugs.debian.org/544673
 Bug-Debian: http://bugs.debian.org/545463
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- pre.mk |  146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
- 1 files changed, 130 insertions(+), 16 deletions(-)
 
+---
 diff --git a/pre.mk b/pre.mk
-index 5c7b73c..3a2e537 100644
+index 5c7b73c40731e7ac66d285c9fe783c9f250c5ca1..c128cf77aa0ba6eb692ab7528235235633491f02 100644
 --- a/pre.mk
 +++ b/pre.mk
 @@ -19,29 +19,140 @@
@@ -187,6 +185,3 @@ index 5c7b73c..3a2e537 100644
  endif
  
  # set CFLAGS, LIBS, and LDFLAGS for external dependencies
--- 
-1.6.3.3
-
diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index de826cb..e52d19c 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -1,12 +1,10 @@
 Description: Don't override optimisations set by build environment
 Forwarded: not-needed
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- pre.mk |   11 +++--------
- 1 files changed, 3 insertions(+), 8 deletions(-)
 
+---
 diff --git a/pre.mk b/pre.mk
-index 2c74ef5..d208340 100644
+index 2c74ef5bb2fd8f64d246dabb9649cd9b2f01dd84..d2083403872123c8cd2a87e050cf850e208dfa0a 100644
 --- a/pre.mk
 +++ b/pre.mk
 @@ -305,15 +305,13 @@ else
@@ -38,6 +36,3 @@ index 2c74ef5..d208340 100644
  ifeq ($(CPU_ENDIANNESS), BIG)
    CFLAGS += -D_BIG_ENDIAN
  endif
--- 
-1.6.3.3
-
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index eadf815..fc90308 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/dejavu-font.patch
@@ -1,12 +1,10 @@
 Description: Use font from ttf-dejavu-core
 Forwarded: not-needed
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- opengl/osd.cpp |    9 +++------
- 1 files changed, 3 insertions(+), 6 deletions(-)
 
+---
 diff --git a/opengl/osd.cpp b/opengl/osd.cpp
-index ff55864..43e9bfc 100644
+index ff558644d6e55e8eba7c7330ae62e085c0c7b0b1..43e9bfcd1ad1f8b457bc1144f344460503152b3b 100644
 --- a/opengl/osd.cpp
 +++ b/opengl/osd.cpp
 @@ -31,7 +31,7 @@ extern "C" {
@@ -35,6 +33,3 @@ index ff55864..43e9bfc 100644
          return;
      }
  
--- 
-1.6.3.1
-
diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
index bd3c6cc..6a1ce45 100644
--- a/debian/patches/destdir.patch
+++ b/debian/patches/destdir.patch
@@ -1,12 +1,10 @@
 Description: Use DESTDIR during installation
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=231
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
 
+---
 diff --git a/Makefile b/Makefile
-index 0fefdee..aa95eb5 100644
+index 0fefdeeb28ee560368320a96b2cbad433cfa32c9..aa95eb507ff11880ddfdec47f331ec22b0fd5ee7 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -95,7 +95,7 @@ ifeq ($(APPLICATIONSDIR),)
@@ -18,6 +16,3 @@ index 0fefdee..aa95eb5 100644
  
  # list of object files to generate
  OBJ_CORE = \
--- 
-1.6.3.1
-
diff --git a/debian/patches/fix-7z-subfolder.patch b/debian/patches/fix-7z-subfolder.patch
index abd9b24..878046f 100644
--- a/debian/patches/fix-7z-subfolder.patch
+++ b/debian/patches/fix-7z-subfolder.patch
@@ -1,12 +1,10 @@
 Description: Don't segfault when caching 7z archive with subfolders
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=256
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- main/rom.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
 
+---
 diff --git a/main/rom.c b/main/rom.c
-index 74c9643..2772545 100644
+index 74c9643f861b1c8218baa8a00c9a17ec3106d695..2772545a45eda189f88476f6097aef3a065a663e 100644
 --- a/main/rom.c
 +++ b/main/rom.c
 @@ -415,6 +415,8 @@ unsigned char* load_archive_rom(const char* filename, int* romsize, unsigned cha
@@ -18,6 +16,3 @@ index 74c9643..2772545 100644
                  if(is_valid_rom(*outBuffer+offset))
                      {
                      *romsize=f->Size;
--- 
-1.6.3.3
-
diff --git a/debian/patches/fix-desktop-file.patch b/debian/patches/fix-desktop-file.patch
index 46a42e2..5c21443 100644
--- a/debian/patches/fix-desktop-file.patch
+++ b/debian/patches/fix-desktop-file.patch
@@ -1,12 +1,10 @@
 Description: Fix desktop file
 Forwarded: no
 Author: Félix Arreola Rodríguez <fgatuno.123 at gmail.com>
----
- mupen64plus.desktop.in |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
 
+---
 diff --git a/mupen64plus.desktop.in b/mupen64plus.desktop.in
-index c532dce..e21d512 100644
+index c532dce04e189c80609e6f4d4df92f3d79bb6063..e21d512ba98b8a9556e8f93dd3939a1bcde7c657 100644
 --- a/mupen64plus.desktop.in
 +++ b/mupen64plus.desktop.in
 @@ -1,11 +1,10 @@
@@ -23,6 +21,3 @@ index c532dce..e21d512 100644
  GenericName=Nintendo 64 Emulator
 -Categories=Qt;Game;
 +Categories=Application;Game;
--- 
-1.6.3.1
-
diff --git a/debian/patches/ftbfs-debugger.patch b/debian/patches/ftbfs-debugger.patch
index dd8f189..735e544 100644
--- a/debian/patches/ftbfs-debugger.patch
+++ b/debian/patches/ftbfs-debugger.patch
@@ -8,12 +8,10 @@ Bug: http://code.google.com/p/mupen64plus/issues/detail?id=259
 Bug-Debian: http://bugs.debian.org/544549
 Bug-Debian: http://bugs.debian.org/544662
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- debugger/memory.c |   22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
 
+---
 diff --git a/debugger/memory.c b/debugger/memory.c
-index d6c049d..7598cc6 100644
+index d6c049d3b9f0be66094e04e97a2663e9ea693273..3837260dbfef16fb327b07586faa6a7c57d16d38 100644
 --- a/debugger/memory.c
 +++ b/debugger/memory.c
 @@ -210,6 +210,8 @@ int get_has_recompiled(uint32 addr)
@@ -52,6 +50,3 @@ index d6c049d..7598cc6 100644
  void init_host_disassembler(void)
  {
  
--- 
-1.6.3.3
-
diff --git a/debian/patches/ftbfs-dynarec.patch b/debian/patches/ftbfs-dynarec.patch
index edc288c..a579067 100644
--- a/debian/patches/ftbfs-dynarec.patch
+++ b/debian/patches/ftbfs-dynarec.patch
@@ -4,12 +4,10 @@ Description: Don't try to compile dynarec with not unknown dynarec architecture
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=258
 Bug-Debian: http://bugs.debian.org/544548
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- Makefile |   32 +++++++++++++++++---------------
- 1 files changed, 17 insertions(+), 15 deletions(-)
 
+---
 diff --git a/Makefile b/Makefile
-index dac741e..01493e6 100644
+index dac741e0ae8913d9220598d0ff6e95cf5016cf6a..01493e6e7f70fcd49ec784b97b54882404dbb599 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -157,22 +157,24 @@ ifneq ($(NO_ASM), 1)
@@ -52,6 +50,3 @@ index dac741e..01493e6 100644
  else
    OBJ_DYNAREC = r4300/empty_dynarec.o
  endif
--- 
-1.6.3.3
-
diff --git a/debian/patches/ftbfs-glibc210.patch b/debian/patches/ftbfs-glibc210.patch
index 3b49cf2..2be36e6 100644
--- a/debian/patches/ftbfs-glibc210.patch
+++ b/debian/patches/ftbfs-glibc210.patch
@@ -6,13 +6,10 @@ Description: Fix FTBFS using g++-4.4 and libc 2.10 due to missing const keywords
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=261
 Bug-Debian: http://bugs.debian.org/545462
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- glide64/Combine.cpp |    2 +-
- glide64/Main.cpp    |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
 
+---
 diff --git a/glide64/Combine.cpp b/glide64/Combine.cpp
-index 7033f60..a7cbba6 100644
+index 7033f608d364444e45672843397043c80cb2d121..a7cbba61d770f89f2602ccaa0644f2d242ef1e2b 100644
 --- a/glide64/Combine.cpp
 +++ b/glide64/Combine.cpp
 @@ -11873,7 +11873,7 @@ void InitCombine ()
@@ -25,7 +22,7 @@ index 7033f60..a7cbba6 100644
        LOG ("extensions ");
        cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt");
 diff --git a/glide64/Main.cpp b/glide64/Main.cpp
-index eb96438..d013f1d 100644
+index eb96438d899eadaa00eb494ff41980f23d6f1231..d013f1da37bd4cd7cdfc484942ceaaa618d2fc10 100644
 --- a/glide64/Main.cpp
 +++ b/glide64/Main.cpp
 @@ -784,7 +784,7 @@ BOOL InitGfx (BOOL evoodoo_using_window)
@@ -37,6 +34,3 @@ index eb96438..d013f1d 100644
      {
        if (!strncmp(extstr, "TEXTUREBUFFER", 13)) 
        {
--- 
-1.6.3.3
-
diff --git a/debian/patches/ftbfs-kfreebsd.patch b/debian/patches/ftbfs-kfreebsd.patch
index 1164326..813d5eb 100644
--- a/debian/patches/ftbfs-kfreebsd.patch
+++ b/debian/patches/ftbfs-kfreebsd.patch
@@ -2,13 +2,10 @@ Description: Don't stop build of kFreeBSD due to unknown OS
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=257
 Bug-Debian: http://bugs.debian.org/544550
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- glide64/Ini.cpp            |    2 +-
- glide64/wrapper/glidesys.h |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
 
+---
 diff --git a/glide64/Ini.cpp b/glide64/Ini.cpp
-index bc4faee..23bacf1 100644
+index bc4faee7e0144080a02fd857ae0c20f9b209a581..23bacf1b2344f8b37b53ce404db79fdfe6e4beb3 100644
 --- a/glide64/Ini.cpp
 +++ b/glide64/Ini.cpp
 @@ -74,7 +74,7 @@ BOOL INI_Open ()
@@ -21,7 +18,7 @@ index bc4faee..23bacf1 100644
  #else
     int n = readlink("/proc/self/exe", path, PATH_MAX);
 diff --git a/glide64/wrapper/glidesys.h b/glide64/wrapper/glidesys.h
-index c9716b9..d9138a4 100644
+index c9716b9baa325b7c35cf6a7fb4076c33346d9997..d9138a4dfcaeacd0231b64145c8c229875d7239a 100644
 --- a/glide64/wrapper/glidesys.h
 +++ b/glide64/wrapper/glidesys.h
 @@ -111,7 +111,7 @@ n** -----------------------------------------------------------------------
@@ -33,6 +30,3 @@ index c9716b9..d9138a4 100644
  #  define GLIDE_OS        GLIDE_OS_UNIX
  #elif defined(__DOS__)
  #  define GLIDE_OS        GLIDE_OS_DOS32
--- 
-1.6.3.3
-
diff --git a/debian/patches/glide64-noasm.patch b/debian/patches/glide64-noasm.patch
index 01a28d9..b272579 100644
--- a/debian/patches/glide64-noasm.patch
+++ b/debian/patches/glide64-noasm.patch
@@ -1,12 +1,10 @@
 Description: Don't include x86-asm in non-x86 plattforms
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=237
 Author: Richard Goedeken <Richard at fascinationsoftware.com>
----
- glide64/rdp.cpp |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
 
+---
 diff --git a/glide64/rdp.cpp b/glide64/rdp.cpp
-index eec21d3..d2aa4b6 100644
+index eec21d3127cbe97375d2979bab83820a1e9cf3ca..d2aa4b623618fd49245ee9ab73ec2a0f02803f61 100644
 --- a/glide64/rdp.cpp
 +++ b/glide64/rdp.cpp
 @@ -60,8 +60,14 @@ DWORD frame_count;  // frame counter
@@ -26,6 +24,3 @@ index eec21d3..d2aa4b6 100644
  
  // global strings
  const char *ACmp[4] = { "NONE", "THRESHOLD", "UNKNOWN", "DITHER" };
--- 
-1.6.3.1
-
diff --git a/debian/patches/gtk-open-filter.patch b/debian/patches/gtk-open-filter.patch
index 83efe54..994c8dc 100644
--- a/debian/patches/gtk-open-filter.patch
+++ b/debian/patches/gtk-open-filter.patch
@@ -9,12 +9,10 @@ Description: Show *.n64 and *.v64 in filtered gtk open dialog
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=264
 Bug-Debian: http://bugs.debian.org/546046
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- main/gui_gtk/main_gtk.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
 
+---
 diff --git a/main/gui_gtk/main_gtk.c b/main/gui_gtk/main_gtk.c
-index e8c0fd6..41d382e 100644
+index e8c0fd6fbf175891e19e4260fa5165076643668a..41d382ebd2650dd48f5b93bf788ee32fca26e807 100644
 --- a/main/gui_gtk/main_gtk.c
 +++ b/main/gui_gtk/main_gtk.c
 @@ -428,7 +428,7 @@ static void callback_open_rom(GtkWidget* widget, gpointer data)
@@ -26,6 +24,3 @@ index e8c0fd6..41d382e 100644
      gtk_file_filter_add_pattern(file_filter, "*.lzma");
      gtk_file_filter_add_pattern(file_filter, "*.7z");
  
--- 
-1.6.3.3
-
diff --git a/debian/patches/plugin-searchpath.patch b/debian/patches/plugin-searchpath.patch
index ecfe374..55b40be 100644
--- a/debian/patches/plugin-searchpath.patch
+++ b/debian/patches/plugin-searchpath.patch
@@ -1,12 +1,10 @@
 Description: Use /usr/lib/mupen64plus as plugin searchpath
 Forwarded: not-needed
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- main/main.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
 
+---
 diff --git a/main/main.c b/main/main.c
-index e355091..d57bafd 100644
+index e35509185d07a035fb5e2b6cb9e08a03d708a544..d57bafdce73ecf047898b36fd705a4d586fe8c0b 100644
 --- a/main/main.c
 +++ b/main/main.c
 @@ -1476,8 +1476,7 @@ int main(int argc, char *argv[])
@@ -19,6 +17,3 @@ index e355091..d57bafd 100644
          dirpath[PATH_MAX-1] = '\0';
      }
      // scan the plugin directory and set the config dir for the plugins
--- 
-1.6.3.1
-
diff --git a/debian/patches/remove-gln64.patch b/debian/patches/remove-gln64.patch
index 4add4c5..14b8262 100644
--- a/debian/patches/remove-gln64.patch
+++ b/debian/patches/remove-gln64.patch
@@ -1,14 +1,10 @@
 Description: Remove non-dfsg clean glN64 from build
 Forwarded: not-needed
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- Makefile                           |    8 +-------
- tools/regtests/daily-tests.cfg     |    1 -
- tools/regtests/regression-video.py |    4 ++--
- 3 files changed, 3 insertions(+), 10 deletions(-)
 
+---
 diff --git a/Makefile b/Makefile
-index 5f7abac..4926931 100644
+index 5f7abac0f1a02675ea84373e99c6e0b66c0e3773..4926931b0c9b1fc823edb13c83515086f3d80378 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -226,7 +226,6 @@ OBJ_QT4_GUI = main/gui_qt4/libgui_qt4.a
@@ -47,7 +43,7 @@ index 5f7abac..4926931 100644
  	$(MAKE) -C rice_video all
  	@$(CP) ./rice_video/ricevideo.$(SO_EXTENSION) ./plugins/ricevideo.$(SO_EXTENSION)
 diff --git a/tools/regtests/daily-tests.cfg b/tools/regtests/daily-tests.cfg
-index fdee13b..001f961 100644
+index fdee13b54b01ce437556f93129438277936daecf..001f96111961e33b7a5f159eb6dc18cf9a86255d 100644
 --- a/tools/regtests/daily-tests.cfg
 +++ b/tools/regtests/daily-tests.cfg
 @@ -79,7 +79,6 @@ screenshots = 27, 527
@@ -59,7 +55,7 @@ index fdee13b..001f961 100644
  [Iggy's Reckin' Balls.z64]
  screenshots = 142, 493, 531, 726, 824
 diff --git a/tools/regtests/regression-video.py b/tools/regtests/regression-video.py
-index 5b2fad0..34e9d6f 100755
+index 5b2fad0d8a70d3a031433938cf08074af025573f..34e9d6f57af5a9a251e56732b8ed19e7ddad34b4 100755
 --- a/tools/regtests/regression-video.py
 +++ b/tools/regtests/regression-video.py
 @@ -137,7 +137,7 @@ def BuildSource(srcdir, buildname, buildmake, istest):
@@ -80,6 +76,3 @@ index 5b2fad0..34e9d6f 100755
          self.thisdate = str(date.today())
  
      def LoadConfig(self, filename):
--- 
-1.6.3.1
-
diff --git a/debian/patches/remove-nondfsg-icons.patch b/debian/patches/remove-nondfsg-icons.patch
index 0260a32..e42f857 100644
--- a/debian/patches/remove-nondfsg-icons.patch
+++ b/debian/patches/remove-nondfsg-icons.patch
@@ -1,13 +1,10 @@
 Description: Remove non-dfsg clean icons from build
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=239
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- glide64/messagebox_gtk2.c  |   26 --------------------------
- glide64/messagebox_qt4.cpp |   24 ------------------------
- 2 files changed, 0 insertions(+), 50 deletions(-)
 
+---
 diff --git a/glide64/messagebox_gtk2.c b/glide64/messagebox_gtk2.c
-index 349666e..28acfd9 100644
+index 349666ec1898330d9617e24cf4c43614eb5d53ee..28acfd906b6c7e86c07274a44309837808e01a54 100644
 --- a/glide64/messagebox_gtk2.c
 +++ b/glide64/messagebox_gtk2.c
 @@ -23,12 +23,6 @@
@@ -51,7 +48,7 @@ index 349666e..28acfd9 100644
      {
          gtk_box_pack_start( GTK_BOX(hbox), icon, FALSE, FALSE, 0 );
 diff --git a/glide64/messagebox_qt4.cpp b/glide64/messagebox_qt4.cpp
-index e8ffc3b..9bddd86 100644
+index e8ffc3bb0080f3b35b330535abf9f4fc785d8a8a..9bddd868263de1761fee5ff28d6e1f3e76cc3a7a 100644
 --- a/glide64/messagebox_qt4.cpp
 +++ b/glide64/messagebox_qt4.cpp
 @@ -30,11 +30,6 @@
@@ -92,6 +89,3 @@ index e8ffc3b..9bddd86 100644
      QObject* target = 0;
      foreach (QWidget* w, qApp->topLevelWidgets()) {
          if (w->inherits("MainWindow")) {
--- 
-1.6.3.1
-
diff --git a/debian/patches/rice-screenflickering.patch b/debian/patches/rice-screenflickering.patch
index e3d1f65..e8f3baa 100644
--- a/debian/patches/rice-screenflickering.patch
+++ b/debian/patches/rice-screenflickering.patch
@@ -1,11 +1,9 @@
 Description: Fix screenflickering in some games with rice_video
 Author: Richard Goedeken <Richard at fascinationsoftware.com>
----
- config/RiceVideoLinux.ini |   40 +++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 39 insertions(+), 1 deletions(-)
 
+---
 diff --git a/config/RiceVideoLinux.ini b/config/RiceVideoLinux.ini
-index e2a476a..92fc73a 100644
+index e2a476a3081a1988ce9aa19abe997007772e6e13..92fc73a64f947392ffcf32d38dc1608fff645575 100644
 --- a/config/RiceVideoLinux.ini
 +++ b/config/RiceVideoLinux.ini
 @@ -253,6 +253,7 @@ Name=SIM CITY 2000
@@ -115,6 +113,3 @@ index e2a476a..92fc73a 100644
 +{71458cfac0f9e7bb-45}
 +Name=MICKEY USA
 +
--- 
-1.6.3.1
-
diff --git a/debian/patches/rice-texturepack-crash.patch b/debian/patches/rice-texturepack-crash.patch
index b14855d..5b5ffe6 100644
--- a/debian/patches/rice-texturepack-crash.patch
+++ b/debian/patches/rice-texturepack-crash.patch
@@ -1,12 +1,10 @@
 Description: Fix segfault in rice_video using TexturePack
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=194
 Author: OJ <olejl77 at gmail.com>
----
- rice_video/TextureFilters.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
 
+---
 diff --git a/rice_video/TextureFilters.cpp b/rice_video/TextureFilters.cpp
-index 59eb85c..e59f797 100644
+index 59eb85c5227d0fcbb8ab0274e685e6d3ec743809..e59f797e6cdd8db77f0ea31b3d126e8ec827daa5 100644
 --- a/rice_video/TextureFilters.cpp
 +++ b/rice_video/TextureFilters.cpp
 @@ -891,7 +891,7 @@ typedef struct {
@@ -18,6 +16,3 @@ index 59eb85c..e59f797 100644
      char AlphaNameTail[20];
      TextureType type;
      bool        bSeparatedAlpha;
--- 
-1.6.3.1
-
diff --git a/debian/patches/static-binutils-libs.patch b/debian/patches/static-binutils-libs.patch
index 48ada2b..a80b987 100644
--- a/debian/patches/static-binutils-libs.patch
+++ b/debian/patches/static-binutils-libs.patch
@@ -1,12 +1,10 @@
 Description: Link binutils libraries with unstable abi as static library
 Forwarded: not-needed
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- Makefile |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
 
+---
 diff --git a/Makefile b/Makefile
-index 4926931..be81163 100644
+index 4926931b0c9b1fc823edb13c83515086f3d80378..be81163f0a6aa91b109dc25c7bd3ce20d99d0370 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -238,11 +238,12 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
@@ -32,6 +30,3 @@ index 4926931..be81163 100644
  ifneq ($(OS), WINDOWS)
  	$(STRIP) $@
  endif
--- 
-1.6.3.3
-
diff --git a/debian/patches/system-libbz2.patch b/debian/patches/system-libbz2.patch
index 8c04992..e0b0fb1 100644
--- a/debian/patches/system-libbz2.patch
+++ b/debian/patches/system-libbz2.patch
@@ -1,13 +1,10 @@
 Description: Use libbz2 from system instead of buildin one
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=235
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- Makefile   |   11 ++---------
- main/rom.c |    2 +-
- 2 files changed, 3 insertions(+), 10 deletions(-)
 
+---
 diff --git a/Makefile b/Makefile
-index 3e46873..5f7abac 100644
+index 3e468730d4f5a3315ee530f63008b7b80c346fdf..5f7abac0f1a02675ea84373e99c6e0b66c0e3773 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -110,13 +110,6 @@ OBJ_CORE = \
@@ -43,7 +40,7 @@ index 3e46873..5f7abac 100644
  	$(RM_F) main/gui_qt4/moc_* main/gui_qt4/ui_*.h main/gui_qt4/*.o main/gui_qt4/*.a main/gui_qt4/Makefile
  	$(RM_F) translations/*.qm
 diff --git a/main/rom.c b/main/rom.c
-index 8654517..74c9643 100644
+index 865451793ec78b18854993957ef96ab24b9ad52d..74c9643f861b1c8218baa8a00c9a17ec3106d695 100644
 --- a/main/rom.c
 +++ b/main/rom.c
 @@ -28,7 +28,7 @@
@@ -55,6 +52,3 @@ index 8654517..74c9643 100644
  #include "lzma/lzmadec.h"
  #include "7zip/7zExtract.h"
  #include "7zip/7zCrc.h"
--- 
-1.6.3.1
-
diff --git a/debian/patches/system-libpng.patch b/debian/patches/system-libpng.patch
index 57c8961..9829797 100644
--- a/debian/patches/system-libpng.patch
+++ b/debian/patches/system-libpng.patch
@@ -1,13 +1,10 @@
 Description: Use libpng from system instead of buildin one
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=235
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- rice_video/Makefile         |   16 +---------------
- rice_video/liblinux/pngrw.c |    3 +--
- 2 files changed, 2 insertions(+), 17 deletions(-)
 
+---
 diff --git a/rice_video/Makefile b/rice_video/Makefile
-index 3de7316..02c9ad4 100644
+index 3de7316d39f05db7e4a24fed47c96b8574e1be6b..02c9ad4ad834ea3f4575b5b87ff3569f1589eded 100644
 --- a/rice_video/Makefile
 +++ b/rice_video/Makefile
 @@ -76,26 +76,12 @@ OBJECTS = OGLGraphicsContext.o \
@@ -47,7 +44,7 @@ index 3de7316..02c9ad4 100644
  
  clean:
 diff --git a/rice_video/liblinux/pngrw.c b/rice_video/liblinux/pngrw.c
-index 039cb98..673741a 100644
+index 039cb9838bc2796a52f906af7fb3ac4554136378..673741adbc1d75499100624572a6512fdefd39dc 100644
 --- a/rice_video/liblinux/pngrw.c
 +++ b/rice_video/liblinux/pngrw.c
 @@ -29,13 +29,12 @@
@@ -65,6 +62,3 @@ index 039cb98..673741a 100644
  
  #ifndef png_jmpbuf
  #  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
--- 
-1.6.3.1
-
diff --git a/debian/patches/system-zlib.patch b/debian/patches/system-zlib.patch
index 31157c8..9063448 100644
--- a/debian/patches/system-zlib.patch
+++ b/debian/patches/system-zlib.patch
@@ -1,16 +1,10 @@
 Description: Use zlib from system instead of buildin one
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=235
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- Makefile            |    1 -
- main/zip/ioapi.c    |    2 +-
- main/zip/unzip.c    |    2 +-
- main/zip/unzip.h    |    2 +-
- rice_video/Makefile |   11 -----------
- 5 files changed, 3 insertions(+), 15 deletions(-)
 
+---
 diff --git a/Makefile b/Makefile
-index aa95eb5..3e46873 100644
+index aa95eb507ff11880ddfdec47f331ec22b0fd5ee7..3e468730d4f5a3315ee530f63008b7b80c346fdf 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -104,7 +104,6 @@ OBJ_CORE = \
@@ -22,7 +16,7 @@ index aa95eb5..3e46873 100644
  	main/plugin.o \
  	main/rom.o \
 diff --git a/main/zip/ioapi.c b/main/zip/ioapi.c
-index 0df3ab1..7e55286 100644
+index 0df3ab1a9b2bbe9958f9ce48900c40361955ed65..7e552869c63e373f1296d5e30179372cabf8e0c7 100644
 --- a/main/zip/ioapi.c
 +++ b/main/zip/ioapi.c
 @@ -22,7 +22,7 @@
@@ -35,7 +29,7 @@ index 0df3ab1..7e55286 100644
  
  
 diff --git a/main/zip/unzip.c b/main/zip/unzip.c
-index 7644ac6..0d9234d 100644
+index 7644ac6ba11b2fac92031fa3c61887957502e0e5..0d9234dbba73dad39097ea8e6b0a8afc1bc22ed0 100644
 --- a/main/zip/unzip.c
 +++ b/main/zip/unzip.c
 @@ -48,7 +48,7 @@ woven in by Terry Thorsen 1/2003.
@@ -48,7 +42,7 @@ index 7644ac6..0d9234d 100644
  
  #ifdef STDC
 diff --git a/main/zip/unzip.h b/main/zip/unzip.h
-index ec7c1ee..faa23af 100644
+index ec7c1eee0b32624fd1adc8ecaadfc364e588493e..faa23af51a1334d00d383d27c25fc84cf42e24bb 100644
 --- a/main/zip/unzip.h
 +++ b/main/zip/unzip.h
 @@ -50,7 +50,7 @@ extern "C" {
@@ -61,7 +55,7 @@ index ec7c1ee..faa23af 100644
  
  #ifndef _ZLIBIOAPI_H
 diff --git a/rice_video/Makefile b/rice_video/Makefile
-index 02c9ad4..2784bcd 100644
+index 02c9ad4ad834ea3f4575b5b87ff3569f1589eded..2784bcd33ceda5cfea2dc5f655153a2074a69909 100644
 --- a/rice_video/Makefile
 +++ b/rice_video/Makefile
 @@ -80,18 +80,7 @@ OBJECTS = OGLGraphicsContext.o \
@@ -83,6 +77,3 @@ index 02c9ad4..2784bcd 100644
  	OGLRenderExt.o
  
  GTKOBJECTS = \
--- 
-1.6.3.1
-
diff --git a/debian/patches/version-string.patch b/debian/patches/version-string.patch
index 9cc59db..210f9de 100644
--- a/debian/patches/version-string.patch
+++ b/debian/patches/version-string.patch
@@ -1,12 +1,10 @@
 Description: Remove misleading -development in version string
 Forwarded: not-needed
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- pre.mk |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
 
+---
 diff --git a/pre.mk b/pre.mk
-index c128cf7..2c74ef5 100644
+index c128cf77aa0ba6eb692ab7528235235633491f02..2c74ef5bb2fd8f64d246dabb9649cd9b2f01dd84 100644
 --- a/pre.mk
 +++ b/pre.mk
 @@ -293,8 +293,8 @@ ifneq ($(RELEASE),)
@@ -20,6 +18,3 @@ index c128cf7..2c74ef5 100644
    else
      SVN_REVISION = $(shell svn info ./ 2>/dev/null | sed -n '/^Revision: /s/^Revision: //p')
      SVN_BRANCH = $(shell svn info ./ 2>/dev/null | sed -n '/^URL: /s/.*mupen64plus.//1p')
--- 
-1.6.3.3
-
diff --git a/debian/patches/xdg-basedir.patch b/debian/patches/xdg-basedir.patch
index bdc4f6f..c7fee53 100644
--- a/debian/patches/xdg-basedir.patch
+++ b/debian/patches/xdg-basedir.patch
@@ -33,32 +33,10 @@ Description: Use XDG Base Directory compliant directories
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=137
 Bug-Debian: http://bugs.debian.org/544428
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- Makefile                      |    3 +-
- blight_input/Input_1.1.h      |   22 +++++++
- doc/Audio_1.1.h               |   22 +++++++
- doc/Audio_1.2.h               |   22 +++++++
- doc/Graphics_1.3.h            |   22 +++++++
- doc/Input_1.1.h               |   22 +++++++
- dummy_audio/Audio_1.1.h       |   22 +++++++
- dummy_input/Input_1.1.h       |   22 +++++++
- dummy_video/Graphics_1.3.h    |   22 +++++++
- glide64/Gfx1.3.h              |   22 +++++++
- jttl_audio/Audio_1.2.h        |   22 +++++++
- main/main.c                   |  123 ++++++++++++++++++++++++++++++++++------
- main/main.h                   |    2 +
- main/plugin.c                 |   12 ++++-
- main/plugin.h                 |    2 +-
- main/romcache.c               |    2 +-
- pre.mk                        |    9 +++
- rice_video/Graphics_1.3.h     |   22 +++++++
- rice_video/TextureFilters.cpp |    8 +-
- rice_video/Video.cpp          |   80 +++++++++++++++++++++++++-
- rsp_hle/Audio_1.1.h           |   22 +++++++
- 21 files changed, 474 insertions(+), 31 deletions(-)
 
+---
 diff --git a/Makefile b/Makefile
-index be81163..dac741e 100644
+index be81163f0a6aa91b109dc25c7bd3ce20d99d0370..dac741e0ae8913d9220598d0ff6e95cf5016cf6a 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -237,8 +237,9 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
@@ -73,7 +51,7 @@ index be81163..dac741e 100644
  # add extra objects and libraries for selected options
  ifeq ($(DBG), 1)
 diff --git a/blight_input/Input_1.1.h b/blight_input/Input_1.1.h
-index c2ae4a6..1a22c4b 100644
+index c2ae4a6220976628c0d2cc4060e452b8b49e14e1..1a22c4b36dfd19f293d55e2c170c7e841f9628fe 100644
 --- a/blight_input/Input_1.1.h
 +++ b/blight_input/Input_1.1.h
 @@ -251,6 +251,28 @@ EXPORT void CALL WM_KeyUp( WPARAM wParam, LPARAM lParam );
@@ -106,7 +84,7 @@ index c2ae4a6..1a22c4b 100644
  }
  #endif
 diff --git a/doc/Audio_1.1.h b/doc/Audio_1.1.h
-index ea46b2d..7a6f68b 100644
+index ea46b2d733d7f76f0dd6c67f654d678fb49afc60..7a6f68b4f7373759a1eaa86b4382a71e938aa634 100644
 --- a/doc/Audio_1.1.h
 +++ b/doc/Audio_1.1.h
 @@ -224,6 +224,28 @@ EXPORT void CALL RomClosed (void);
@@ -139,7 +117,7 @@ index ea46b2d..7a6f68b 100644
  }
  #endif
 diff --git a/doc/Audio_1.2.h b/doc/Audio_1.2.h
-index 0decf07..43045c2 100644
+index 0decf078c2cc8c70c422f0df0dc818ba309408a5..43045c235b57bd43f6ee664cfb8a4339f64ac70c 100644
 --- a/doc/Audio_1.2.h
 +++ b/doc/Audio_1.2.h
 @@ -239,6 +239,28 @@ EXPORT void CALL SetConfigDir( char *configDir );
@@ -172,7 +150,7 @@ index 0decf07..43045c2 100644
    Purpose:  To increase the audio volume
    input:    none
 diff --git a/doc/Graphics_1.3.h b/doc/Graphics_1.3.h
-index 0f7843d..ed933b3 100644
+index 0f7843dd5482632c0fdc2f7ba4ef3f9f69d56f54..ed933b30f6ca1d56327fa1412679eaf605d8bf6c 100644
 --- a/doc/Graphics_1.3.h
 +++ b/doc/Graphics_1.3.h
 @@ -306,6 +306,28 @@ EXPORT void CALL SetConfigDir( char *configDir );
@@ -205,7 +183,7 @@ index 0f7843d..ed933b3 100644
    Purpose:  Allows emulator to register a callback function that will
              be called by the graphics plugin just before the the
 diff --git a/doc/Input_1.1.h b/doc/Input_1.1.h
-index c2ae4a6..1a22c4b 100644
+index c2ae4a6220976628c0d2cc4060e452b8b49e14e1..1a22c4b36dfd19f293d55e2c170c7e841f9628fe 100644
 --- a/doc/Input_1.1.h
 +++ b/doc/Input_1.1.h
 @@ -251,6 +251,28 @@ EXPORT void CALL WM_KeyUp( WPARAM wParam, LPARAM lParam );
@@ -238,7 +216,7 @@ index c2ae4a6..1a22c4b 100644
  }
  #endif
 diff --git a/dummy_audio/Audio_1.1.h b/dummy_audio/Audio_1.1.h
-index ea46b2d..7a6f68b 100644
+index ea46b2d733d7f76f0dd6c67f654d678fb49afc60..7a6f68b4f7373759a1eaa86b4382a71e938aa634 100644
 --- a/dummy_audio/Audio_1.1.h
 +++ b/dummy_audio/Audio_1.1.h
 @@ -224,6 +224,28 @@ EXPORT void CALL RomClosed (void);
@@ -271,7 +249,7 @@ index ea46b2d..7a6f68b 100644
  }
  #endif
 diff --git a/dummy_input/Input_1.1.h b/dummy_input/Input_1.1.h
-index c2ae4a6..1a22c4b 100644
+index c2ae4a6220976628c0d2cc4060e452b8b49e14e1..1a22c4b36dfd19f293d55e2c170c7e841f9628fe 100644
 --- a/dummy_input/Input_1.1.h
 +++ b/dummy_input/Input_1.1.h
 @@ -251,6 +251,28 @@ EXPORT void CALL WM_KeyUp( WPARAM wParam, LPARAM lParam );
@@ -304,7 +282,7 @@ index c2ae4a6..1a22c4b 100644
  }
  #endif
 diff --git a/dummy_video/Graphics_1.3.h b/dummy_video/Graphics_1.3.h
-index 0f7843d..ed933b3 100644
+index 0f7843dd5482632c0fdc2f7ba4ef3f9f69d56f54..ed933b30f6ca1d56327fa1412679eaf605d8bf6c 100644
 --- a/dummy_video/Graphics_1.3.h
 +++ b/dummy_video/Graphics_1.3.h
 @@ -306,6 +306,28 @@ EXPORT void CALL SetConfigDir( char *configDir );
@@ -337,7 +315,7 @@ index 0f7843d..ed933b3 100644
    Purpose:  Allows emulator to register a callback function that will
              be called by the graphics plugin just before the the
 diff --git a/glide64/Gfx1.3.h b/glide64/Gfx1.3.h
-index b34c1b4..91bd0e6 100644
+index b34c1b45c5fdba255f6036f80716a970d833e25e..91bd0e6ca3e96dada16177021c43fa9e658c17af 100644
 --- a/glide64/Gfx1.3.h
 +++ b/glide64/Gfx1.3.h
 @@ -754,6 +754,28 @@ EXPORT void CALL SetConfigDir( char *configDir );
@@ -370,7 +348,7 @@ index b34c1b4..91bd0e6 100644
    Purpose:  Allows emulator to register a callback function that will
              be called by the graphics plugin just before the the
 diff --git a/jttl_audio/Audio_1.2.h b/jttl_audio/Audio_1.2.h
-index 0decf07..43045c2 100644
+index 0decf078c2cc8c70c422f0df0dc818ba309408a5..43045c235b57bd43f6ee664cfb8a4339f64ac70c 100644
 --- a/jttl_audio/Audio_1.2.h
 +++ b/jttl_audio/Audio_1.2.h
 @@ -239,6 +239,28 @@ EXPORT void CALL SetConfigDir( char *configDir );
@@ -403,7 +381,7 @@ index 0decf07..43045c2 100644
    Purpose:  To increase the audio volume
    input:    none
 diff --git a/main/main.c b/main/main.c
-index d57bafd..3c88498 100644
+index d57bafdce73ecf047898b36fd705a4d586fe8c0b..3c88498b7ccd3892e92fb6354085cace7f8ce2f0 100644
 --- a/main/main.c
 +++ b/main/main.c
 @@ -34,6 +34,8 @@
@@ -509,10 +487,10 @@ index d57bafd..3c88498 100644
  #else
      char buf[PATH_MAX], buf2[PATH_MAX];
 +    xdgHandle xdgbasedirs;
-+
-+    xdgInitHandle(&xdgbasedirs);
  
 -    // if the config dir was not specified at the commandline, look for ~/.mupen64plus dir
++    xdgInitHandle(&xdgbasedirs);
++
 +    // if the config dir was not specified at the commandline, look for ~/.config/mupen64plus dir
      if (strlen(l_ConfigDir) == 0)
      {
@@ -646,7 +624,7 @@ index d57bafd..3c88498 100644
      //The database needs to be opened regardless of GUI mode.
      romdatabase_open();
 diff --git a/main/main.h b/main/main.h
-index e597ad2..7cec0e0 100644
+index e597ad284ea3bf511dc68c3fa854d546cd6e1b7d..7cec0e0aa1b4445b9703b7aba5a488787b56d8fa 100644
 --- a/main/main.h
 +++ b/main/main.h
 @@ -40,6 +40,8 @@ extern char* g_InputPlugin;
@@ -659,7 +637,7 @@ index e597ad2..7cec0e0 100644
  char* get_savespath(void);
  char* get_iconspath(void);
 diff --git a/main/plugin.c b/main/plugin.c
-index 92752be..b377ff0 100644
+index 92752be62997022f245e8e3c0785f7dd55d8037e..b377ff01c31383c37171c126b64cbe8a335411b5 100644
 --- a/main/plugin.c
 +++ b/main/plugin.c
 @@ -66,6 +66,8 @@ static void dummy_readController(int Control, BYTE *Command) {}
@@ -703,7 +681,7 @@ index 92752be..b377ff0 100644
              if(setInstallDir)
                  setInstallDir(installdir);
 diff --git a/main/plugin.h b/main/plugin.h
-index 35f4f43..4b6264a 100644
+index 35f4f4392ec4d8a13980eb2703bae83617044439..4b6264a6ad7d35a7e91b37988a51e553c10641fc 100644
 --- a/main/plugin.h
 +++ b/main/plugin.h
 @@ -38,7 +38,7 @@ extern list_t g_PluginList;
@@ -716,7 +694,7 @@ index 35f4f43..4b6264a 100644
                const char *audio_name, 
                const char *input_name,
 diff --git a/main/romcache.c b/main/romcache.c
-index 5f31cc8..5ec3f40 100644
+index 5f31cc824dfe67816efc532499924f00d9302507..5ec3f4024173f940f0d1168e588561271dda48c3 100644
 --- a/main/romcache.c
 +++ b/main/romcache.c
 @@ -258,7 +258,7 @@ int rom_cache_system(void* _arg)
@@ -729,7 +707,7 @@ index 5f31cc8..5ec3f40 100644
                      }
  
 diff --git a/pre.mk b/pre.mk
-index d2eb261..5c7b73c 100644
+index d2eb26164c83f7c303252f2a93fc4f864965dc02..5c7b73c40731e7ac66d285c9fe783c9f250c5ca1 100644
 --- a/pre.mk
 +++ b/pre.mk
 @@ -101,6 +101,15 @@ GTK_FLAGS	= $(shell pkg-config gtk+-2.0 --cflags)
@@ -749,7 +727,7 @@ index d2eb261..5c7b73c 100644
  # some distros append -qt4 to the binaries so look for those first
  ifeq ($(GUI), QT4)
 diff --git a/rice_video/Graphics_1.3.h b/rice_video/Graphics_1.3.h
-index 0f7843d..ed933b3 100644
+index 0f7843dd5482632c0fdc2f7ba4ef3f9f69d56f54..ed933b30f6ca1d56327fa1412679eaf605d8bf6c 100644
 --- a/rice_video/Graphics_1.3.h
 +++ b/rice_video/Graphics_1.3.h
 @@ -306,6 +306,28 @@ EXPORT void CALL SetConfigDir( char *configDir );
@@ -782,7 +760,7 @@ index 0f7843d..ed933b3 100644
    Purpose:  Allows emulator to register a callback function that will
              be called by the graphics plugin just before the the
 diff --git a/rice_video/TextureFilters.cpp b/rice_video/TextureFilters.cpp
-index e59f797..f8341fe 100644
+index e59f797e6cdd8db77f0ea31b3d126e8ec827daa5..f8341fe42a7a3af33ce9abdc1eb9d62948f9817b 100644
 --- a/rice_video/TextureFilters.cpp
 +++ b/rice_video/TextureFilters.cpp
 @@ -901,7 +901,7 @@ typedef struct {
@@ -822,7 +800,7 @@ index e59f797..f8341fe 100644
          strcat(gamefolder,"texture_dump/");
          strcat(gamefolder,(const char*)g_curRomInfo.szGameName);
 diff --git a/rice_video/Video.cpp b/rice_video/Video.cpp
-index 3f3cc05..75e3ad8 100644
+index 3f3cc05e888f81ac12530980c2c3906971113d05..75e3ad8a3b3773ad76c41653ae071edefe2c483f 100644
 --- a/rice_video/Video.cpp
 +++ b/rice_video/Video.cpp
 @@ -41,6 +41,8 @@ unsigned char *g_pRDRAMu8 = NULL;
@@ -948,7 +926,7 @@ index 3f3cc05..75e3ad8 100644
    Purpose:  Allows emulator to register a callback function that will
              be called by the graphics plugin just before the the
 diff --git a/rsp_hle/Audio_1.1.h b/rsp_hle/Audio_1.1.h
-index ea46b2d..7a6f68b 100644
+index ea46b2d733d7f76f0dd6c67f654d678fb49afc60..7a6f68b4f7373759a1eaa86b4382a71e938aa634 100644
 --- a/rsp_hle/Audio_1.1.h
 +++ b/rsp_hle/Audio_1.1.h
 @@ -224,6 +224,28 @@ EXPORT void CALL RomClosed (void);
@@ -980,6 +958,3 @@ index ea46b2d..7a6f68b 100644
  #if defined(__cplusplus)
  }
  #endif
--- 
-1.6.3.3
-

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

More information about the Pkg-games-commits mailing list