[mednafen] 03/06: New upstream release

Stephen Kitt skitt at moszumanska.debian.org
Mon Jul 10 21:20:38 UTC 2017 

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

skitt pushed a commit to branch master
in repository mednafen.

commit 5ce90fc4ad82325fce06a158317bd33ddcbd1956
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Jul 10 22:35:13 2017 +0200

    New upstream release
---
 debian/changelog                     |   6 +
 debian/copyright                     |  24 +---
 debian/patches/use-system-trio.patch | 247 ++++++++++++++++++-----------------
 3 files changed, 137 insertions(+), 140 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6212fc..45e9200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mednafen (0.9.45.1+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Stephen Kitt <skitt at debian.org>  Mon, 10 Jul 2017 22:14:18 +0200
+
 mednafen (0.9.41+dfsg-2) unstable; urgency=medium
 
   * Recommend mednaffe, thanks to Alex Henry for the suggestion (closes:
diff --git a/debian/copyright b/debian/copyright
index e1713ff..4524304 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: mednafen
 Source: http://mednafen.sf.net
-Copyright: 2005-2016 Mednafen Team
+Copyright: 2005-2017 Mednafen Team
 License: GPL-2+
 Files-Excluded: tests/psx/*.exe
 
@@ -124,26 +124,6 @@ License: trio
  MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
  CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
 
-Files: src/string/ConvertUTF.*
-Comment: ConvertUTF
-Copyright: 2001-2004 Unicode, Inc.
-License: Unicode
- This source code is provided as is by Unicode, Inc. No claims are
- made as to fitness for any particular purpose. No warranties of any
- kind are expressed or implied. The recipient agrees to determine
- applicability of information provided. If this file has been
- purchased on magnetic or optical media from Unicode, Inc., the
- sole remedy for any claim will be exchange of defective media
- within 90 days of receipt.
- .
- Limitations on Rights to Redistribute This Code
- .
- Unicode, Inc. hereby grants the right to freely use the information
- supplied in this file in the creation of products supporting the
- Unicode Standard, and to make copies of this file in any form
- for internal or external distribution as long as this notice
- remains attached.
-
 Files: src/hash/md5.cpp
 Comment: MD5 Hashing; the exact license statement is contained in later
  versions of the code (see <http://www.cr0.net:8040/code/crypto/>)
diff --git a/debian/patches/use-system-trio.patch b/debian/patches/use-system-trio.patch
index 5d95aaf..5e7ccf6 100644
--- a/debian/patches/use-system-trio.patch
+++ b/debian/patches/use-system-trio.patch
@@ -6,7 +6,7 @@ source code provided.
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -88,6 +88,10 @@
+@@ -90,6 +90,10 @@
  AC_CHECK_LIB([z], [zlibVersion], ZLIB_LIBS="-lz", AC_MSG_ERROR([*** zlib not found!]))
  AC_SUBST([ZLIB_LIBS])
  
@@ -17,7 +17,7 @@ source code provided.
  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
-@@ -689,4 +693,4 @@
+@@ -697,4 +701,4 @@
  AC_SUBST([AM_CXXFLAGS], "$ALTIVEC_FLAGS $OPTIMIZER_FLAGS $WARNING_FLAGS $CODEGEN_FLAGS $CODEGEN_CXXFLAGS")
  
  dnl Output Makefiles
@@ -30,7 +30,7 @@ source code provided.
 +SUBDIRS	=
  AUTOMAKE_OPTIONS = subdir-objects
  DEFS = @DEFS@ @SNDFILE_CFLAGS@
- DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_builddir)/intl
 @@ -6,8 +6,8 @@
  bin_PROGRAMS	=	mednafen
  
@@ -50,15 +50,15 @@ source code provided.
  
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <stdarg.h>
  #include <sys/types.h>
  #include <sys/stat.h>
+ #include <fcntl.h>
 --- a/src/PSFLoader.cpp
 +++ b/src/PSFLoader.cpp
-@@ -32,7 +32,7 @@
- #include "string/trim.h"
+@@ -30,7 +30,7 @@
+ #include "general.h"
+ #include <mednafen/string/string.h>
  
- #include <limits.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  #include <ctype.h>
@@ -66,10 +66,10 @@ source code provided.
  
 --- a/src/Stream.cpp
 +++ b/src/Stream.cpp
-@@ -23,7 +23,7 @@
+@@ -22,7 +22,7 @@
+ #include <mednafen/types.h>
  #include "Stream.h"
  
- #include <stdlib.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  
@@ -83,36 +83,36 @@ source code provided.
  #include <mednafen/cdrom/cdromif.h>
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <vector>
- #include <math.h>
+ 
+ using namespace CDUtility;
  
 --- a/src/cdrom/CDAccess_CCD.cpp
 +++ b/src/cdrom/CDAccess_CCD.cpp
 @@ -24,7 +24,7 @@
- #include <mednafen/string/trim.h>
+ #include <mednafen/string/string.h>
  
  #include "CDAccess_CCD.h"
 -#include <trio/trio.h>
 +#include <trio.h>
  
- #include <limits>
- #include <limits.h>
+ #include <map>
+ 
 --- a/src/cdrom/CDAccess_Image.cpp
 +++ b/src/cdrom/CDAccess_Image.cpp
-@@ -34,7 +34,7 @@
+@@ -32,7 +32,7 @@
+ 
+ #include <sys/types.h>
  
- #include <string.h>
- #include <errno.h>
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <memory>
  
  #include <mednafen/general.h>
+ #include <mednafen/string/string.h>
 --- a/src/cdrom/cdromif.cpp
 +++ b/src/cdrom/cdromif.cpp
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
+ 
  #include "../mednafen.h"
- #include <string.h>
  #include <sys/types.h>
 -#include <trio/trio.h>
 +#include <trio.h>
@@ -121,10 +121,10 @@ source code provided.
  #include "../general.h"
 --- a/src/cdrom/scsicd.cpp
 +++ b/src/cdrom/scsicd.cpp
-@@ -18,7 +18,7 @@
+@@ -16,7 +16,7 @@
+  */
+ 
  #include <mednafen/mednafen.h>
- #include <math.h>
- #include <algorithm>
 -#include <trio/trio.h>
 +#include <trio.h>
  #include "scsicd.h"
@@ -138,9 +138,9 @@ source code provided.
  
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <stdarg.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 @@
@@ -150,8 +150,8 @@ source code provided.
 -#include <trio/trio.h>
 +#include <trio.h>
  
- #include <math.h>
- 
+ namespace MDFN_IEN_DEMO
+ {
 --- a/src/drivers/cheat.cpp
 +++ b/src/drivers/cheat.cpp
 @@ -17,7 +17,7 @@
@@ -162,7 +162,7 @@ source code provided.
 +#include <trio.h>
  #include "console.h"
  #include "video.h"
- #include <mednafen/string/trim.h>
+ #include <mednafen/string/string.h>
 --- a/src/drivers/debugger.cpp
 +++ b/src/drivers/debugger.cpp
 @@ -22,7 +22,7 @@
@@ -182,9 +182,9 @@ source code provided.
  #include "video.h"
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <algorithm>
  
  static struct
+ {
 --- a/src/drivers/gfxdebugger.cpp
 +++ b/src/drivers/gfxdebugger.cpp
 @@ -22,7 +22,7 @@
@@ -198,9 +198,9 @@ source code provided.
  static bool IsActive = 0;
 --- a/src/drivers/input.cpp
 +++ b/src/drivers/input.cpp
-@@ -19,7 +19,7 @@
+@@ -18,7 +18,7 @@
+ #include "main.h"
  
- #include <string.h>
  #include <ctype.h>
 -#include <trio/trio.h>
 +#include <trio.h>
@@ -215,15 +215,15 @@ source code provided.
  
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <vector>
  #include <map>
- #include <string>
+ 
+ typedef struct
 --- a/src/drivers/main.cpp
 +++ b/src/drivers/main.cpp
-@@ -29,7 +29,7 @@
- #include <string.h>
- #include <strings.h>
- #include <errno.h>
+@@ -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>
@@ -237,12 +237,12 @@ source code provided.
  #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 @@
+@@ -25,7 +25,7 @@
  #include "netplay.h"
  #include "console.h"
  
@@ -253,15 +253,15 @@ source code provided.
  
 --- a/src/drivers/opengl.cpp
 +++ b/src/drivers/opengl.cpp
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
+ 
  #include "main.h"
  
- #include <string.h>
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <math.h>
- #include <stdlib.h>
  
+ #include "video.h"
+ #include "opengl.h"
 --- a/src/drivers/prompt.cpp
 +++ b/src/drivers/prompt.cpp
 @@ -16,7 +16,7 @@
@@ -271,7 +271,7 @@ source code provided.
 -#include <trio/trio.h>
 +#include <trio.h>
  #include "prompt.h"
- #include <mednafen/string/ConvertUTF.h>
+ #include <mednafen/string/string.h>
  
 --- a/src/drivers/remote.cpp
 +++ b/src/drivers/remote.cpp
@@ -308,15 +308,15 @@ source code provided.
  static MDFN_Rect PreviewRect, TextRect;
 --- a/src/drivers/video.cpp
 +++ b/src/drivers/video.cpp
-@@ -25,7 +25,7 @@
- #include <math.h>
- #include <string.h>
- #include <stdlib.h>
+@@ -22,7 +22,7 @@
+ #include <windows.h>
+ #endif
+ 
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <algorithm>
  
  #include "video.h"
+ #include "opengl.h"
 --- a/src/drivers_dos/input.cpp
 +++ b/src/drivers_dos/input.cpp
 @@ -19,7 +19,7 @@
@@ -330,10 +330,10 @@ source code provided.
  #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>
+@@ -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>
@@ -341,10 +341,10 @@ source code provided.
  #include "input.h"
 --- a/src/error.cpp
 +++ b/src/error.cpp
-@@ -23,7 +23,7 @@
+@@ -21,7 +21,7 @@
+ 
+ #include "mednafen.h"
  #include "error.h"
- #include <string.h>
- #include <stdarg.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  
@@ -352,10 +352,10 @@ source code provided.
  {
 --- a/src/file.cpp
 +++ b/src/file.cpp
-@@ -27,7 +27,7 @@
+@@ -24,7 +24,7 @@
+ #include <sys/types.h>
  #include <sys/stat.h>
  #include <unistd.h>
- #include <errno.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  
@@ -363,20 +363,20 @@ source code provided.
  
 --- a/src/gba/GBA.cpp
 +++ b/src/gba/GBA.cpp
-@@ -42,7 +42,7 @@
+@@ -40,7 +40,7 @@
+ #include "arm.h"
+ #include "thumb.h"
  
- #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 @@
+@@ -22,7 +22,7 @@
+ #include <unistd.h>
  
- #include <string>
  #include <map>
 -#include <trio/trio.h>
 +#include <trio.h>
@@ -473,29 +473,29 @@ source code provided.
  {
 --- a/src/mednafen.cpp
 +++ b/src/mednafen.cpp
-@@ -24,7 +24,7 @@
+@@ -20,7 +20,7 @@
  #include	<sys/types.h>
  #include	<sys/stat.h>
  #include	<unistd.h>
 -#include	<trio/trio.h>
 +#include	<trio.h>
- #include	<list>
- #include	<algorithm>
  
+ #include	"netplay.h"
+ #include	"netplay-driver.h"
 --- a/src/mempatcher.cpp
 +++ b/src/mempatcher.cpp
-@@ -25,7 +25,7 @@
+@@ -24,7 +24,7 @@
+ #include "mednafen.h"
  
- #include <string.h>
  #include <ctype.h>
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <errno.h>
  #include <unistd.h>
- #include <vector>
+ 
+ #include "general.h"
 --- a/src/movie.cpp
 +++ b/src/movie.cpp
-@@ -21,7 +21,7 @@
+@@ -20,7 +20,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <unistd.h>
@@ -528,7 +528,7 @@ source code provided.
  	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 @@
+@@ -35,7 +35,7 @@
  #include	"vsuni.h"
  #include	"debug.h"
  
@@ -550,21 +550,21 @@ source code provided.
  #ifdef	__MMX__
 --- a/src/netplay.cpp
 +++ b/src/netplay.cpp
-@@ -22,7 +22,7 @@
+@@ -18,7 +18,7 @@
+ #include "mednafen.h"
+ 
  #include <zlib.h>
- #include <string>
- #include <math.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  
- #include <vector>
- #include <list>
+ #include <map>
+ 
 --- a/src/pce/debug.cpp
 +++ b/src/pce/debug.cpp
-@@ -17,7 +17,7 @@
+@@ -16,7 +16,7 @@
+  */
  
  #include "pce.h"
- #include <string.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  #include <iconv.h>
@@ -583,7 +583,7 @@ source code provided.
  {
 --- a/src/pce/vce.cpp
 +++ b/src/pce/vce.cpp
-@@ -31,7 +31,7 @@
+@@ -30,7 +30,7 @@
  #include <mednafen/hw_video/huc6270/vdc.h>
  #include "debug.h"
  #include "pcecd.h"
@@ -594,10 +594,10 @@ source code provided.
  {
 --- a/src/pce_fast/pcecd_drive.cpp
 +++ b/src/pce_fast/pcecd_drive.cpp
-@@ -17,7 +17,7 @@
+@@ -16,7 +16,7 @@
+  */
  
  #include <mednafen/mednafen.h>
- #include <math.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  #include "pcecd_drive.h"
@@ -605,10 +605,10 @@ source code provided.
  #include <mednafen/cdrom/SimpleFIFO.h>
 --- a/src/pce_fast/psg.cpp
 +++ b/src/pce_fast/psg.cpp
-@@ -20,7 +20,7 @@
+@@ -18,7 +18,7 @@
+ #include <mednafen/mednafen.h>
+ #include "psg.h"
  
- #include <math.h>
- #include <string.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  
@@ -622,20 +622,20 @@ source code provided.
  #include <mednafen/cputest/cputest.h>
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <math.h>
  
  namespace PCE_Fast
+ {
 --- a/src/pcfx/debug.cpp
 +++ b/src/pcfx/debug.cpp
-@@ -22,7 +22,7 @@
+@@ -21,7 +21,7 @@
+ 
  #include "pcfx.h"
  
- #include <string.h>
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <stdarg.h>
  #include <iconv.h>
  
+ #include "debug.h"
 --- a/src/pcfx/input.cpp
 +++ b/src/pcfx/input.cpp
 @@ -26,7 +26,7 @@
@@ -666,9 +666,9 @@ source code provided.
  #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
 @@ -36,7 +36,7 @@
@@ -677,9 +677,9 @@ source code provided.
  
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <errno.h>
- #include <string.h>
- #include <math.h>
+ 
+ extern MDFNGI EmulatedPCFX;
+ 
 --- a/src/pcfx/soundbox.cpp
 +++ b/src/pcfx/soundbox.cpp
 @@ -26,7 +26,7 @@
@@ -688,9 +688,9 @@ source code provided.
  
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <math.h>
- #include <string.h>
  
+ namespace MDFN_IEN_PCFX
+ {
 --- a/src/pcfx/timer.cpp
 +++ b/src/pcfx/timer.cpp
 @@ -27,7 +27,7 @@
@@ -710,9 +710,9 @@ source code provided.
  #include "mednafen.h"
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <math.h>
  
  #include "video.h"
+ #include "player.h"
 --- a/src/psx/psx.h
 +++ b/src/psx/psx.h
 @@ -25,7 +25,7 @@
@@ -726,18 +726,18 @@ source code provided.
  
 --- a/src/settings.cpp
 +++ b/src/settings.cpp
-@@ -28,7 +28,7 @@
- #include <string.h>
- #include <vector>
- #include <string>
+@@ -24,7 +24,7 @@
+ */
+ 
+ #include "mednafen.h"
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <math.h>
  #include <locale.h>
  #include <map>
+ #include "settings.h"
 --- a/src/state.cpp
 +++ b/src/state.cpp
-@@ -23,7 +23,7 @@
+@@ -22,7 +22,7 @@
  #include <unistd.h>
  #include <mednafen/Time.h>
  
@@ -748,15 +748,15 @@ source code provided.
  #include "state.h"
 --- a/src/vb/debug.cpp
 +++ b/src/vb/debug.cpp
-@@ -22,7 +22,7 @@
+@@ -21,7 +21,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>
  
+ #include "debug.h"
 --- a/src/vb/vb.h
 +++ b/src/vb/vb.h
 @@ -24,7 +24,7 @@
@@ -770,21 +770,21 @@ source code provided.
  {
 --- a/src/video/video.cpp
 +++ b/src/video/video.cpp
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include <stdarg.h>
+@@ -21,7 +21,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
  
 -#include <trio/trio.h>
 +#include <trio.h>
  
- #include <vector>
+ #include "png.h"
  
 --- a/src/wswan/debug.cpp
 +++ b/src/wswan/debug.cpp
-@@ -22,7 +22,7 @@
+@@ -21,7 +21,7 @@
+ #include "dis/disasm.h"
  #include "memory.h"
  #include "gfx.h"
- #include <stdarg.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  
@@ -814,10 +814,10 @@ source code provided.
  {
 --- a/src/wswan/memory.cpp
 +++ b/src/wswan/memory.cpp
-@@ -31,7 +31,7 @@
+@@ -30,7 +30,7 @@
+ #include <mednafen/mempatcher.h>
  #include <mednafen/FileStream.h>
  #include <time.h>
- #include <math.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  
@@ -880,10 +880,10 @@ source code provided.
  {
 --- a/src/ss/input/common.h
 +++ b/src/ss/input/common.h
-@@ -1,4 +1,4 @@
- #include "../ss.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
@@ -899,12 +899,23 @@ source code provided.
  
 --- a/src/ss/ss.h
 +++ b/src/ss/ss.h
-@@ -27,7 +27,7 @@
- #include <stdint.h>
- #include <stdarg.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"
+ 

-- 
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