subject:"\[mednafen\] 03\/04\: New upstream release"

[mednafen] 03/04: New upstream release

2017-09-21 Thread Stephen Kitt

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 
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   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..000
--- 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..000
--- a/debian/patches/use-system-trio.patch
+++ /dev/null
@@ -1,921 +0,0 @@
-Subject: Use packaged libtrio instead of provided copy
-From: Stephen Kitt 
-
-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 
- 
--#include 
-+#include 
- #include 
- #include 
- #include 
 a/src/PSFLoader.cpp
-+++ b/src/PSFLoader.cpp
-@@ -30,7 +30,7 @@
- #include "general.h"
- #include 
- 
--#include 
-+#include 
- #include 
- #include 
- 
 a/src/Stream.cpp
-+++ b/src/Stream.cpp
-@@ -22,7 +22,7 @@
- #include 
- #include "Stream.h"
- 
--#include 
-+#include 
- 
- Stream::Stream()
- {
 a/src/cdplay/cdplay.cpp
-+++ b/src/cdplay/cdplay.cpp
-@@ -23,7 +23,7 @@
- 
- #include 
- #include 
--#include 
-+#include 
- 
- using namespace CDUtility;
- 
 a/src/cdrom/CDAccess_CCD.cpp
-+++ b/src/cdrom/CDAccess_CCD.cpp
-@@ -24,7 +24,7 @@
- #include 
- 
- #include "CDAccess_CCD.h"
--#include 
-+#include 
- 
- #include 
- 
 a/src/cdrom/CDAccess_Image.cpp
-+++ b/src/cdrom/CDAccess_Image.cpp
-@@ -32,7 +32,7 @@
- 
- #include 
- 
--#include 
-+#include 
- 
- #include 
- #include 
 a/src/cdrom/cdromif.cpp
-+++ b/src/cdrom/cdromif.cpp
-@@ -18,7 +18,7 @@
- #include 
- #include 
- #include 
--#include 
-+#include 
- #include "cdromif.h"
- #include "CDAccess.h"
- 
 a/src/cdrom/scsicd.cpp
-+++ b/src/cdrom/scsicd.cpp
-@@ -16,7 +16,7 @@
-  */
- 
- #include 
--#include 
-+#include 
- #include "scsicd.h"
- #include "cdromif.h"
- #include "SimpleFIFO.h"
--

[mednafen] 03/04: New upstream release

2016-09-21 Thread Stephen Kitt

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 
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 
 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..000
--- a/debian/patches/gcc-6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Disambiguate abs() to build with GCC 6
-Author: Stephen Kitt 
-
 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..000
--- a/debian/patches/spelling-fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Spelling fixes
-Author: Stephen Kitt 
-
 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);
-

[mednafen] 03/04: New upstream release.

2014-12-25 Thread Stephen Kitt

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

skitt pushed a commit to branch master
in repository mednafen.

commit c67ce14504cbb1bc3f8e20ba8d1034d10dcaabdd
Author: Stephen Kitt 
Date:   Wed Dec 24 08:09:19 2014 +0100

New upstream release.
---
 debian/changelog   |   6 ++
 debian/copyright   | 109 ++---
 debian/patches/use-system-mpcdec.patch |  14 ++---
 debian/patches/use-system-tremor.patch |  14 ++---
 debian/patches/use-system-trio.patch   |  19 +++---
 5 files changed, 103 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa4db5f..1d07bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mednafen (0.9.37.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Stephen Kitt   Wed, 24 Dec 2014 07:55:50 +0100
+
 mednafen (0.9.36.5-1) experimental; urgency=medium
 
   * New upstream release, uploaded to expermiental for the Jessie freeze.
diff --git a/debian/copyright b/debian/copyright
index 7e52c82..775c8b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,13 +46,48 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files:
+ src/mpcdec/datatypes.h
+ src/mpcdec/mpcmath.h
+Copyright: 2005 The Musepack Development Team
+License: LGPL-2.1+
+
+Files: src/mpcdec/minimax.h
+Copyright: 1999-2004 Buschmann/Klemm/Piecha/Wolf
+License: LGPL-2.1+
+
 Files: src/tremor/*
 Comment: Tremor 
 Copyright: 2002 Xiph.org Foundation
-License: BSD-Xiph
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files:
- src/compress/blz.c
  src/hw_sound/gb_apu/*
  src/hw_sound/sms_apu/*
  src/hw_sound/ym2612/*
@@ -68,7 +103,7 @@ License: GPL-2+
 Files: src/lynx/*
 Comment: Handy 
 Copyright: 2004 K. Wilkins
-License: Handy
+License: Zlib
  This software is provided 'as-is', without any express or implied warranty.
  In no event will the authors be held liable for any damages arising from
  the use of this software.
@@ -150,7 +185,7 @@ License: Unicode
  for internal or external distribution as long as this notice
  remains attached.
 
-Files: src/md5.cpp
+Files: src/hash/md5.cpp
 Comment: MD5 Hashing; the exact license statement is contained in later
  versions of the code (see )
 Copyright: Christophe Devine
@@ -266,7 +301,7 @@ Copyright: 1998 BERO
   2003 CaH4e3
 License: GPL-2+
 
-Files: src/compress/quicklz.*
+Files: src/quicklz/*
 Comment: QuickLZ 
 Copyright: 2006-2008 Lasse Mikkel Reinhold
 License: GPL-1 or GPL-2
@@ -295,6 +330,10 @@ Comment: Genesis Plus 
 Copyright: 1998-2003 Charles MacDonald
 License: GPL-2+
 
+Files: src/hw_sound/pce_psg/pce_psg.*
+Copyright: 2001 Charles MacDonald
+License: GPL-2+
+
 Files:
  src/md/hvc.h
  src/md/cart/map_eeprom.cpp
@@ -336,7 +375,7 @@ Files:
  src/nes/boards/emu2413.*
 Comment: EMU2413
 Copyright: 2004 Mitsutaka Okazaki
-License: EMU2413
+License: Zlib
  This software is provided 'as-is', without any express or implied warranty.
  In no event will the authors be held liable for any damages arising from
  the use of this software.
@@ -390,7 +429,6 @@ License: LGPL-2+
 Files:
  aclocal.m4
  compile
- config.*
  configure
  depcomp
  INSTALL
@@ -448,13 +486,40 @@ Files: src/resampler/*
 Comment: Speex resampler

[mednafen] 03/04: New upstream release

[mednafen] 03/04: New upstream release

[mednafen] 03/04: New upstream release.

3 matches

Site Navigation

Mail list logo

Footer information