[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.8.D.3-1-31-g5df3aa8

Stephen Kitt steve at sk2.org
Sat Nov 12 10:24:15 UTC 2011 

The following commit has been merged in the master-experimental branch:
commit 13dc1b6f55d617048076e444639be563e056704b
Merge: fa1ccd274878fa64cc85a0376ffd19dc9cbac051 42a677ecb4307b02c520443484f1868224f79147
Author: Stephen Kitt <steve at sk2.org>
Date:   Wed Nov 9 07:20:46 2011 +0100

    Merge branch 'master' into master-experimental

diff --combined debian/changelog
index 999418e,f951c6d..12a3857
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,17 +1,27 @@@
 -mednafen (0.8.D.3-2) unstable; urgency=low
++mednafen (0.9.17.1-2) experimental; urgency=low
+ 
+   * Fix "debian/control uses hardcoded list of non-Linux architectures" -
+     qualify libasound2-dev dependency using [linux-any] instead of
+     [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] (closes: #634461).
+   * Install .desktop file allowing file association, with known
+     supported MIME types, as suggested by Damian Yarrick (LP: #886912;
+     helps with #635538).
+   * Simplify rules using dh 9 and enable hardening.
+   * Build-conflict with autoconf2.13 which causes the build to fail.
 -  * Standards-Version 3.9.2, no change required beyond the above.
+ 
+  -- Stephen Kitt <steve at sk2.org>  Tue, 08 Nov 2011 07:20:54 +0100
+ 
 +mednafen (0.9.17.1-1) experimental; urgency=low
 +
 +  * New upstream WIP version (closes: #614263), adding emulators for Sega
 +    Genesis / Mega Drive, Virtual Boy, and Super Nintendo Entertainment
 +    System.
 +  * Use external libvorbisidec instead of the bundled copy.
 +  * Use external minilzo instead of the bundled copy.
 +  * Standards-Version 3.9.2, no change required.
 +
 + -- Stephen Kitt <steve at sk2.org>  Wed, 13 Apr 2011 22:33:57 +0200
 +
  mednafen (0.8.D.3-1) unstable; urgency=low
  
    * New upstream version, fixing a significant memory leak.
diff --combined debian/control
index 11ff810,b4853fb..02f9df6
--- a/debian/control
+++ b/debian/control
@@@ -3,14 -3,13 +3,15 @@@ Section: game
  Priority: optional
  Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
  Uploaders: Stephen Kitt <steve at sk2.org>
- Build-Depends: debhelper (>= 5), autotools-dev, x11proto-core-dev,
+ Build-Depends: debhelper (>= 8.1.3), autotools-dev, x11proto-core-dev,
   libgl1-mesa-dev | libgl-dev, zlib1g-dev | libz-dev, libsdl1.2-dev,
   libsamplerate0-dev, libsdl-net1.2-dev, libcdio-dev,
   libsndfile1-dev | libsndfile-dev,
-  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+  libasound2-dev [linux-any],
 - libjack-dev
 + libjack-dev,
 + libvorbisidec-dev,
 + liblzo2-dev
+ Build-Conflicts: autoconf2.13
  Standards-Version: 3.9.2
  Homepage: http://mednafen.sourceforge.net
  Vcs-Git: git://git.debian.org/git/pkg-games/mednafen.git
@@@ -26,23 -25,17 +27,23 @@@ Description: multi-platform emulator, i
   configuration, joystick and keyboard support, save states, game rewinding,
   GSF playback, and screenshots.
   .
 + This is the "work in progress" version; in particular, there is no
 + guarantee that save states will work from one version to the next.
 + .
   The systems supported by Mednafen are:
      * Atari Lynx
      * GameBoy
      * GameBoy Color
      * GameBoy Advance
      * NES
 +    * SNES
 +    * Virtual Boy
      * PC Engine (TurboGrafx 16)
      * PC-FX
      * SuperGrafx
      * NeoGeo Pocket, NeoGeo Pocket Color
      * WonderSwan
 +    * Sega Genesis / Mega Drive
   .
   Hardware emulated by Mednafen includes:
      * NES gamepad, Zapper, PowerPad
diff --combined debian/patches/hardening-fixes.patch
index 0000000,cb0aa65..538defb
mode 000000,100644..100644
--- a/debian/patches/hardening-fixes.patch
+++ b/debian/patches/hardening-fixes.patch
@@@ -1,0 -1,30 +1,14 @@@
+ Description: Always use format specifier when formatting a variable string
+ Author: Stephen Kitt <steve at sk2.org>
+ 
+ --- mednafen.orig/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp
+ +++ mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp
+ @@ -209,7 +209,7 @@
+  
+  	if (size == 0 && first == 0xC7)
+  	{
+ -		sprintf(str_r, extra);
+ +		sprintf(str_r, "%s", extra);
+  		return;
+  	}
+  
 ---- mednafen.orig/src/drivers/input.cpp
 -+++ mednafen/src/drivers/input.cpp
 -@@ -1520,12 +1520,9 @@
 - /* Configures an individual virtual button. */
 - static int subcon(const char *text, std::vector<ButtConfig> &bc, int commandkey)
 - {
 -- char buf[256];
 --
 -  while(1)
 -  {
 --  sprintf(buf,"%s (%d)",text,subcon_wc+1);
 --  MDFNI_DispMessage(buf);
 -+  MDFNI_DispMessage("%s (%d)", text, subcon_wc + 1);
 - 
 -   if(subcon_tb != subcon_wc)
 -   {
diff --combined debian/patches/series
index d06c054,3d1d63b..762d936
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,1 +1,2 @@@
 +use-system-tremor.patch
+ hardening-fixes.patch
diff --combined debian/rules
index b90ead8,d34186e..1713de9
--- a/debian/rules
+++ b/debian/rules
@@@ -4,91 -4,8 +4,27 @@@
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
  
- # These are used for cross-compiling and for saving the configure script
- # from having to guess our platform (since we know it already)
- DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
- DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
- DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
- 
- CFLAGS = -Wall
- 
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- 	CFLAGS += -O0
- else
- 	CFLAGS += -O2
- endif
- 
- ifeq "$(DEB_HOST_ARCH)" "i386"
- 	CFLAGS += -mtune=i686
- endif
- 
- config.status: configure
- 	dh_testdir
- 	# Add here commands to configure the package.
- 	CFLAGS="$(CFLAGS) -Wl,-z,defs" CXXFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath --bindir=/usr/games
- 
- build: build-stamp
- 
- build-stamp:  config.status
- 	dh_testdir
+ %:
+ 	dh $@
  
++override_dh_auto_build:
 +	# Update MiniLZO
 +	cp src/compress/lzoconf.h src/compress/lzoconf.h.orig
 +	cp src/compress/lzodefs.h src/compress/lzodefs.h.orig
 +	cp src/compress/minilzo.c src/compress/minilzo.c.orig
 +	cp src/compress/minilzo.h src/compress/minilzo.h.orig
 +	cp /usr/share/lzo/minilzo/*.[ch] src/compress
 +
- 	# Add here commands to compile the package.
- 	CFLAGS="$(CFLAGS) -Wl,-z,defs" CXXFLAGS="$(CFLAGS) -Wl,-z,defs"  $(MAKE)
- 
- 	touch build-stamp
- 
- clean:
- 	dh_testdir
- 	dh_testroot
- 	rm -f build-stamp 
- 
- 	# Add here commands to clean up after the build process.
- 	[ ! -f Makefile ] || make distclean
++	dh_auto_build
 +
++override_dh_auto_clean:
 +	# Restore MiniLZO
 +	[ ! -f src/compress/lzoconf.h.orig ] || mv src/compress/lzoconf.h.orig src/compress/lzoconf.h
 +	[ ! -f src/compress/lzodefs.h.orig ] || mv src/compress/lzodefs.h.orig src/compress/lzodefs.h
 +	[ ! -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
 +
- 	dh_clean config.log m4/Makefile
- 
- install: build
- 	dh_testdir
- 	dh_testroot
- 	dh_clean -k 
- 	dh_installdirs
- 
- 	# Add here commands to install the package into debian/mednafen.
- 	$(MAKE) install DESTDIR=$(CURDIR)/debian/mednafen
- 
- 
- # Build architecture-independent files here.
- binary-indep: build install
- # We have nothing to do by default.
- 
- # Build architecture-dependent files here.
- binary-arch: build install
- 	dh_testdir
- 	dh_testroot
- 	dh_installchangelogs ChangeLog
- 	dh_installdocs
- 	dh_installman debian/mednafen.6
- 	dh_strip
- 	dh_compress
- 	dh_fixperms
- 	dh_installdeb
- 	dh_shlibdeps
- 	dh_gencontrol
- 	dh_md5sums
- 	dh_builddeb
++	dh_auto_clean
 +
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install 
+ override_dh_auto_configure:
+ 	dh_auto_configure -- --bindir=/usr/games

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

More information about the Pkg-games-commits mailing list