Bug#686676: unblock: mame/0.146-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team
Please unblock package mame
The mame package available in wheezy segfaults at startup on i386 (which is
after all a rather common architecture)
This has been reported in #678249 and fixed in mame/0.146-2.
I include a debdiff of mame/0.146-2.
Thank you
unblock mame/0.146-2
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-3-amd64 (SMP w/8 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
diff -Nru mame-0.146/debian/changelog mame-0.146/debian/changelog
--- mame-0.146/debian/changelog 2012-09-04 14:43:13.000000000 +0200
+++ mame-0.146/debian/changelog 2012-09-03 16:53:28.000000000 +0200
@@ -1,3 +1,15 @@
+mame (0.146-2) unstable; urgency=low
+
+ [ Cesare Falco ]
+ * mame.ini: start mame in full screen until issue solved in Ubuntu, see:
+ https://bugs.launchpad.net/ubuntu/+source/mame/+bug/994508
+ * Man page updated to 0.146
+
+ [ Emmanuel Kasper ]
+ * Default gcc optimize flag switched to -O2 (-O3 segfaults on arm and i386)
+
+ -- Emmanuel Kasper <emmanuel@libera.cc> Thu, 19 Jul 2012 22:15:16 +0200
+
mame (0.146-1) unstable; urgency=low
[ Emmanuel Kasper ]
diff -Nru mame-0.146/debian/mame.ini mame-0.146/debian/mame.ini
--- mame-0.146/debian/mame.ini 2012-09-04 14:43:13.000000000 +0200
+++ mame-0.146/debian/mame.ini 2012-09-03 16:53:28.000000000 +0200
@@ -30,5 +30,5 @@
video opengl
# Set multithreading to '1' if you have more than one core
multithreading 0
-# Set nowindow to 0 if you want MAME to start fullscreen
-nowindow 1
+# Set window to '1' if you want MAME to start in a window
+window 0
diff -Nru mame-0.146/debian/patches/mame_manpage_fixes.patch mame-0.146/debian/patches/mame_manpage_fixes.patch
--- mame-0.146/debian/patches/mame_manpage_fixes.patch 1970-01-01 01:00:00.000000000 +0100
+++ mame-0.146/debian/patches/mame_manpage_fixes.patch 2012-09-03 16:53:28.000000000 +0200
@@ -0,0 +1,318 @@
+Author: Cesare Falco <cesare.falco@gmail.com>
+Description: Fix mame.6 and jedutil.1, update chdman.1
+Forwarded: yes
+
+Index: mame-0.146u1/src/osd/sdl/man/mame.6
+===================================================================
+--- mame-0.146u1.orig/src/osd/sdl/man/mame.6 2012-06-14 20:43:29.000000000 +0200
++++ mame-0.146u1/src/osd/sdl/man/mame.6 2012-06-14 20:43:43.000000000 +0200
+@@ -13,7 +13,7 @@
+ .\" and updated by Andrew Burton <burtona@gol.com>, July 2003
+ .\"
+ .\"
+-.TH MAME 1 2012-03-25 0.145u5 "MAME \- The Multiple Arcade Machine Emulator"
++.TH MAME 6 2012-06-14 0.146u1 "MAME \- The Multiple Arcade Machine Emulator"
+ .\"
+ .\"
+ .\" NAME chapter
+@@ -795,7 +795,7 @@
+ .B \-[no]sound
+ Enable or disable sound altogether. The default is ON (\-sound).
+ .TP
+-.B \-samplerate, \-sr \fIvalue
++.B \-samplerate, \-srf \fIvalue
+ Sets the audio sample rate. Smaller values (e.g. 11025) cause lower
+ audio quality but faster emulation speed. Higher values (e.g. 48000)
+ cause higher audio quality but slower emulation speed. The default is
+Index: mame-0.146u1/src/osd/sdl/man/chdman.1
+===================================================================
+--- mame-0.146u1.orig/src/osd/sdl/man/chdman.1 2012-06-14 20:43:29.000000000 +0200
++++ mame-0.146u1/src/osd/sdl/man/chdman.1 2012-06-14 20:43:43.000000000 +0200
+@@ -6,7 +6,7 @@
+ .\" Ashley T. Howes <debiandev@ashleyhowes.com>, February 2005
+ .\" updated by Cesare Falco <cesare.falco@gmail.com>, February 2007
+ .\"
+-.TH CHDMAN 1 2012-03-25 0.145u5 "MAME Compressed Hunks of Data (CHD) manager"
++.TH CHDMAN 1 2012-06-14 0.146u1 "MAME Compressed Hunks of Data (CHD) manager"
+ .\"
+ .\" NAME chapter
+ .SH NAME
+@@ -25,41 +25,154 @@
+ .\"
+ .\" OPTIONS chapter
+ .SH OPTIONS
+-.TP
+-.B \info \fIinput\fR.chd
++Please note that each option allows a set of switches, the meaning of each
++is explained in the \fBSWITCHES\fR section below. Whenever the short form
++for the switch is listed, the long one may be used instead.
++.TP
++.B help \fR[\fIoption\fR]
++Print a summary of the available options or, if \fIoption\fR is given, a
++detailed list of the valid switches for the option.
++.TP
++.B info \
++\-i \fIfilename\fR \
++[\fB\-v\fR]
+ Dump the header information from a drive image.
+ .TP
+-.B verify \fIinput\fR.chd
++.B verify \
++\-i \fIfileiname\fR \
++[\fB\-ip \fIfilename\fR]
+ Validate the MD5/SHA1 on a drive image.
+ .TP
+-.B createraw \fIinputhd\fR.raw \fIoutput\fR.chd [\fIinputoffs\fR [\fIhunksize\fR]]
++.B createraw \
++\-o \fIfilename\fR \
++[\fB\-op \fIfilename\fR] \
++[\fB\-f\fR] \
++\fB\-i \fIfilename\fR \
++[\fB\-isb \fIoffset\fR] \
++[\fB\-ish \fIoffset\fR] \
++[\fB\-ib \fIlength\fR] \
++[\fB\-ih \fIlength\fR] \
++\fB\-hs \fIbytes\fR \
++\fB\-us \fIbytes\fR \
++[\fB\-c none\fR|type1[,[...]]] \
++[\fB\-np \fIprocessors\fR]
+ Create a new compressed raw image from a raw file.
+ .TP
+-.B createhd \fIinputhd\fR.raw \fIoutput\fR.chd [\fIinputoffs\fR [\fIcylinders \
+-heads sectors \fR[\fIsectorsize\fR [\fIhunksize\fR]]]]
++.B createhd \
++\-o \fIfilename\fR \
++[\fB\-op \fIfilename\fR] \
++[\fB\-f\fR] \
++[\fB\-i \fIfilename\fR] \
++[\fB\-isb \fIoffset\fR] \
++[\fB\-ish \fIoffset\fR] \
++[\fB\-ib \fIlength\fR] \
++[\fB\-ih \fIlength\fR] \
++[\fB\-hs \fIbytes\fR] \
++[\fB\-c none\fR|type1[,[...]]] \
++[\fB\-chs \fIcylinders\fB,\fIheads\fB,\fIsectors\fR] \
++[\fB\-ss \fIbytes\fR] \
++[\fB\-np \fIprocessors\fR]
+ Create a new compressed hard disk image from a raw file.
+ .TP
+-.B createcd \fIinput\fR.toc \fIoutput\fR.chd
++.B createcd \
++\-o \fIfilename\fR \
++[\fB\-op \fIfilename\fR] \
++[\fB\-f\fR] \
++\fB\-i \fIfilename\fR \
++[\fB\-hs \fIbytes\fR] \
++[\fB\-c none\fR|type1[,[...]]] \
++[\fB\-np \fIprocessors\fR]
+ Create a new compressed CD image from a raw file.
+ .TP
+-.B createld \fIinput\fR.toc \fIoutput\fR.chd
++.B createld \
++\-o \fIfilename\fR \
++[\fB\-op \fIfilename\fR] \
++[\fB\-f\fR] \
++\fB\-i \fIfilename\fR \
++[\fB\-isf \fIoffset\fR] \
++[\fB\-if \fIlength\fR] \
++[\fB\-hs \fIbytes\fR] \
++[\fB\-c none\fR|type1[,[...]]] \
++[\fB\-np \fIprocessors\fR]
+ Create a new compressed laserdisc image from a raw file.
+ .TP
+-.B extractraw \fIinput\fR.chd \fIoutput\fR.raw
++.B extractraw \
++\-o \fIfilename\fR \
++[\fB\-f\fR] \
++\fB\-i \fIfilename\fR \
++[\fB\-ip \fIfilename\fR] \
++[\fB\-isb \fIoffset\fR] \
++[\fB\-ish \fIoffset\fR] \
++[\fB\-ib \fIlength\fR] \
++[\fB\-ih \fIlength\fR]
+ Extract a raw file from a CHD image.
+ .TP
+-.B extracthd \fIinput\fR.chd \fIoutput\fR.toc \fIoutput\fR.bin
++.B extracthd \
++\-o \fIfilename\fR \
++[\fB\-f\fR] \
++\fB\-i \fIfilename\fR \
++[\fB\-ip \fIfilename\fR] \
++[\fB\-isb \fIoffset\fR] \
++[\fB\-ish \fIoffset\fR] \
++[\fB\-ib \fIlength\fR] \
++[\fB\-ih \fIlength\fR]
+ Extract a hard disk block image from a CHD image.
+ .TP
+-.B extractcd \fIinput\fR.chd \fIoutput\fR.toc \fIoutput\fR.bin
++.B extractcd \
++\-o \fIfilename\fR \
++[\fB\-ob \fIfilename\fR] \
++[\fB\-f\fR] \
++\fB\-i \fIfilename\fR \
++[\fB\-ip \fIfilename\fR]
+ Extract a CDRDAO .toc/.bin, CDRWIN .bin/.cue, or Sega Dreamcast .GDI file from a CHD\-CD image.
+ .TP
+-.B extractld \fIinput\fR.chd \fIoutput\fR.toc \fIoutput\fR.bin
++.B extractld \
++\-o \fIfilename\fR \
++[\fB\-f\fR] \
++\fB\-i \fIfilename\fR \
++[\fB\-ip \fIfilename\fR] \
++[\fB\-isf \fIoffset\fR] \
++[\fB\-if \fIlength\fR]
+ Extract a laserdisc image from a CHD\-LD image.
+ .TP
+-.B copy \fIinput\fR.chd \fIoutput\fR.chd
++.B copy \
++\-o \fIfilename\fR \
++[\fB\-op \fIfilename\fR] \
++[\fB\-f\fR] \
++\fB\-i \fIfilename\fR \
++[\fB\-ip \fIfilename\fR] \
++[\fB\-isb \fIoffset\fR] \
++[\fB\-ish \fIoffset\fR] \
++[\fB\-ib \fIlength\fR] \
++[\fB\-ih \fIlength\fR] \
++\fB\-hs \fIbytes\fR \
++[\fB\-c none\fR|type1[,[...]]] \
++[\fB\-np \fIprocessors\fR]
+ Copy all hunks of data from one CHD file to another. The hunk sizes do not need to match.
+ If the source is shorter than the destination, the source data will be padded with 0s.
++.TP
++.B addmeta \
++\fB\-i \fIfilename\fR \
++\fB\-t \fItag\fR \
++[\fB\-ix \fIindex\fR] \
++[\fB\-vt \fItext\fR] \
++[\fB\-vf \fIfilename\fR] \
++[\fB\-nocs\fR]
++Add metadata to the chd.
++.TP
++.B delmeta \
++\fB\-i \fIfilename\fR \
++\fB\-t \fItag\fR \
++[\fB\-ix \fIindex\fR]
++Remove metadata from the chd.
++.TP
++.B dumpmeta \
++\fB\-i \fIfilename\fR \
++[\fB\-o \fIfilename\fR] \
++[\fB\-f\fR] \
++\fB\-t \fItag\fR \
++[\fB\-ix \fIindex\fR]
++Dump metadata from the chd to standard output or to a file.
+ .\"
+ .\" SWITCHES chapter
+ .SH SWITCHES
+@@ -67,32 +180,29 @@
+ .B \-\-chs, \-chs \fIcylinders,heads,sectors
+ Specifies CHS geometry values for CHD harddisks.
+ .TP
+-.B \-\-compression, \-c \fInone\fR|\fItype1\fR[,\fItype2\fR[,...]]
++.B \-\-compression, \-c \fInone\fR|\fItype1\fR[,[...]]
+ Which compression codecs to use (up to 4).
+ .TP
+ .B \-\-force, \-f
+ Force overwriting an existing file.
+ .TP
+-.B \-\-help, \-h
+-Shows the available switches for an option.
+-.TP
+ .B \-\-hunksize, \-hs \fIbytes
+ Size of each unit, in hunks.
+ .TP
+ .B \-\-ident, \-id \fIfilename
+ Name of ident file to provide CHS information.
+ .TP
++.B \-\-index, \-ix \fIindex
++Indexed instance of the metadata tag.
++.TP
+ .B \-\-input, \-i \fIfilename
+ Input file name.
+ .TP
+-.B \-\-inputstartbyte, \-isb \fIoffset
+-Starting byte offset within the input.
+-.TP
+-.B \-\-inputstarthunk, \-ish \fIoffset
+-Starting hunk offset within the input.
+-.TP
+ .B \-\-inputbytes, \-ib \fIlength
+ Effective length of the input in bytes.
++.TP
++.B \-\-inputframes, \-if \fIlength
++Effective length of the input in frames.
+ .TP
+ .B \-\-inputhunks, \-ih \fIlength
+ Effective length of the input in hunks.
+@@ -100,14 +210,20 @@
+ .B \-\-inputparent, \-ip \fIfilename
+ Parent CHD's input file name.
+ .TP
+-.B \-\-numprocessors, \-np \fIcount
+-Limits the number of processors to use during compression.
++.B \-\-inputstartbyte, \-isb \fIoffset
++Starting byte offset within the input.
+ .TP
+-.B \-\-sectorsize, \-ss \fIbytes
+-size of each hard disk sector.
++.B \-\-inputstartframe, \-isf \fIoffset
++Starting frame offset within the input.
+ .TP
+-.B \-\-verbose, \-v
+-Output additional information about the operation.
++.B \-\-inputstarthunk, \-ish \fIoffset
++Starting hunk offset within the input.
++.TP
++.B \-\-nochecksum, \-nocs
++Do not include this metadata information in the overall SHA-1.
++.TP
++.B \-\-numprocessors, \-np \fIcount
++Limits the number of processors to use during compression.
+ .TP
+ .B \-\-output, \-o \fIfilename
+ Output file name.
+@@ -118,6 +234,20 @@
+ .B \-\-outputparent, \-op \fIfilename
+ Parent CHD's output file name.
+ .TP
++.B \-\-sectorsize, \-ss \fIbytes
++Size of each hard disk sector.
++.TP
++.B \-\-tag, \-t \fItag
++4-character tag for metadata.
++.TP
++.B \-\-valuefile, \-vf \fIfilename
++Text file containing data to add.
++.TP
++.B \-\-valuetext, \-vt \fItext
++Text for the metadata.
++.TP
+ .B \-\-unitsize, \-us \fIbytes
+ Size of each unit, in bytes.
+-
++.TP
++.B \-\-verbose, \-v
++Output additional information about the operation.
+Index: mame-0.146u1/src/osd/sdl/man/jedutil.1
+===================================================================
+--- mame-0.146u1.orig/src/osd/sdl/man/jedutil.1 2012-05-21 19:49:28.000000000 +0200
++++ mame-0.146u1/src/osd/sdl/man/jedutil.1 2012-06-14 21:44:11.000000000 +0200
+@@ -8,7 +8,7 @@
+ .\" References
+ .\" http://aarongiles.com/?p=159
+ .\"
+-.TH JEDUTIL 1 2012-03-25 0.145u5 "jedutil"
++.TH JEDUTIL 1 2012-06-14 0.146u1 "jedutil"
+ .\"
+ .\" NAME chapter
+ .SH NAME
+@@ -21,6 +21,8 @@
+ .br
+ .B jedutil
+ .IR source ".bin " target .jed
++.br
++.B jedutil help
+ .\"
+ .\" DESCRIPTION chapter
+ .SH DESCRIPTION
diff -Nru mame-0.146/debian/patches/mame_manpage_section.patch mame-0.146/debian/patches/mame_manpage_section.patch
--- mame-0.146/debian/patches/mame_manpage_section.patch 2012-09-04 14:43:13.000000000 +0200
+++ mame-0.146/debian/patches/mame_manpage_section.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-Author: Jordi Mallach <jordi@debian.org>
-Description: Change mame's manpage section to 6 (games), in the TH declaration.
- Debhelper relies on this to resolve where to install the manpage.
-Forwarded: no
-
-Index: mame-0.146/src/osd/sdl/man/mame.6
-===================================================================
---- mame-0.146.orig/src/osd/sdl/man/mame.6 2012-06-05 14:10:28.000000000 +0200
-+++ mame-0.146/src/osd/sdl/man/mame.6 2012-06-05 19:58:11.543664575 +0200
-@@ -13,7 +13,7 @@
- .\" and updated by Andrew Burton <burtona@gol.com>, July 2003
- .\"
- .\"
--.TH MAME 1 2012-03-25 0.145u5 "MAME \- The Multiple Arcade Machine Emulator"
-+.TH MAME 6 2012-03-25 0.145u5 "MAME \- The Multiple Arcade Machine Emulator"
- .\"
- .\"
- .\" NAME chapter
diff -Nru mame-0.146/debian/patches/series mame-0.146/debian/patches/series
--- mame-0.146/debian/patches/series 2012-09-04 14:43:13.000000000 +0200
+++ mame-0.146/debian/patches/series 2012-09-03 16:53:28.000000000 +0200
@@ -1,2 +1,2 @@
gnu_fixes.patch
-mame_manpage_section.patch
+mame_manpage_fixes.patch
diff -Nru mame-0.146/debian/rules mame-0.146/debian/rules
--- mame-0.146/debian/rules 2012-09-04 14:43:13.000000000 +0200
+++ mame-0.146/debian/rules 2012-09-03 16:53:28.000000000 +0200
@@ -44,10 +44,10 @@
PROFILE= \
MAP= \
VERBOSE= \
- OPTIMIZE=3 \
+ OPTIMIZE=2 \
LDFLAGS="-Wl,--as-needed" \
LDFLAGSEMULATOR="-Wl,--as-needed" \
- NOWERROR=1
+ NOWERROR=1 \
# Override make variables for specific archs
# Linux architectures
Reply to: