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

skitt pushed a commit to branch master
in repository mednafen.

commit 6af921f2d40941a34c576aa337c2802964425f3e
Author: Stephen Kitt <st...@sk2.org>
Date:   Wed Sep 21 12:51:57 2016 +0200

    New upstream release
---
 debian/changelog                       |  12 +-
 debian/control                         |   1 +
 debian/copyright                       |  12 +-
 debian/patches/gcc-6.patch             |  14 --
 debian/patches/series                  |   4 -
 debian/patches/spelling-fixes.patch    |  14 --
 debian/patches/use-system-mpcdec.patch |  51 --------
 debian/patches/use-system-tremor.patch |  51 --------
 debian/patches/use-system-trio.patch   | 231 +++++++++++++++++++++------------
 debian/rules                           |   4 +-
 10 files changed, 163 insertions(+), 231 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7496bc7..faf8bf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
-mednafen (0.9.38.7+dfsg-4) UNRELEASED; urgency=medium
-
+mednafen (0.9.39.2+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release:
+    - drop use-system-mpcdec.patch and use-system-tremor.patch, and the
+      supporting code in debian/rules — the upstream builds directly
+      supports external mpcdec and tremor;
+    - drop gcc-6.patch and spelling-fixes.patch, merged upstream;
+    - update use-system-trio.patch;
+    - this release adds Sega Saturn emulation (on amd64);
+    - external Musepack support now works (closes: #834573).
   * Use the packaged trio.h instead of the version included here (closes:
     #834571).
 
diff --git a/debian/control b/debian/control
index c89dda4..77646d9 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Description: multi-platform emulator, including NES, GB/A, 
Lynx, PC Engine
     * NeoGeo Pocket, NeoGeo Pocket Color
     * WonderSwan
     * Sega Genesis / Mega Drive
+    * Sega Saturn
     * Sony PlayStation
  .
  Hardware emulated by Mednafen includes:
diff --git a/debian/copyright b/debian/copyright
index 8b69593..48bb0f7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,17 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: mednafen
 Source: http://mednafen.sf.net
-Copyright: 2005-2013 Mednafen Team
+Copyright: 2005-2016 Mednafen Team
 License: GPL-2+
 Files-Excluded: tests/psx/*.exe
 
 Files: *
-Copyright: 2005-2013 Mednafen Team
+Copyright: 2005-2016 Mednafen Team
 License: GPL-2+
 
 Files: debian/*
 Copyright: 2005-2008 Ryan Schultz
-           2010-2015 Stephen Kitt
+           2010-2016 Stephen Kitt
 License: GPL-2+
 
 Files: src/mpcdec/*
@@ -104,6 +104,7 @@ Files:
  src/gb/gb*
  src/gb/gfx.cpp
  src/gb/memory.*
+ src/gb/z80.cpp
  src/gba/*
 Comment: VisualBoyAdvance <http://vba.sf.net/>
 Copyright: 1999-2003 Forgotten
@@ -330,11 +331,6 @@ Comment: dvdisaster
 Copyright: 2004-2007 Carsten Gnoerlich
 License: GPL-2+
 
-Files: src/hw_cpu/c68k/*
-Comment: C68K
-Copyright: 2003-2004 Stephane Dallongeville
-License: GPL-2+
-
 Files: src/hw_sound/ym2612/Ym2612_Emu.cpp
 Comment: YM2612
 Copyright: 2002 Stephane Dallongeville
diff --git a/debian/patches/gcc-6.patch b/debian/patches/gcc-6.patch
deleted file mode 100644
index 3f0a67b..0000000
--- a/debian/patches/gcc-6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Disambiguate abs() to build with GCC 6
-Author: Stephen Kitt <sk...@debian.org>
-
---- a/src/cdrom/CDAccess_CCD.cpp
-+++ b/src/cdrom/CDAccess_CCD.cpp
-@@ -346,7 +346,7 @@
-      if(prev_lba != INT_MAX && abs(lba - prev_lba) > 100)
-       throw MDFN_Error(0, _("Garbage subchannel Q data detected(excessively 
large jump in AMSF)"));
- 
--     if(abs(lba - s) > 100)
-+     if(abs((int) (lba - s)) > 100)
-       throw MDFN_Error(0, _("Garbage subchannel Q data detected(AMSF value is 
out of tolerance)"));
- 
-      prev_lba = lba;
diff --git a/debian/patches/series b/debian/patches/series
index 393e73e..e95dcf7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-use-system-tremor.patch
-use-system-mpcdec.patch
 use-system-trio.patch
-gcc-6.patch
-spelling-fixes.patch
diff --git a/debian/patches/spelling-fixes.patch 
b/debian/patches/spelling-fixes.patch
deleted file mode 100644
index 6ab4f30..0000000
--- a/debian/patches/spelling-fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Spelling fixes
-Author: Stephen Kitt <sk...@debian.org>
-
---- a/src/lynx/mikie.cpp
-+++ b/src/lynx/mikie.cpp
-@@ -909,7 +909,7 @@
-                       {
-                               C6502_REGS regs;
-                               mSystem.GetRegs(regs);
--                              MDFN_printf("Runtime Alert - System 
Halted\nCMikie::Poke(SYSCTL1) - Lynx power down occured at PC=$%04x.\nResetting 
system.\n",regs.PC);
-+                              MDFN_printf("Runtime Alert - System 
Halted\nCMikie::Poke(SYSCTL1) - Lynx power down occurred at 
PC=$%04x.\nResetting system.\n",regs.PC);
-                               mSystem.Reset();
-                               gSystemHalt=TRUE;
-                       }
diff --git a/debian/patches/use-system-mpcdec.patch 
b/debian/patches/use-system-mpcdec.patch
deleted file mode 100644
index 699b418..0000000
--- a/debian/patches/use-system-mpcdec.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Subject: Use packaged libmpcdec instead of provided copy
-From: Stephen Kitt <st...@sk2.org>
-
-Use the version of mpcdec available in libmpcdec-dev instead of the
-source code provided.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -84,6 +84,10 @@
- AC_CHECK_LIB([vorbisidec], [ov_read], [], AC_MSG_ERROR([*** libvorbisidec not 
found!]))
- LIBS="$LIBS -lvorbisidec"
- 
-+dnl Check for mpcdec
-+AC_CHECK_LIB([mpcdec], [main], [], AC_MSG_ERROR([*** mpcdec not found!]))
-+LIBS="$LIBS -lmpcdec"
-+
- 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),
-@@ -615,4 +619,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/snes_faust/Makefile src/ngp/Makefile src/sound/Makefile 
src/hw_cpu/Makefile src/hw_misc/Makefile src/hw_sound/Makefile 
src/hw_video/Makefi [...]
-+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/snes_faust/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 s [...]
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -166,10 +166,6 @@
- mednafen_LDADD          +=      hw_video/libmdfnhwvideo.a
- mednafen_DEPENDENCIES   +=      hw_video/libmdfnhwvideo.a
- 
--SUBDIRS += mpcdec
--mednafen_LDADD          +=      mpcdec/libmpcdec.a
--mednafen_DEPENDENCIES   +=      mpcdec/libmpcdec.a
--
- include cdrom/Makefile.am.inc
- 
- 
---- 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
deleted file mode 100644
index 82255b6..0000000
--- a/debian/patches/use-system-tremor.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Subject: Use packaged libvorbisidec instead of provided copy
-From: Stephen Kitt <st...@sk2.org>
-
-Use the version of tremor available in libvorbisidec-dev instead of
-the source code provided.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -80,6 +80,10 @@
- AC_CHECK_LIB([z], [zlibVersion],[], AC_MSG_ERROR([*** zlib not found!]))
- LIBS="$LIBS -lz"
- 
-+dnl Check for libvorbisidec (tremor)
-+AC_CHECK_LIB([vorbisidec], [ov_read], [], AC_MSG_ERROR([*** libvorbisidec not 
found!]))
-+LIBS="$LIBS -lvorbisidec"
-+
- 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),
-@@ -611,4 +615,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/snes_faust/Makefile src/ngp/Makefile 
src/sound/Makefile src/hw_cpu/Makefile src/hw_misc/Makefile 
src/hw_sound/Makefile [...]
-+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/snes_faust/Makefile src/ngp/Makefile src/sound/Makefile 
src/hw_cpu/Makefile src/hw_misc/Makefile src/hw_sound/Makefile 
src/hw_video/Makefi [...]
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -166,9 +166,9 @@
- mednafen_LDADD          +=      hw_video/libmdfnhwvideo.a
- mednafen_DEPENDENCIES   +=      hw_video/libmdfnhwvideo.a
- 
--SUBDIRS += tremor mpcdec
--mednafen_LDADD          +=      tremor/libvorbisidec.a mpcdec/libmpcdec.a
--mednafen_DEPENDENCIES   +=      tremor/libvorbisidec.a mpcdec/libmpcdec.a
-+SUBDIRS += mpcdec
-+mednafen_LDADD          +=      mpcdec/libmpcdec.a
-+mednafen_DEPENDENCIES   +=      mpcdec/libmpcdec.a
- 
- include cdrom/Makefile.am.inc
- 
---- 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 f51109e..ecf423e 100644
--- a/debian/patches/use-system-trio.patch
+++ b/debian/patches/use-system-trio.patch
@@ -7,34 +7,34 @@ source code provided.
 --- a/configure.ac
 +++ b/configure.ac
 @@ -88,6 +88,10 @@
- AC_CHECK_LIB([mpcdec], [main], [], AC_MSG_ERROR([*** mpcdec not found!]))
- LIBS="$LIBS -lmpcdec"
+ AC_CHECK_LIB([z], [zlibVersion],[], AC_MSG_ERROR([*** zlib not found!]))
+ AC_SUBST([ZLIB_LIBS], [-lz])
  
 +dnl Check for trio
 +AC_CHECK_LIB([trio], [trio_printf], [], AC_MSG_ERROR([*** trio not found!]), 
[-lm])
 +LIBS="$LIBS -ltrio -lm"
 +
- 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="$SNDFILE_CFLAGS $CPPFLAGS"
+ dnl -fno-fast-math and -fno-unsafe-math-optimizations to make sure it's 
disabled, as the fast-math feature on certain older
+ dnl versions of gcc produces horribly broken code(and even when it's working 
correctly, it can have somewhat unpredictable effects).
+ dnl
+@@ -692,4 +696,4 @@
+ AC_SUBST([AM_CXXFLAGS], "$ALTIVEC_FLAGS $OPTIMIZER_FLAGS $WARNING_FLAGS 
$CODEGEN_FLAGS $CODEGEN_CXXFLAGS")
  
  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/snes_faust/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 s [...]
-+AC_OUTPUT([Makefile src/Makefile src/drivers/Makefile 
src/drivers_dos/Makefile src/sexyal/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/snes_faust/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 
[...]
+-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/ngp/Makefile src/snes/Makefile 
src/ss/Makefile src/desa68/Makefile src/quicklz/Makefile po/Makefile.in  
intl/Makefile])
++AC_OUTPUT([Makefile src/Makefile src/drivers/Makefile 
src/drivers_dos/Makefile src/sexyal/Makefile src/tremor/Makefile 
src/mpcdec/Makefile src/ngp/Makefile src/snes/Makefile src/ss/Makefile 
src/desa68/Makefile src/quicklz/Makefile po/Makefile.in  intl/Makefile])
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS       = trio
 +SUBDIRS       =
  AUTOMAKE_OPTIONS = subdir-objects
- DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@
+ DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ @SNDFILE_CFLAGS@
  DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include 
-I$(top_srcdir)/intl
 @@ -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 SNSFLoader.cpp 
SPCReader.cpp tests.cpp qtrecord.cpp Stream.cpp MemoryStream.cpp FileStream.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 SSFLoader.cpp 
SNSFLoader.cpp SPCReader.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                =
@@ -44,7 +44,7 @@ source code provided.
  SUBDIRS               +=      drivers
 --- a/src/FileStream.cpp
 +++ b/src/FileStream.cpp
-@@ -19,7 +19,7 @@
+@@ -27,7 +27,7 @@
  #include "FileStream.h"
  #include <mednafen/mednafen.h>
  
@@ -55,18 +55,18 @@ source code provided.
  #include <sys/stat.h>
 --- a/src/PSFLoader.cpp
 +++ b/src/PSFLoader.cpp
-@@ -29,7 +29,7 @@
+@@ -32,7 +32,7 @@
  #include "string/trim.h"
  
  #include <limits.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  #include <ctype.h>
- //#include <iconv.h>
+ #include <iconv.h>
  
 --- a/src/Stream.cpp
 +++ b/src/Stream.cpp
-@@ -19,7 +19,7 @@
+@@ -23,7 +23,7 @@
  #include "Stream.h"
  
  #include <stdlib.h>
@@ -77,7 +77,7 @@ source code provided.
  {
 --- a/src/cdplay/cdplay.cpp
 +++ b/src/cdplay/cdplay.cpp
-@@ -19,7 +19,7 @@
+@@ -23,7 +23,7 @@
  
  #include <mednafen/mednafen.h>
  #include <mednafen/cdrom/cdromif.h>
@@ -88,9 +88,9 @@ source code provided.
  
 --- a/src/cdrom/CDAccess_CCD.cpp
 +++ b/src/cdrom/CDAccess_CCD.cpp
-@@ -19,7 +19,7 @@
- #include "../general.h"
- #include "../string/trim.h"
+@@ -24,7 +24,7 @@
+ #include <mednafen/string/trim.h>
+ 
  #include "CDAccess_CCD.h"
 -#include <trio/trio.h>
 +#include <trio.h>
@@ -132,7 +132,7 @@ source code provided.
  #include "SimpleFIFO.h"
 --- a/src/compress/GZFileStream.cpp
 +++ b/src/compress/GZFileStream.cpp
-@@ -18,7 +18,7 @@
+@@ -22,7 +22,7 @@
  #include <mednafen/mednafen.h>
  #include "GZFileStream.h"
  
@@ -161,14 +161,14 @@ source code provided.
 -#include <trio/trio.h>
 +#include <trio.h>
  #include "console.h"
+ #include "video.h"
  #include <mednafen/string/trim.h>
- #include <vector>
 --- a/src/drivers/debugger.cpp
 +++ b/src/drivers/debugger.cpp
-@@ -16,7 +16,7 @@
-  */
- 
+@@ -22,7 +22,7 @@
  #include "main.h"
+ #include <mednafen/FileStream.h>
+ 
 -#include <trio/trio.h>
 +#include <trio.h>
  #include <time.h>
@@ -187,7 +187,7 @@ source code provided.
  static struct
 --- a/src/drivers/gfxdebugger.cpp
 +++ b/src/drivers/gfxdebugger.cpp
-@@ -18,7 +18,7 @@
+@@ -22,7 +22,7 @@
  #include "main.h"
  #include "gfxdebugger.h"
  #include "debugger.h"
@@ -209,7 +209,7 @@ source code provided.
  #include "input.h"
 --- a/src/drivers/logdebugger.cpp
 +++ b/src/drivers/logdebugger.cpp
-@@ -22,7 +22,7 @@
+@@ -26,7 +26,7 @@
  #include "debugger.h"
  #include "prompt.h"
  
@@ -231,7 +231,7 @@ source code provided.
  #ifdef HAVE_GETPWUID
 --- a/src/drivers/memdebugger.cpp
 +++ b/src/drivers/memdebugger.cpp
-@@ -22,7 +22,7 @@
+@@ -26,7 +26,7 @@
  #include <mednafen/FileStream.h>
  
  #include <ctype.h>
@@ -249,7 +249,7 @@ source code provided.
 -#include <trio/trio.h>
 +#include <trio.h>
  
- #include "NetClient.h"
+ #include "video.h"
  
 --- a/src/drivers/opengl.cpp
 +++ b/src/drivers/opengl.cpp
@@ -286,7 +286,7 @@ source code provided.
  #include <fcntl.h>
 --- a/src/drivers/rmdui.cpp
 +++ b/src/drivers/rmdui.cpp
-@@ -18,7 +18,7 @@
+@@ -22,7 +22,7 @@
  #include "main.h"
  #include "rmdui.h"
  
@@ -304,8 +304,8 @@ source code provided.
 -#include <trio/trio.h>
 +#include <trio.h>
  
- #define MK_COLOR_A(tmp_surface, r,g,b,a) (tmp_surface->MakeColor(r, g, b, a))
- 
+ static MDFN_Surface *PreviewSurface = NULL, *TextSurface = NULL;
+ static MDFN_Rect PreviewRect, TextRect;
 --- a/src/drivers/video.cpp
 +++ b/src/drivers/video.cpp
 @@ -24,7 +24,7 @@
@@ -341,7 +341,7 @@ source code provided.
  #include "input.h"
 --- a/src/error.cpp
 +++ b/src/error.cpp
-@@ -19,7 +19,7 @@
+@@ -23,7 +23,7 @@
  #include "error.h"
  #include <string.h>
  #include <stdarg.h>
@@ -383,28 +383,6 @@ source code provided.
  
  #include "general.h"
  #include "state.h"
---- a/src/hw_cpu/huc6280/huc6280.cpp
-+++ b/src/hw_cpu/huc6280/huc6280.cpp
-@@ -33,7 +33,7 @@
- #include <string.h>
- 
- #ifdef WANT_DEBUGGER
-- #include        <trio/trio.h>
-+ #include        <trio.h>
- #endif
- 
- #define LASTCYCLE /*assert(((P & I_FLAG) ? 0 : (uint32)~0) == PIMaskCache);*/ 
IRQSample = (IRQlow & IRQMask) & PIMaskCache; IFlagSample = P & I_FLAG; 
ADDCYC(1);
---- a/src/hw_cpu/huc6280/huc6280.h
-+++ b/src/hw_cpu/huc6280/huc6280.h
-@@ -1,7 +1,7 @@
- #ifndef __MDFN_HUC6280_H
- #define __MDFN_HUC6280_H
- 
--#include        <trio/trio.h>
-+#include        <trio.h>
- 
- class HuC6280_Support
- {
 --- a/src/hw_cpu/v810/v810_cpu.cpp
 +++ b/src/hw_cpu/v810/v810_cpu.cpp
 @@ -42,7 +42,7 @@
@@ -440,14 +418,14 @@ source code provided.
  
 --- a/src/md/input/4way.cpp
 +++ b/src/md/input/4way.cpp
-@@ -17,7 +17,7 @@
+@@ -21,7 +21,7 @@
  
  #include "../shared.h"
  #include "4way.h"
 -#include <trio/trio.h>
 +#include <trio.h>
  
- MD_4Way_Shim::MD_4Way_Shim(unsigned nin, MD_4Way* p4w) : n(nin), parent(p4w)
+ namespace MDFN_IEN_MD
  {
 --- a/src/md/input/gamepad.cpp
 +++ b/src/md/input/gamepad.cpp
@@ -458,29 +436,29 @@ source code provided.
 -#include <trio/trio.h>
 +#include <trio.h>
  
- /*--------------------------------------------------------------------------*/
- /* Master System 2-button gamepad                                           */
+ namespace MDFN_IEN_MD
+ {
 --- a/src/md/input/megamouse.cpp
 +++ b/src/md/input/megamouse.cpp
-@@ -17,7 +17,7 @@
+@@ -21,7 +21,7 @@
  
  #include "../shared.h"
  #include "megamouse.h"
 -#include <trio/trio.h>
 +#include <trio.h>
  
- enum
+ namespace MDFN_IEN_MD
  {
 --- a/src/md/input/multitap.cpp
 +++ b/src/md/input/multitap.cpp
-@@ -21,7 +21,7 @@
+@@ -25,7 +25,7 @@
  
  #include "../shared.h"
  #include "multitap.h"
 -#include <trio/trio.h>
 +#include <trio.h>
  
- MD_Multitap::MD_Multitap()
+ namespace MDFN_IEN_MD
  {
 --- a/src/md/system.cpp
 +++ b/src/md/system.cpp
@@ -513,8 +491,8 @@ source code provided.
 -#include <trio/trio.h>
 +#include <trio.h>
  #include <errno.h>
+ #include <unistd.h>
  #include <vector>
- 
 --- a/src/movie.cpp
 +++ b/src/movie.cpp
 @@ -21,7 +21,7 @@
@@ -591,7 +569,7 @@ source code provided.
 +#include <trio.h>
  #include <iconv.h>
  
- #include <mednafen/hw_cpu/huc6280/huc6280.h>
+ #include "huc6280.h"
 --- a/src/pce/input.cpp
 +++ b/src/pce/input.cpp
 @@ -25,7 +25,7 @@
@@ -638,10 +616,10 @@ source code provided.
  {
 --- a/src/pce_fast/vdc.cpp
 +++ b/src/pce_fast/vdc.cpp
-@@ -24,7 +24,7 @@
+@@ -23,7 +23,7 @@
+ #include "huc.h"
  #include "pcecd.h"
  #include <mednafen/cputest/cputest.h>
- #include <mednafen/FileStream.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  #include <math.h>
@@ -649,7 +627,7 @@ source code provided.
  namespace PCE_Fast
 --- a/src/pcfx/debug.cpp
 +++ b/src/pcfx/debug.cpp
-@@ -18,7 +18,7 @@
+@@ -22,7 +22,7 @@
  #include "pcfx.h"
  
  #include <string.h>
@@ -660,29 +638,29 @@ source code provided.
  
 --- a/src/pcfx/input.cpp
 +++ b/src/pcfx/input.cpp
-@@ -22,7 +22,7 @@
+@@ -26,7 +26,7 @@
  #include "input/gamepad.h"
  #include "input/mouse.h"
  
 -#include <trio/trio.h>
 +#include <trio.h>
  
- #define PCFX_PORTS    2
- #define TOTAL_PORTS   8
+ namespace MDFN_IEN_PCFX
+ {
 --- a/src/pcfx/interrupt.cpp
 +++ b/src/pcfx/interrupt.cpp
-@@ -17,7 +17,7 @@
+@@ -21,7 +21,7 @@
  
  #include "pcfx.h"
  #include "interrupt.h"
 -#include <trio/trio.h>
 +#include <trio.h>
  
- static uint16 InterruptAsserted;
- static uint16 InterruptMask;
+ namespace MDFN_IEN_PCFX
+ {
 --- a/src/pcfx/king.cpp
 +++ b/src/pcfx/king.cpp
-@@ -42,7 +42,7 @@
+@@ -45,7 +45,7 @@
  #include "input.h"
  #include "timer.h"
  #include "debug.h"
@@ -693,7 +671,7 @@ source code provided.
  #include <mednafen/sound/OwlResampler.h>
 --- a/src/pcfx/pcfx.cpp
 +++ b/src/pcfx/pcfx.cpp
-@@ -32,7 +32,7 @@
+@@ -36,7 +36,7 @@
  #include <mednafen/FileStream.h>
  #include <mednafen/compress/GZFileStream.h>
  
@@ -704,7 +682,7 @@ source code provided.
  #include <math.h>
 --- a/src/pcfx/soundbox.cpp
 +++ b/src/pcfx/soundbox.cpp
-@@ -22,7 +22,7 @@
+@@ -26,7 +26,7 @@
  #include <mednafen/hw_sound/pce_psg/pce_psg.h>
  #include <mednafen/sound/OwlResampler.h>
  
@@ -715,15 +693,15 @@ source code provided.
  
 --- a/src/pcfx/timer.cpp
 +++ b/src/pcfx/timer.cpp
-@@ -22,7 +22,7 @@
+@@ -27,7 +27,7 @@
  #include "pcfx.h"
  #include "interrupt.h"
  #include "timer.h"
 -#include <trio/trio.h>
 +#include <trio.h>
  
- static uint16 control;
- static uint16 period;
+ namespace MDFN_IEN_PCFX
+ {
 --- a/src/player.cpp
 +++ b/src/player.cpp
 @@ -16,7 +16,7 @@
@@ -737,9 +715,9 @@ source code provided.
  #include "video.h"
 --- a/src/psx/psx.h
 +++ b/src/psx/psx.h
-@@ -6,7 +6,7 @@
+@@ -25,7 +25,7 @@
+ #include <mednafen/mednafen.h>
  #include <mednafen/general.h>
- #include <mednafen/FileStream.h>
  
 -#include <trio/trio.h>
 +#include <trio.h>
@@ -748,7 +726,7 @@ source code provided.
  
 --- a/src/settings.cpp
 +++ b/src/settings.cpp
-@@ -24,7 +24,7 @@
+@@ -28,7 +28,7 @@
  #include <string.h>
  #include <vector>
  #include <string>
@@ -770,7 +748,7 @@ source code provided.
  #include "state.h"
 --- a/src/vb/debug.cpp
 +++ b/src/vb/debug.cpp
-@@ -18,7 +18,7 @@
+@@ -22,7 +22,7 @@
  #include "vb.h"
  #include <mednafen/hw_cpu/v810/v810_cpuD.h>
  #include <string.h>
@@ -781,7 +759,7 @@ source code provided.
  
 --- a/src/vb/vb.h
 +++ b/src/vb/vb.h
-@@ -3,7 +3,7 @@
+@@ -24,7 +24,7 @@
  
  #include <mednafen/mednafen.h>
  #include <mednafen/hw_cpu/v810/v810_cpu.h>
@@ -845,3 +823,88 @@ source code provided.
  
  namespace MDFN_IEN_WSWAN
  {
+--- a/src/cheat_formats/gb.cpp
++++ b/src/cheat_formats/gb.cpp
+@@ -22,7 +22,7 @@
+ #include <mednafen/mednafen.h>
+ #include <mednafen/mempatcher.h>
+ 
+-#include <trio/trio.h>
++#include <trio.h>
+ 
+ #include "gb.h"
+ 
+--- a/src/cheat_formats/psx.cpp
++++ b/src/cheat_formats/psx.cpp
+@@ -22,7 +22,7 @@
+ #include <mednafen/mednafen.h>
+ #include <mednafen/mempatcher.h>
+ 
+-#include <trio/trio.h>
++#include <trio.h>
+ 
+ #include "psx.h"
+ 
+--- a/src/cheat_formats/snes.cpp
++++ b/src/cheat_formats/snes.cpp
+@@ -22,7 +22,7 @@
+ #include <mednafen/mednafen.h>
+ #include <mednafen/mempatcher.h>
+ 
+-#include <trio/trio.h>
++#include <trio.h>
+ 
+ #include "snes.h"
+ 
+--- a/src/pce/huc6280.cpp
++++ b/src/pce/huc6280.cpp
+@@ -33,7 +33,7 @@
+ #include <string.h>
+ 
+ #ifdef WANT_DEBUGGER
+- #include <trio/trio.h>
++ #include <trio.h>
+ #endif
+ 
+ namespace MDFN_IEN_PCE
+--- a/src/pce/huc6280.h
++++ b/src/pce/huc6280.h
+@@ -1,7 +1,7 @@
+ #ifndef __MDFN_PCE_HUC6280_H
+ #define __MDFN_PCE_HUC6280_H
+ 
+-#include <trio/trio.h>
++#include <trio.h>
+ 
+ namespace MDFN_IEN_PCE
+ {
+--- a/src/ss/input/common.h
++++ b/src/ss/input/common.h
+@@ -1,4 +1,4 @@
+ #include "../ss.h"
+ #include <mednafen/mednafen.h>
+ #include "../smpc.h"
+-#include <trio/trio.h>
++#include <trio.h>
+--- a/src/ss/ss.cpp
++++ b/src/ss/ss.cpp
+@@ -35,7 +35,7 @@
+ 
+ #include <bitset>
+ 
+-#include <trio/trio.h>
++#include <trio.h>
+ 
+ #include <zlib.h>
+ 
+--- a/src/ss/ss.h
++++ b/src/ss/ss.h
+@@ -27,7 +27,7 @@
+ #include <stdint.h>
+ #include <stdarg.h>
+ 
+-#include <trio/trio.h>
++#include <trio.h>
+ 
+ namespace MDFN_IEN_SS
+ {
diff --git a/debian/rules b/debian/rules
index 3de8f2d..180787e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,6 @@ override_dh_auto_build:
        cp /usr/share/lzo/minilzo/*.[ch] src/compress
 
        # Move bundled source code for external packages out of the way
-       mv src/mpcdec src/mpcdec.orig
-       mv src/tremor src/tremor.orig
        mv src/trio src/trio.orig
        mv include/trio include/trio.orig
 
@@ -44,7 +42,7 @@ override_dh_auto_clean:
        dh_auto_clean
 
 override_dh_auto_configure:
-       dh_auto_configure -- --bindir=/usr/games --enable-psx
+       dh_auto_configure -- --bindir=/usr/games --enable-psx 
--with-external-mpcdec --with-external-tremor
 
 override_dh_gencontrol-arch:
        dh_gencontrol -a -- '-Vbu:liblzo2=$(liblzo2_source)'

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

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to