[mednafen] 01/01: Use the packaged trio.h instead of the version included here.
Stephen Kitt
skitt at moszumanska.debian.org
Wed Sep 21 07:05:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository mednafen.
commit e009ac6ca1d71cbc9fadae8661b58ef1feb026f5
Author: Stephen Kitt <steve at sk2.org>
Date: Wed Aug 17 19:48:13 2016 +0200
Use the packaged trio.h instead of the version included here.
---
debian/changelog | 7 +
debian/patches/use-system-trio.patch | 805 ++++++++++++++++++++++++++++++++++-
debian/rules | 2 +
3 files changed, 813 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index fab3730..7496bc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mednafen (0.9.38.7+dfsg-4) UNRELEASED; urgency=medium
+
+ * Use the packaged trio.h instead of the version included here (closes:
+ #834571).
+
+ -- Stephen Kitt <skitt at debian.org> Wed, 17 Aug 2016 19:47:10 +0200
+
mednafen (0.9.38.7+dfsg-3) unstable; urgency=medium
* Disable PIE, it has a measurable performance impact on the more
diff --git a/debian/patches/use-system-trio.patch b/debian/patches/use-system-trio.patch
index 8e1452d..f51109e 100644
--- a/debian/patches/use-system-trio.patch
+++ b/debian/patches/use-system-trio.patch
@@ -17,7 +17,7 @@ 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),
-@@ -619,4 +623,4 @@
+@@ -618,4 +622,4 @@
CPPFLAGS="$SNDFILE_CFLAGS $CPPFLAGS"
dnl Output Makefiles
@@ -42,3 +42,806 @@ source code provided.
if HAVE_SDL
SUBDIRS += drivers
+--- a/src/FileStream.cpp
++++ b/src/FileStream.cpp
+@@ -19,7 +19,7 @@
+ #include "FileStream.h"
+ #include <mednafen/mednafen.h>
+
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+--- a/src/PSFLoader.cpp
++++ b/src/PSFLoader.cpp
+@@ -29,7 +29,7 @@
+ #include "string/trim.h"
+
+ #include <limits.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <ctype.h>
+ //#include <iconv.h>
+
+--- a/src/Stream.cpp
++++ b/src/Stream.cpp
+@@ -19,7 +19,7 @@
+ #include "Stream.h"
+
+ #include <stdlib.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ Stream::Stream()
+ {
+--- a/src/cdplay/cdplay.cpp
++++ b/src/cdplay/cdplay.cpp
+@@ -19,7 +19,7 @@
+
+ #include <mednafen/mednafen.h>
+ #include <mednafen/cdrom/cdromif.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <vector>
+ #include <math.h>
+
+--- a/src/cdrom/CDAccess_CCD.cpp
++++ b/src/cdrom/CDAccess_CCD.cpp
+@@ -19,7 +19,7 @@
+ #include "../general.h"
+ #include "../string/trim.h"
+ #include "CDAccess_CCD.h"
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #include <limits>
+ #include <limits.h>
+--- a/src/cdrom/CDAccess_Image.cpp
++++ b/src/cdrom/CDAccess_Image.cpp
+@@ -35,7 +35,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <time.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <memory>
+
+ #include "../general.h"
+--- a/src/cdrom/cdromif.cpp
++++ b/src/cdrom/cdromif.cpp
+@@ -18,7 +18,7 @@
+ #include "../mednafen.h"
+ #include <string.h>
+ #include <sys/types.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include "cdromif.h"
+ #include "CDAccess.h"
+ #include "../general.h"
+--- a/src/cdrom/scsicd.cpp
++++ b/src/cdrom/scsicd.cpp
+@@ -18,7 +18,7 @@
+ #include <mednafen/mednafen.h>
+ #include <math.h>
+ #include <algorithm>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include "scsicd.h"
+ #include "cdromif.h"
+ #include "SimpleFIFO.h"
+--- a/src/compress/GZFileStream.cpp
++++ b/src/compress/GZFileStream.cpp
+@@ -18,7 +18,7 @@
+ #include <mednafen/mednafen.h>
+ #include "GZFileStream.h"
+
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+--- a/src/demo/demo.cpp
++++ b/src/demo/demo.cpp
+@@ -19,7 +19,7 @@
+ #include <mednafen/sound/OwlResampler.h>
+ #include <mednafen/video/primitives.h>
+ #include <mednafen/video/text.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #include <math.h>
+
+--- a/src/drivers/cheat.cpp
++++ b/src/drivers/cheat.cpp
+@@ -17,7 +17,7 @@
+
+ #include "main.h"
+ #include <ctype.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include "console.h"
+ #include <mednafen/string/trim.h>
+ #include <vector>
+--- a/src/drivers/debugger.cpp
++++ b/src/drivers/debugger.cpp
+@@ -16,7 +16,7 @@
+ */
+
+ #include "main.h"
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <time.h>
+ #include <map>
+ #include "debugger.h"
+--- a/src/drivers/fps.cpp
++++ b/src/drivers/fps.cpp
+@@ -17,7 +17,7 @@
+
+ #include "main.h"
+ #include "video.h"
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <algorithm>
+
+ static struct
+--- a/src/drivers/gfxdebugger.cpp
++++ b/src/drivers/gfxdebugger.cpp
+@@ -18,7 +18,7 @@
+ #include "main.h"
+ #include "gfxdebugger.h"
+ #include "debugger.h"
+-#include <trio/trio.h>
++#include <trio.h>
+
+ static MDFN_Surface *gd_surface = NULL;
+ static bool IsActive = 0;
+--- a/src/drivers/input.cpp
++++ b/src/drivers/input.cpp
+@@ -19,7 +19,7 @@
+
+ #include <string.h>
+ #include <ctype.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <map>
+
+ #include "input.h"
+--- a/src/drivers/logdebugger.cpp
++++ b/src/drivers/logdebugger.cpp
+@@ -22,7 +22,7 @@
+ #include "debugger.h"
+ #include "prompt.h"
+
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <vector>
+ #include <map>
+ #include <string>
+--- a/src/drivers/main.cpp
++++ b/src/drivers/main.cpp
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <errno.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <locale.h>
+
+ #ifdef HAVE_GETPWUID
+--- a/src/drivers/memdebugger.cpp
++++ b/src/drivers/memdebugger.cpp
+@@ -22,7 +22,7 @@
+ #include <mednafen/FileStream.h>
+
+ #include <ctype.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <errno.h>
+
+ bool MemDebugger::ICV_Init(const char *newcode)
+--- a/src/drivers/netplay.cpp
++++ b/src/drivers/netplay.cpp
+@@ -28,7 +28,7 @@
+ #include "netplay.h"
+ #include "console.h"
+
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #include "NetClient.h"
+
+--- a/src/drivers/opengl.cpp
++++ b/src/drivers/opengl.cpp
+@@ -18,7 +18,7 @@
+ #include "main.h"
+
+ #include <string.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <math.h>
+ #include <stdlib.h>
+
+--- a/src/drivers/prompt.cpp
++++ b/src/drivers/prompt.cpp
+@@ -16,7 +16,7 @@
+ */
+
+ #include "main.h"
+-#include <trio/trio.h>
++#include <trio.h>
+ #include "prompt.h"
+ #include <mednafen/string/ConvertUTF.h>
+
+--- a/src/drivers/remote.cpp
++++ b/src/drivers/remote.cpp
+@@ -19,7 +19,7 @@
+ #include <mednafen/string/escape.h>
+
+ #if defined(HAVE_FCNTL) && defined(HAVE_FCNTL_H)
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <ctype.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+--- a/src/drivers/rmdui.cpp
++++ b/src/drivers/rmdui.cpp
+@@ -18,7 +18,7 @@
+ #include "main.h"
+ #include "rmdui.h"
+
+-#include <trio/trio.h>
++#include <trio.h>
+
+ static bool DiskEjected;
+ static unsigned DiskSelected;
+--- a/src/drivers/video-state.cpp
++++ b/src/drivers/video-state.cpp
+@@ -20,7 +20,7 @@
+ #include "main.h"
+ #include "video.h"
+ #include <string.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #define MK_COLOR_A(tmp_surface, r,g,b,a) (tmp_surface->MakeColor(r, g, b, a))
+
+--- a/src/drivers/video.cpp
++++ b/src/drivers/video.cpp
+@@ -24,7 +24,7 @@
+ #include <math.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <algorithm>
+
+ #include "video.h"
+--- a/src/drivers_dos/input.cpp
++++ b/src/drivers_dos/input.cpp
+@@ -19,7 +19,7 @@
+
+ #include <string.h>
+ #include <ctype.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <map>
+
+ #include "input.h"
+--- a/src/drivers_dos/main.cpp
++++ b/src/drivers_dos/main.cpp
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <errno.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <locale.h>
+
+ #include "input.h"
+--- a/src/error.cpp
++++ b/src/error.cpp
+@@ -19,7 +19,7 @@
+ #include "error.h"
+ #include <string.h>
+ #include <stdarg.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ MDFN_Error::MDFN_Error() noexcept
+ {
+--- a/src/file.cpp
++++ b/src/file.cpp
+@@ -27,7 +27,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #include "compress/unzip.h"
+
+--- a/src/gba/GBA.cpp
++++ b/src/gba/GBA.cpp
+@@ -42,7 +42,7 @@
+
+ #include <stdarg.h>
+ #include <string.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <errno.h>
+
+ namespace MDFN_IEN_GBA
+--- a/src/general.cpp
++++ b/src/general.cpp
+@@ -26,7 +26,7 @@
+
+ #include <string>
+ #include <map>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #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 @@
+ // CPU routines
+
+ #include <mednafen/mednafen.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ //#include "pcfx.h"
+ //#include "debug.h"
+--- a/src/hw_sound/pce_psg/pce_psg.cpp
++++ b/src/hw_sound/pce_psg/pce_psg.cpp
+@@ -23,7 +23,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ // Frequency cache cutoff optimization threshold (<= FREQC7M_COT)
+ #define FREQC7M_COT 0x7 //0xA
+--- a/src/hw_video/huc6270/vdc.cpp
++++ b/src/hw_video/huc6270/vdc.cpp
+@@ -21,7 +21,7 @@
+ #include <mednafen/video.h>
+ #include <mednafen/lepacker.h>
+
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <math.h>
+ #include "vdc.h"
+
+--- a/src/md/input/4way.cpp
++++ b/src/md/input/4way.cpp
+@@ -17,7 +17,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)
+ {
+--- a/src/md/input/gamepad.cpp
++++ b/src/md/input/gamepad.cpp
+@@ -20,7 +20,7 @@
+
+ #include "../shared.h"
+ #include "gamepad.h"
+-#include <trio/trio.h>
++#include <trio.h>
+
+ /*--------------------------------------------------------------------------*/
+ /* Master System 2-button gamepad */
+--- a/src/md/input/megamouse.cpp
++++ b/src/md/input/megamouse.cpp
+@@ -17,7 +17,7 @@
+
+ #include "../shared.h"
+ #include "megamouse.h"
+-#include <trio/trio.h>
++#include <trio.h>
+
+ enum
+ {
+--- a/src/md/input/multitap.cpp
++++ b/src/md/input/multitap.cpp
+@@ -21,7 +21,7 @@
+
+ #include "../shared.h"
+ #include "multitap.h"
+-#include <trio/trio.h>
++#include <trio.h>
+
+ MD_Multitap::MD_Multitap()
+ {
+--- a/src/md/system.cpp
++++ b/src/md/system.cpp
+@@ -23,7 +23,7 @@
+ #include <mednafen/general.h>
+ #include <mednafen/mempatcher.h>
+
+-#include <trio/trio.h>
++#include <trio.h>
+
+ namespace MDFN_IEN_MD
+ {
+--- a/src/mednafen.cpp
++++ b/src/mednafen.cpp
+@@ -24,7 +24,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <list>
+ #include <algorithm>
+
+--- a/src/mempatcher.cpp
++++ b/src/mempatcher.cpp
+@@ -25,7 +25,7 @@
+
+ #include <string.h>
+ #include <ctype.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <errno.h>
+ #include <vector>
+
+--- a/src/movie.cpp
++++ b/src/movie.cpp
+@@ -21,7 +21,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #include "driver.h"
+ #include "state.h"
+--- a/src/nes/debug.cpp
++++ b/src/nes/debug.cpp
+@@ -16,7 +16,7 @@
+ */
+
+ #include "nes.h"
+-#include <trio/trio.h>
++#include <trio.h>
+ #include "x6502.h"
+ #include "debug.h"
+ #include "ppu/ppu.h"
+--- a/src/nes/fds.cpp
++++ b/src/nes/fds.cpp
+@@ -28,7 +28,7 @@
+ #include <mednafen/FileStream.h>
+ #include <mednafen/compress/GZFileStream.h>
+
+-#include <trio/trio.h>
++#include <trio.h>
+
+ /* TODO: Add code to put a delay in between the time a disk is inserted
+ and the when it can be successfully read/written to. This should
+--- a/src/nes/nes.cpp
++++ b/src/nes/nes.cpp
+@@ -36,7 +36,7 @@
+ #include "vsuni.h"
+ #include "debug.h"
+
+-#include <trio/trio.h>
++#include <trio.h>
+
+ extern MDFNGI EmulatedNES;
+
+--- a/src/nes/ppu/ppu.cpp
++++ b/src/nes/ppu/ppu.cpp
+@@ -29,7 +29,7 @@
+ #include "palette.h"
+ #include "../input.h"
+ #include "../ntsc/nes_ntsc.h"
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <math.h>
+
+ #ifdef __MMX__
+--- a/src/netplay.cpp
++++ b/src/netplay.cpp
+@@ -22,7 +22,7 @@
+ #include <zlib.h>
+ #include <string>
+ #include <math.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #include <vector>
+ #include <list>
+--- a/src/pce/debug.cpp
++++ b/src/pce/debug.cpp
+@@ -17,7 +17,7 @@
+
+ #include "pce.h"
+ #include <string.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <iconv.h>
+
+ #include <mednafen/hw_cpu/huc6280/huc6280.h>
+--- a/src/pce/input.cpp
++++ b/src/pce/input.cpp
+@@ -25,7 +25,7 @@
+ #include "input/mouse.h"
+ #include "input/tsushinkb.h"
+
+-#include <trio/trio.h>
++#include <trio.h>
+
+ namespace MDFN_IEN_PCE
+ {
+--- a/src/pce/vce.cpp
++++ b/src/pce/vce.cpp
+@@ -31,7 +31,7 @@
+ #include <mednafen/hw_video/huc6270/vdc.h>
+ #include "debug.h"
+ #include "pcecd.h"
+-#include <trio/trio.h>
++#include <trio.h>
+
+ namespace MDFN_IEN_PCE
+ {
+--- a/src/pce_fast/pcecd_drive.cpp
++++ b/src/pce_fast/pcecd_drive.cpp
+@@ -17,7 +17,7 @@
+
+ #include <mednafen/mednafen.h>
+ #include <math.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include "pcecd_drive.h"
+ #include <mednafen/cdrom/cdromif.h>
+ #include <mednafen/cdrom/SimpleFIFO.h>
+--- a/src/pce_fast/psg.cpp
++++ b/src/pce_fast/psg.cpp
+@@ -20,7 +20,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ namespace PCE_Fast
+ {
+--- a/src/pce_fast/vdc.cpp
++++ b/src/pce_fast/vdc.cpp
+@@ -24,7 +24,7 @@
+ #include "pcecd.h"
+ #include <mednafen/cputest/cputest.h>
+ #include <mednafen/FileStream.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <math.h>
+
+ namespace PCE_Fast
+--- a/src/pcfx/debug.cpp
++++ b/src/pcfx/debug.cpp
+@@ -18,7 +18,7 @@
+ #include "pcfx.h"
+
+ #include <string.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <stdarg.h>
+ #include <iconv.h>
+
+--- a/src/pcfx/input.cpp
++++ b/src/pcfx/input.cpp
+@@ -22,7 +22,7 @@
+ #include "input/gamepad.h"
+ #include "input/mouse.h"
+
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #define PCFX_PORTS 2
+ #define TOTAL_PORTS 8
+--- a/src/pcfx/interrupt.cpp
++++ b/src/pcfx/interrupt.cpp
+@@ -17,7 +17,7 @@
+
+ #include "pcfx.h"
+ #include "interrupt.h"
+-#include <trio/trio.h>
++#include <trio.h>
+
+ static uint16 InterruptAsserted;
+ static uint16 InterruptMask;
+--- a/src/pcfx/king.cpp
++++ b/src/pcfx/king.cpp
+@@ -42,7 +42,7 @@
+ #include "input.h"
+ #include "timer.h"
+ #include "debug.h"
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <math.h>
+ #include <mednafen/video.h>
+ #include <mednafen/sound/OwlResampler.h>
+--- a/src/pcfx/pcfx.cpp
++++ b/src/pcfx/pcfx.cpp
+@@ -32,7 +32,7 @@
+ #include <mednafen/FileStream.h>
+ #include <mednafen/compress/GZFileStream.h>
+
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <math.h>
+--- a/src/pcfx/soundbox.cpp
++++ b/src/pcfx/soundbox.cpp
+@@ -22,7 +22,7 @@
+ #include <mednafen/hw_sound/pce_psg/pce_psg.h>
+ #include <mednafen/sound/OwlResampler.h>
+
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <math.h>
+ #include <string.h>
+
+--- a/src/pcfx/timer.cpp
++++ b/src/pcfx/timer.cpp
+@@ -22,7 +22,7 @@
+ #include "pcfx.h"
+ #include "interrupt.h"
+ #include "timer.h"
+-#include <trio/trio.h>
++#include <trio.h>
+
+ static uint16 control;
+ static uint16 period;
+--- a/src/player.cpp
++++ b/src/player.cpp
+@@ -16,7 +16,7 @@
+ */
+
+ #include "mednafen.h"
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <math.h>
+
+ #include "video.h"
+--- a/src/psx/psx.h
++++ b/src/psx/psx.h
+@@ -6,7 +6,7 @@
+ #include <mednafen/general.h>
+ #include <mednafen/FileStream.h>
+
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #include "masmem.h"
+
+--- a/src/settings.cpp
++++ b/src/settings.cpp
+@@ -24,7 +24,7 @@
+ #include <string.h>
+ #include <vector>
+ #include <string>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <math.h>
+ #include <locale.h>
+ #include <map>
+--- a/src/state.cpp
++++ b/src/state.cpp
+@@ -23,7 +23,7 @@
+ #include <unistd.h>
+ #include <time.h>
+
+-#include <trio/trio.h>
++#include <trio.h>
+ #include "driver.h"
+ #include "general.h"
+ #include "state.h"
+--- a/src/vb/debug.cpp
++++ b/src/vb/debug.cpp
+@@ -18,7 +18,7 @@
+ #include "vb.h"
+ #include <mednafen/hw_cpu/v810/v810_cpuD.h>
+ #include <string.h>
+-#include <trio/trio.h>
++#include <trio.h>
+ #include <stdarg.h>
+ #include <iconv.h>
+
+--- a/src/vb/vb.h
++++ b/src/vb/vb.h
+@@ -3,7 +3,7 @@
+
+ #include <mednafen/mednafen.h>
+ #include <mednafen/hw_cpu/v810/v810_cpu.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ namespace MDFN_IEN_VB
+ {
+--- a/src/video/video.cpp
++++ b/src/video/video.cpp
+@@ -23,7 +23,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+
+-#include <trio/trio.h>
++#include <trio.h>
+
+ #include <vector>
+
+--- a/src/wswan/debug.cpp
++++ b/src/wswan/debug.cpp
+@@ -22,7 +22,7 @@
+ #include "memory.h"
+ #include "gfx.h"
+ #include <stdarg.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ namespace MDFN_IEN_WSWAN
+ {
+--- a/src/wswan/gfx.cpp
++++ b/src/wswan/gfx.cpp
+@@ -25,7 +25,7 @@
+ #include "rtc.h"
+ #include "comm.h"
+ #include <mednafen/video.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ namespace MDFN_IEN_WSWAN
+ {
+--- a/src/wswan/interrupt.cpp
++++ b/src/wswan/interrupt.cpp
+@@ -18,7 +18,7 @@
+ #include "wswan.h"
+ #include "interrupt.h"
+ #include "v30mz.h"
+-#include <trio/trio.h>
++#include <trio.h>
+
+ namespace MDFN_IEN_WSWAN
+ {
+--- a/src/wswan/memory.cpp
++++ b/src/wswan/memory.cpp
+@@ -30,7 +30,7 @@
+ #include <mednafen/FileStream.h>
+ #include <time.h>
+ #include <math.h>
+-#include <trio/trio.h>
++#include <trio.h>
+
+ namespace MDFN_IEN_WSWAN
+ {
diff --git a/debian/rules b/debian/rules
index 210ded4..3de8f2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ override_dh_auto_build:
mv src/mpcdec src/mpcdec.orig
mv src/tremor src/tremor.orig
mv src/trio src/trio.orig
+ mv include/trio include/trio.orig
dh_auto_build
@@ -38,6 +39,7 @@ override_dh_auto_clean:
[ ! -d src/mpcdec.orig ] || mv src/mpcdec.orig src/mpcdec
[ ! -d src/tremor.orig ] || mv src/tremor.orig src/tremor
[ ! -d src/trio.orig ] || mv src/trio.orig src/trio
+ [ ! -d include/trio.orig ] || mv include/trio.orig include/trio
dh_auto_clean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednafen.git
More information about the Pkg-games-commits
mailing list