[mednafen] 04/06: Refresh patches.

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository mednafen.

commit def90ae694113a862bd0b1abf51ad8ca86a5cce4
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Feb 16 08:28:42 2015 +0100

    Refresh patches.
---
 debian/patches/reproducible.patch      |  2 +-
 debian/patches/use-system-mpcdec.patch | 53 +++++++++-------------------------
 debian/patches/use-system-tremor.patch | 26 ++++++++---------
 debian/patches/use-system-trio.patch   |  6 ++--
 4 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index 04b2e47..892c61a 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -3,7 +3,7 @@ Author: Stephen Kitt <skitt at debian.org>
 
 --- a/src/qtrecord.cpp
 +++ b/src/qtrecord.cpp
-@@ -1047,7 +1047,7 @@
+@@ -1033,7 +1033,7 @@
  
    atom_begin("@swr");
  
diff --git a/debian/patches/use-system-mpcdec.patch b/debian/patches/use-system-mpcdec.patch
index c572823..90e9f94 100644
--- a/debian/patches/use-system-mpcdec.patch
+++ b/debian/patches/use-system-mpcdec.patch
@@ -17,8 +17,8 @@ source code provided.
  OPTIMIZER_FLAGS=""
  
  dnl -ffast-math removed January 12, 2013.  Don't re-add it, nor any of its sub-options(ESPECIALLY not -funsafe-math-optimizations),
-@@ -622,4 +626,4 @@
- CPPFLAGS="$LIBCDIO_CFLAGS $SNDFILE_CFLAGS $CPPFLAGS"
+@@ -604,4 +608,4 @@
+ CPPFLAGS="$SNDFILE_CFLAGS $CPPFLAGS"
  
  dnl Output Makefiles
 -AC_OUTPUT([Makefile src/Makefile src/drivers/Makefile src/drivers_dos/Makefile src/sexyal/Makefile src/mpcdec/Makefile src/trio/Makefile src/gb/Makefile src/gba/Makefile src/lynx/Makefile src/pce/Makefile src/pce_fast/Makefile src/pcfx/Makefile src/psx/Makefile src/sms/Makefile src/vb/Makefile src/wswan/Makefile src/nes/Makefile src/snes/Makefile src/ngp/Makefile src/sound/Makefile src/hw_cpu/Makefile src/hw_misc/Makefile src/hw_sound/Makefile src/hw_video/Makefile src/md/Makefile src/c [...]
@@ -36,41 +36,16 @@ source code provided.
  include cdrom/Makefile.am.inc
  
  
---- a/src/cdrom/audioreader.cpp
-+++ b/src/cdrom/audioreader.cpp
-@@ -28,7 +28,7 @@
- #include <sys/stat.h>
- 
- #include <tremor/ivorbisfile.h>
--#include "../mpcdec/mpcdec.h"
-+#include <mpc/mpcdec.h>
- 
- #ifdef HAVE_LIBSNDFILE
- #include <sndfile.h>
-@@ -247,7 +247,7 @@
-  }
-  catch(...)
-  {
--  return(MPC_STATUS_FAIL);
-+  return(-1);
-  }
- }
- 
-@@ -278,7 +278,7 @@
-  }
-  catch(...)
-  {
--  return(MPC_STATUS_FAIL);
-+  return(-1);
-  }
- }
- 
-@@ -293,7 +293,7 @@
-  }
-  catch(...)
-  {
--  return(MPC_STATUS_FAIL);
-+  return(-1);
-  }
- }
+--- a/src/cdrom/CDAFReader_MPC.cpp
++++ b/src/cdrom/CDAFReader_MPC.cpp
+@@ -19,8 +19,9 @@
+ #include "CDAFReader.h"
+ #include "CDAFReader_MPC.h"
  
+-#if 0
++#if 1
+  #include <mpc/mpcdec.h>
++ #define MPC_STATUS_FAIL -1
+ #else
+  #include <mednafen/mpcdec/mpcdec.h>
+ #endif
diff --git a/debian/patches/use-system-tremor.patch b/debian/patches/use-system-tremor.patch
index c7e1ba6..30876cd 100644
--- a/debian/patches/use-system-tremor.patch
+++ b/debian/patches/use-system-tremor.patch
@@ -17,8 +17,8 @@ the source code provided.
  OPTIMIZER_FLAGS=""
  
  dnl -ffast-math removed January 12, 2013.  Don't re-add it, nor any of its sub-options(ESPECIALLY not -funsafe-math-optimizations),
-@@ -618,4 +622,4 @@
- CPPFLAGS="$LIBCDIO_CFLAGS $SNDFILE_CFLAGS $CPPFLAGS"
+@@ -600,4 +604,4 @@
+ CPPFLAGS="$SNDFILE_CFLAGS $CPPFLAGS"
  
  dnl Output Makefiles
 -AC_OUTPUT([Makefile src/Makefile src/drivers/Makefile src/drivers_dos/Makefile src/sexyal/Makefile src/tremor/Makefile src/mpcdec/Makefile src/trio/Makefile src/gb/Makefile src/gba/Makefile src/lynx/Makefile src/pce/Makefile src/pce_fast/Makefile src/pcfx/Makefile src/psx/Makefile src/sms/Makefile src/vb/Makefile src/wswan/Makefile src/nes/Makefile src/snes/Makefile src/ngp/Makefile src/sound/Makefile src/hw_cpu/Makefile src/hw_misc/Makefile src/hw_sound/Makefile src/hw_video/Makefile s [...]
@@ -38,14 +38,14 @@ the source code provided.
  
  include cdrom/Makefile.am.inc
  
---- a/src/cdrom/audioreader.cpp
-+++ b/src/cdrom/audioreader.cpp
-@@ -27,7 +27,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
--#include "../tremor/ivorbisfile.h"
-+#include <tremor/ivorbisfile.h>
- #include "../mpcdec/mpcdec.h"
- 
- #ifdef HAVE_LIBSNDFILE
+--- a/src/cdrom/CDAFReader_Vorbis.cpp
++++ b/src/cdrom/CDAFReader_Vorbis.cpp
+@@ -19,7 +19,7 @@
+ #include "CDAFReader.h"
+ #include "CDAFReader_Vorbis.h"
+ 
+-#if 0
++#if 1
+  #include <tremor/ivorbisfile.h>
+ #else
+  #include <mednafen/tremor/ivorbisfile.h>
diff --git a/debian/patches/use-system-trio.patch b/debian/patches/use-system-trio.patch
index ee6e269..210d1d3 100644
--- a/debian/patches/use-system-trio.patch
+++ b/debian/patches/use-system-trio.patch
@@ -17,8 +17,8 @@ source code provided.
  OPTIMIZER_FLAGS=""
  
  dnl -ffast-math removed January 12, 2013.  Don't re-add it, nor any of its sub-options(ESPECIALLY not -funsafe-math-optimizations),
-@@ -626,4 +630,4 @@
- CPPFLAGS="$LIBCDIO_CFLAGS $SNDFILE_CFLAGS $CPPFLAGS"
+@@ -608,4 +612,4 @@
+ CPPFLAGS="$SNDFILE_CFLAGS $CPPFLAGS"
  
  dnl Output Makefiles
 -AC_OUTPUT([Makefile src/Makefile src/drivers/Makefile src/drivers_dos/Makefile src/sexyal/Makefile src/trio/Makefile src/gb/Makefile src/gba/Makefile src/lynx/Makefile src/pce/Makefile src/pce_fast/Makefile src/pcfx/Makefile src/psx/Makefile src/sms/Makefile src/vb/Makefile src/wswan/Makefile src/nes/Makefile src/snes/Makefile src/ngp/Makefile src/sound/Makefile src/hw_cpu/Makefile src/hw_misc/Makefile src/hw_sound/Makefile src/hw_video/Makefile src/md/Makefile src/cdplay/Makefile src/d [...]
@@ -34,7 +34,7 @@ source code provided.
 @@ -6,8 +6,8 @@
  bin_PROGRAMS	=	mednafen
  
- mednafen_SOURCES 	= 	debug.cpp error.cpp mempatcher.cpp settings.cpp endian.cpp mednafen.cpp git.cpp file.cpp general.cpp memory.cpp netplay.cpp state.cpp state_rewind.cpp movie.cpp player.cpp PSFLoader.cpp tests.cpp qtrecord.cpp Stream.cpp MemoryStream.cpp FileStream.cpp GZFileStream.cpp IPSPatcher.cpp
+ mednafen_SOURCES 	= 	debug.cpp error.cpp mempatcher.cpp settings.cpp endian.cpp mednafen.cpp git.cpp file.cpp general.cpp memory.cpp netplay.cpp state.cpp state_rewind.cpp movie.cpp player.cpp PSFLoader.cpp tests.cpp qtrecord.cpp Stream.cpp MemoryStream.cpp FileStream.cpp IPSPatcher.cpp
 -mednafen_LDADD 		= 	trio/libtrio.a
 -mednafen_DEPENDENCIES	=	trio/libtrio.a
 +mednafen_LDADD 		=

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