This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository mednafen.
commit e11d6e37ddb1287421ea6e49ebce1facdd1673b7
Author: Stephen Kitt <st...@sk2.org>
Date: Thu Sep 21 23:01:12 2017 +0200
New upstream release
---
debian/changelog | 7 +
debian/patches/series | 1 -
debian/patches/use-system-trio.patch | 921 -----------------------------------
debian/rules | 12 +-
4 files changed, 8 insertions(+), 933 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e66e78..68499e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mednafen (0.9.48+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream release, capable of building with an external libtrio
+ without a patch.
+
+ -- Stephen Kitt <sk...@debian.org> Wed, 20 Sep 2017 13:20:36 +0200
+
mednafen (0.9.47+dfsg-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e95dcf7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-use-system-trio.patch
diff --git a/debian/patches/use-system-trio.patch
b/debian/patches/use-system-trio.patch
deleted file mode 100644
index 8199b79..0000000
--- a/debian/patches/use-system-trio.patch
+++ /dev/null
@@ -1,921 +0,0 @@
-Subject: Use packaged libtrio instead of provided copy
-From: Stephen Kitt <sk...@debian.org>
-
-Use the version of libtrio available in libtrio-dev instead of the
-source code provided.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -90,6 +90,10 @@
- AC_CHECK_LIB([z], [zlibVersion], ZLIB_LIBS="-lz", AC_MSG_ERROR([*** zlib not
found!]))
- AC_SUBST([ZLIB_LIBS])
-
-+dnl Check for trio
-+AC_CHECK_LIB([trio], [trio_printf], [], AC_MSG_ERROR([*** trio not found!]),
[-lm])
-+LIBS="$LIBS -ltrio -lm"
-+
- 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
-@@ -705,4 +709,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/tremor/Makefile
src/mpcdec/Makefile src/trio/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/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 = @DEFS@ @SNDFILE_CFLAGS@
- DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-I$(top_builddir)/intl
-@@ -6,8 +6,8 @@
- bin_PROGRAMS = mednafen
-
- mednafen_SOURCES = debug.cpp error.cpp mempatcher.cpp settings.cpp
endian.cpp Time.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 =
-+mednafen_DEPENDENCIES =
- noinst_LIBRARIES =
-
- if HAVE_SDL
---- a/src/FileStream.cpp
-+++ b/src/FileStream.cpp
-@@ -27,7 +27,7 @@
- #include "FileStream.h"
- #include <mednafen/mednafen.h>
-
--#include <trio/trio.h>
-+#include <trio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
---- a/src/PSFLoader.cpp
-+++ b/src/PSFLoader.cpp
-@@ -30,7 +30,7 @@
- #include "general.h"
- #include <mednafen/string/string.h>
-
--#include <trio/trio.h>
-+#include <trio.h>
- #include <ctype.h>
- #include <iconv.h>
-
---- a/src/Stream.cpp
-+++ b/src/Stream.cpp
-@@ -22,7 +22,7 @@
- #include <mednafen/types.h>
- #include "Stream.h"
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- Stream::Stream()
- {
---- a/src/cdplay/cdplay.cpp
-+++ b/src/cdplay/cdplay.cpp
-@@ -23,7 +23,7 @@
-
- #include <mednafen/mednafen.h>
- #include <mednafen/cdrom/cdromif.h>
--#include <trio/trio.h>
-+#include <trio.h>
-
- using namespace CDUtility;
-
---- a/src/cdrom/CDAccess_CCD.cpp
-+++ b/src/cdrom/CDAccess_CCD.cpp
-@@ -24,7 +24,7 @@
- #include <mednafen/string/string.h>
-
- #include "CDAccess_CCD.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include <map>
-
---- a/src/cdrom/CDAccess_Image.cpp
-+++ b/src/cdrom/CDAccess_Image.cpp
-@@ -32,7 +32,7 @@
-
- #include <sys/types.h>
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include <mednafen/general.h>
- #include <mednafen/string/string.h>
---- a/src/cdrom/cdromif.cpp
-+++ b/src/cdrom/cdromif.cpp
-@@ -18,7 +18,7 @@
- #include <mednafen/mednafen.h>
- #include <mednafen/general.h>
- #include <sys/types.h>
--#include <trio/trio.h>
-+#include <trio.h>
- #include "cdromif.h"
- #include "CDAccess.h"
-
---- a/src/cdrom/scsicd.cpp
-+++ b/src/cdrom/scsicd.cpp
-@@ -16,7 +16,7 @@
- */
-
- #include <mednafen/mednafen.h>
--#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
-@@ -22,7 +22,7 @@
- #include <mednafen/mednafen.h>
- #include "GZFileStream.h"
-
--#include <trio/trio.h>
-+#include <trio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
---- a/src/demo/demo.cpp
-+++ b/src/demo/demo.cpp
-@@ -20,7 +20,7 @@
- #include <mednafen/video/primitives.h>
- #include <mednafen/video/text.h>
- #include <mednafen/Time.h>
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_DEMO
- {
---- 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 "video.h"
- #include <mednafen/string/string.h>
---- a/src/drivers/debugger.cpp
-+++ b/src/drivers/debugger.cpp
-@@ -22,7 +22,7 @@
- #include "main.h"
- #include <mednafen/FileStream.h>
-
--#include <trio/trio.h>
-+#include <trio.h>
- #include <map>
- #include "debugger.h"
- #include "gfxdebugger.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>
-
- static struct
- {
---- a/src/drivers/gfxdebugger.cpp
-+++ b/src/drivers/gfxdebugger.cpp
-@@ -22,7 +22,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
-@@ -18,7 +18,7 @@
- #include "main.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
-@@ -26,7 +26,7 @@
- #include "debugger.h"
- #include "prompt.h"
-
--#include <trio/trio.h>
-+#include <trio.h>
- #include <map>
-
- typedef struct
---- a/src/drivers/main.cpp
-+++ b/src/drivers/main.cpp
-@@ -26,7 +26,7 @@
- #include <signal.h>
- #include <sys/time.h>
- #include <sys/stat.h>
--#include <trio/trio.h>
-+#include <trio.h>
- #include <locale.h>
-
- #ifdef HAVE_GETPWUID
---- a/src/drivers/memdebugger.cpp
-+++ b/src/drivers/memdebugger.cpp
-@@ -26,7 +26,7 @@
- #include <mednafen/FileStream.h>
-
- #include <ctype.h>
--#include <trio/trio.h>
-+#include <trio.h>
-
- bool MemDebugger::ICV_Init(const char *newcode)
- {
---- a/src/drivers/netplay.cpp
-+++ b/src/drivers/netplay.cpp
-@@ -25,7 +25,7 @@
- #include "netplay.h"
- #include "console.h"
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "video.h"
-
---- a/src/drivers/opengl.cpp
-+++ b/src/drivers/opengl.cpp
-@@ -17,7 +17,7 @@
-
- #include "main.h"
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "video.h"
- #include "opengl.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/string.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
-@@ -22,7 +22,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>
-
- static MDFN_Surface *PreviewSurface = NULL, *TextSurface = NULL;
- static MDFN_Rect PreviewRect, TextRect;
---- a/src/drivers/video.cpp
-+++ b/src/drivers/video.cpp
-@@ -22,7 +22,7 @@
- #include <windows.h>
- #endif
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "video.h"
- #include "opengl.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
-@@ -22,7 +22,7 @@
- #include <signal.h>
- #include <sys/time.h>
- #include <sys/stat.h>
--#include <trio/trio.h>
-+#include <trio.h>
- #include <locale.h>
-
- #include "input.h"
---- a/src/error.cpp
-+++ b/src/error.cpp
-@@ -21,7 +21,7 @@
-
- #include "mednafen.h"
- #include "error.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- MDFN_Error::MDFN_Error() noexcept
- {
---- a/src/file.cpp
-+++ b/src/file.cpp
-@@ -24,7 +24,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "compress/unzip.h"
-
---- a/src/gba/GBA.cpp
-+++ b/src/gba/GBA.cpp
-@@ -40,7 +40,7 @@
- #include "arm.h"
- #include "thumb.h"
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_GBA
- {
---- a/src/general.cpp
-+++ b/src/general.cpp
-@@ -22,7 +22,7 @@
- #include <unistd.h>
-
- #include <map>
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "general.h"
- #include "state.h"
---- 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
-@@ -21,7 +21,7 @@
-
- #include "../shared.h"
- #include "4way.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_MD
- {
---- 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>
-
- namespace MDFN_IEN_MD
- {
---- a/src/md/input/megamouse.cpp
-+++ b/src/md/input/megamouse.cpp
-@@ -21,7 +21,7 @@
-
- #include "../shared.h"
- #include "megamouse.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_MD
- {
---- a/src/md/input/multitap.cpp
-+++ b/src/md/input/multitap.cpp
-@@ -25,7 +25,7 @@
-
- #include "../shared.h"
- #include "multitap.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_MD
- {
---- 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
-@@ -20,7 +20,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "netplay.h"
- #include "netplay-driver.h"
---- a/src/mempatcher.cpp
-+++ b/src/mempatcher.cpp
-@@ -24,7 +24,7 @@
- #include "mednafen.h"
-
- #include <ctype.h>
--#include <trio/trio.h>
-+#include <trio.h>
- #include <unistd.h>
-
- #include "general.h"
---- a/src/movie.cpp
-+++ b/src/movie.cpp
-@@ -20,7 +20,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
-@@ -35,7 +35,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
-@@ -18,7 +18,7 @@
- #include "mednafen.h"
-
- #include <zlib.h>
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include <map>
-
---- a/src/pce/debug.cpp
-+++ b/src/pce/debug.cpp
-@@ -16,7 +16,7 @@
- */
-
- #include "pce.h"
--#include <trio/trio.h>
-+#include <trio.h>
- #include <iconv.h>
-
- #include "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
-@@ -30,7 +30,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
-@@ -16,7 +16,7 @@
- */
-
- #include <mednafen/mednafen.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
-@@ -18,7 +18,7 @@
- #include <mednafen/mednafen.h>
- #include "psg.h"
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace PCE_Fast
- {
---- a/src/pce_fast/vdc.cpp
-+++ b/src/pce_fast/vdc.cpp
-@@ -23,7 +23,7 @@
- #include "huc.h"
- #include "pcecd.h"
- #include <mednafen/cputest/cputest.h>
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace PCE_Fast
- {
---- a/src/pcfx/debug.cpp
-+++ b/src/pcfx/debug.cpp
-@@ -21,7 +21,7 @@
-
- #include "pcfx.h"
-
--#include <trio/trio.h>
-+#include <trio.h>
- #include <iconv.h>
-
- #include "debug.h"
---- a/src/pcfx/input.cpp
-+++ b/src/pcfx/input.cpp
-@@ -26,7 +26,7 @@
- #include "input/gamepad.h"
- #include "input/mouse.h"
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_PCFX
- {
---- a/src/pcfx/interrupt.cpp
-+++ b/src/pcfx/interrupt.cpp
-@@ -21,7 +21,7 @@
-
- #include "pcfx.h"
- #include "interrupt.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_PCFX
- {
---- a/src/pcfx/king.cpp
-+++ b/src/pcfx/king.cpp
-@@ -45,7 +45,7 @@
- #include "input.h"
- #include "timer.h"
- #include "debug.h"
--#include <trio/trio.h>
-+#include <trio.h>
- #include <mednafen/video.h>
- #include <mednafen/sound/OwlResampler.h>
-
---- a/src/pcfx/pcfx.cpp
-+++ b/src/pcfx/pcfx.cpp
-@@ -36,7 +36,7 @@
- #include <mednafen/FileStream.h>
- #include <mednafen/compress/GZFileStream.h>
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- extern MDFNGI EmulatedPCFX;
-
---- a/src/pcfx/soundbox.cpp
-+++ b/src/pcfx/soundbox.cpp
-@@ -26,7 +26,7 @@
- #include <mednafen/hw_sound/pce_psg/pce_psg.h>
- #include <mednafen/sound/OwlResampler.h>
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_PCFX
- {
---- a/src/pcfx/timer.cpp
-+++ b/src/pcfx/timer.cpp
-@@ -27,7 +27,7 @@
- #include "pcfx.h"
- #include "interrupt.h"
- #include "timer.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_PCFX
- {
---- a/src/player.cpp
-+++ b/src/player.cpp
-@@ -16,7 +16,7 @@
- */
-
- #include "mednafen.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "video.h"
- #include "player.h"
---- a/src/psx/psx.h
-+++ b/src/psx/psx.h
-@@ -25,7 +25,7 @@
- #include <mednafen/mednafen.h>
- #include <mednafen/general.h>
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "masmem.h"
-
---- a/src/settings.cpp
-+++ b/src/settings.cpp
-@@ -24,7 +24,7 @@
- */
-
- #include "mednafen.h"
--#include <trio/trio.h>
-+#include <trio.h>
- #include <locale.h>
- #include <map>
- #include "settings.h"
---- a/src/state.cpp
-+++ b/src/state.cpp
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- #include <mednafen/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
-@@ -21,7 +21,7 @@
-
- #include "vb.h"
- #include <mednafen/hw_cpu/v810/v810_cpuD.h>
--#include <trio/trio.h>
-+#include <trio.h>
- #include <iconv.h>
-
- #include "debug.h"
---- a/src/vb/vb.h
-+++ b/src/vb/vb.h
-@@ -24,7 +24,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
-@@ -21,7 +21,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "png.h"
-
---- a/src/wswan/debug.cpp
-+++ b/src/wswan/debug.cpp
-@@ -21,7 +21,7 @@
- #include "dis/disasm.h"
- #include "memory.h"
- #include "gfx.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_WSWAN
- {
---- a/src/wswan/gfx.cpp
-+++ b/src/wswan/gfx.cpp
-@@ -26,7 +26,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/mempatcher.h>
- #include <mednafen/FileStream.h>
- #include <time.h>
--#include <trio/trio.h>
-+#include <trio.h>
-
- 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
-@@ -2,4 +2,4 @@
- #include <mednafen/mednafen.h>
- #include "../smpc.h"
- #include "../smpc_iodevice.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
-@@ -24,7 +24,7 @@
-
- #include <mednafen/types.h>
-
--#include <trio/trio.h>
-+#include <trio.h>
-
- namespace MDFN_IEN_SS
- {
---- a/src/drivers/sound.cpp
-+++ b/src/drivers/sound.cpp
-@@ -16,7 +16,7 @@
- */
-
- #include "main.h"
--#include <trio/trio.h>
-+#include <trio.h>
-
- #include "sound.h"
-
diff --git a/debian/rules b/debian/rules
index 1e6ec35..49dd4a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,6 @@ override_dh_auto_build:
cp src/compress/minilzo.h src/compress/minilzo.h.orig
cp /usr/share/lzo/minilzo/*.[ch] src/compress
- # Move bundled source code for external packages out of the way
- mv src/trio src/trio.orig
- mv include/trio include/trio.orig
-
dh_auto_build
override_dh_auto_clean:
@@ -33,16 +29,10 @@ override_dh_auto_clean:
[ ! -f src/compress/minilzo.c.orig ] || mv src/compress/minilzo.c.orig
src/compress/minilzo.c
[ ! -f src/compress/minilzo.h.orig ] || mv src/compress/minilzo.h.orig
src/compress/minilzo.h
- # Restore bundled source code
- [ ! -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
override_dh_auto_configure:
- dh_auto_configure -- --bindir=/usr/games --enable-psx
--with-external-mpcdec --with-external-tremor
+ dh_auto_configure -- --bindir=/usr/games --enable-psx
--with-external-mpcdec --with-external-tremor --with-external-trio
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
