[mednafen] 04/05: New upstream release

Tue Jan 24 07:50:25 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 3e3593d166b9eeed9dafb44a85effec17a45545f
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Jan 23 20:29:55 2017 +0100

    New upstream release
---
 debian/changelog                     |  5 +++--
 debian/copyright                     |  7 +++----
 debian/patches/use-system-trio.patch | 30 +++++++++++++++---------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d19db71..30caa58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-mednafen (0.9.39.2+dfsg-2) UNRELEASED; urgency=medium
+mednafen (0.9.41+dfsg-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * Update upstream URLs, Mednafen has moved to
     http://mednafen.github.io.
 
- -- Stephen Kitt <skitt at debian.org>  Mon, 23 Jan 2017 20:00:31 +0100
+ -- Stephen Kitt <skitt at debian.org>  Mon, 23 Jan 2017 20:02:13 +0100
 
 mednafen (0.9.39.2+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 48bb0f7..e1713ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,12 +6,12 @@ License: GPL-2+
 Files-Excluded: tests/psx/*.exe
 
 Files: *
-Copyright: 2005-2016 Mednafen Team
+Copyright: 2005-2017 Mednafen Team
 License: GPL-2+
 
 Files: debian/*
 Copyright: 2005-2008 Ryan Schultz
-           2010-2016 Stephen Kitt
+           2010-2017 Stephen Kitt
 License: GPL-2+
 
 Files: src/mpcdec/*
@@ -167,7 +167,7 @@ Files:
  src/compress/lzo*
  src/compress/minilzo.*
 Comment: MiniLZO <http://www.oberhumer.com/opensource/lzo/>
-Copyright: 1996-2005 Markus Franz Xaver Johannes Oberhumer
+Copyright: 1996-2015 Markus Franz Xaver Oberhumer
 License: GPL-2+
 
 Files: src/hw_cpu/z80-fuse/*
@@ -356,7 +356,6 @@ Files:
  configure
  depcomp
  INSTALL
- ltmain.sh
  Makefile.in
  missing
 Comment: autotools files
diff --git a/debian/patches/use-system-trio.patch b/debian/patches/use-system-trio.patch
index ecf423e..5d95aaf 100644
--- a/debian/patches/use-system-trio.patch
+++ b/debian/patches/use-system-trio.patch
@@ -7,8 +7,8 @@ source code provided.
 --- a/configure.ac
 +++ b/configure.ac
 @@ -88,6 +88,10 @@
- AC_CHECK_LIB([z], [zlibVersion],[], AC_MSG_ERROR([*** zlib not found!]))
- AC_SUBST([ZLIB_LIBS], [-lz])
+ 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])
@@ -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
-@@ -692,4 +696,4 @@
+@@ -689,4 +693,4 @@
  AC_SUBST([AM_CXXFLAGS], "$ALTIVEC_FLAGS $OPTIMIZER_FLAGS $WARNING_FLAGS $CODEGEN_FLAGS $CODEGEN_CXXFLAGS")
  
  dnl Output Makefiles
@@ -29,12 +29,12 @@ source code provided.
 -SUBDIRS	= trio
 +SUBDIRS	=
  AUTOMAKE_OPTIONS = subdir-objects
- DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ @SNDFILE_CFLAGS@
+ DEFS = @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 SSFLoader.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 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 		=
@@ -99,15 +99,15 @@ source code provided.
  #include <limits.h>
 --- a/src/cdrom/CDAccess_Image.cpp
 +++ b/src/cdrom/CDAccess_Image.cpp
-@@ -35,7 +35,7 @@
+@@ -34,7 +34,7 @@
+ 
  #include <string.h>
  #include <errno.h>
- #include <time.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  #include <memory>
  
- #include "../general.h"
+ #include <mednafen/general.h>
 --- a/src/cdrom/cdromif.cpp
 +++ b/src/cdrom/cdromif.cpp
 @@ -18,7 +18,7 @@
@@ -143,10 +143,10 @@ source code provided.
  #include <sys/stat.h>
 --- a/src/demo/demo.cpp
 +++ b/src/demo/demo.cpp
-@@ -19,7 +19,7 @@
- #include <mednafen/sound/OwlResampler.h>
+@@ -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>
  
@@ -171,9 +171,9 @@ source code provided.
  
 -#include <trio/trio.h>
 +#include <trio.h>
- #include <time.h>
  #include <map>
  #include "debugger.h"
+ #include "gfxdebugger.h"
 --- a/src/drivers/fps.cpp
 +++ b/src/drivers/fps.cpp
 @@ -17,7 +17,7 @@
@@ -308,7 +308,7 @@ source code provided.
  static MDFN_Rect PreviewRect, TextRect;
 --- a/src/drivers/video.cpp
 +++ b/src/drivers/video.cpp
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
  #include <math.h>
  #include <string.h>
  #include <stdlib.h>
@@ -739,7 +739,7 @@ source code provided.
 +++ b/src/state.cpp
 @@ -23,7 +23,7 @@
  #include <unistd.h>
- #include <time.h>
+ #include <mednafen/Time.h>
  
 -#include <trio/trio.h>
 +#include <trio.h>
@@ -792,7 +792,7 @@ source code provided.
  {
 --- a/src/wswan/gfx.cpp
 +++ b/src/wswan/gfx.cpp
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
  #include "rtc.h"
  #include "comm.h"
  #include <mednafen/video.h>
@@ -814,7 +814,7 @@ source code provided.
  {
 --- a/src/wswan/memory.cpp
 +++ b/src/wswan/memory.cpp
-@@ -30,7 +30,7 @@
+@@ -31,7 +31,7 @@
  #include <mednafen/FileStream.h>
  #include <time.h>
  #include <math.h>

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

