diff -Nru mame-0.146/debian/changelog mame-0.146/debian/changelog
--- mame-0.146/debian/changelog 2012-11-17 20:10:22.000000000 +0100
+++ mame-0.146/debian/changelog 2012-11-17 20:09:04.000000000 +0100
@@ -1,3 +1,17 @@
+mame (0.146-5) unstable; urgency=low
+
+ [ Cesare Falco ]
+ * Replace -march with -mtune=generic gcc flag for compatibility issues
+ with older CPUs (LP: #1063993)
+
+ [ Emmanuel Kasper ]
+ * Add support for parallel building using DEB_BUILD_OPTIONS
+ * Reorganize default paths:
+ $HOME/.mame for ini file and output files
+ $HOME/mame for data search paths
+
+ -- Emmanuel Kasper <emman...@libera.cc> Tue, 13 Nov 2012 22:54:27 +0100
+
mame (0.146-4) unstable; urgency=low
* Removes danglink symlink after xmame-sdl,xmame-x,xmame-svga update.
diff -Nru mame-0.146/debian/mame.ini mame-0.146/debian/mame.ini
--- mame-0.146/debian/mame.ini 2012-11-17 20:10:22.000000000 +0100
+++ mame-0.146/debian/mame.ini 2012-11-17 20:09:04.000000000 +0100
@@ -1,19 +1,16 @@
# Default MAME configuration file for Debian
-# See /usr/share/doc/mame/examples/default.mame.ini
-# for an example file with all possible options.
# Allow per-user mame.ini configuration files
inipath $HOME/.mame;/etc/mame
# Default data search paths
-rompath
$HOME/.mame/roms;/usr/local/share/games/mame/roms;/usr/share/games/mame/roms
+rompath
$HOME/mame/roms;/usr/local/share/games/mame/roms;/usr/share/games/mame/roms
+samplepath
$HOME/mame/samples;/usr/local/share/games/mame/samples;/usr/share/games/mame/samples
+artpath
$HOME/mame/artwork;/usr/local/share/games/mame/artwork;/usr/share/games/mame/artwork
+cheatpath
$HOME/mame/cheat;/usr/local/share/games/mame/cheat;/usr/share/games/mame/cheat
+crosshairpath
$HOME/mame/crosshair;/usr/local/share/games/mame/crosshair;/usr/share/games/mame/crosshair
hashpath /usr/share/games/mame/hash
-samplepath
$HOME/.mame/samples;/usr/local/share/games/mame/samples;/usr/share/games/mame/samples
-artpath
$HOME/.mame/artwork;/usr/local/share/games/mame/artwork;/usr/share/games/mame/artwork
-ctrlrpath $HOME/.mame/ctrlr;/etc/mame/ctrlr
-fontpath /tmp
-cheatpath
$HOME/.mame/cheat;$HOME/.mame/cheat/cheat;/usr/local/share/games/mame/cheat;/usr/local/share/games/mame/cheat/cheat;/usr/share/games/mame/cheat;/usr/share/games/mame/cheat/cheat
-crosshairpath
$HOME/.mame/crosshair;/usr/local/share/games/mame/crosshair;/usr/share/games/mame/crosshair
+ctrlrpath /etc/mame/ctrlr
# Default data output paths
cfg_directory $HOME/.mame/cfg
@@ -29,6 +26,6 @@
# Set video to 'soft' if DRI is not reliable on your hardware
video opengl
# Set multithreading to '1' if you have more than one core
-multithreading 0
+multithreading 0
# Set window to '1' if you want MAME to start in a window
window 0
diff -Nru mame-0.146/debian/mame.README.Debian
mame-0.146/debian/mame.README.Debian
--- mame-0.146/debian/mame.README.Debian 2012-11-17 20:10:22.000000000
+0100
+++ mame-0.146/debian/mame.README.Debian 2012-11-17 20:08:35.000000000
+0100
@@ -40,7 +40,7 @@
acceleration available, change the "video" parameter from "soft" to
"opengl"
in the Mame configuration file.
-== DEFAULT FILES ==
+== DEFAULT FILES PATH ==
* MAME binary: {{{/usr/games/mame}}}
* MAME tools directory: {{{/usr/bin}}} (chdman, ldresample, ...)
@@ -62,7 +62,7 @@
and even create a fresh mame.ini file with "{{{mame -createconfig}}}".
== TOOLS ==
@@ -78,7 +78,7 @@
== ARTWORK ==
-Backdrop, overlay and bezel artwork can be downloaded from
http://mirror.xmission.com/mame/ individually or globally with the
following command ( provided your artwork search path is
{{{$HOME/mame/artwork}}}, which is the default )
+Backdrop, overlay and bezel artwork can be downloaded from
http://mirror.xmission.com/mame/ individually or globally with the
following command (provided your artwork search path is
{{{$HOME/mame/artwork}}}, which is the default)
{{{
wget --no-directories --recursive --directory-prefix
$HOME/mame/artwork ftp://mirror.xmission.com/mame/artwork/
}}}
diff -Nru mame-0.146/debian/rules mame-0.146/debian/rules
--- mame-0.146/debian/rules 2012-11-17 20:10:22.000000000 +0100
+++ mame-0.146/debian/rules 2012-11-17 20:09:04.000000000 +0100
@@ -13,12 +13,13 @@
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-# Number of make jobs = number of cores + 1
-NJOBS:=$(shell echo $$(($$(getconf _NPROCESSORS_ONLN 2>/dev/null) + 1)))
-ifdef SETNJOBS
- NJOBS:=$(SETNJOBS)
+# taken verbatim from debian policy
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
endif
+
# Override relevant make variables in original makefile
DEB_MAME_OPTS = \
OPT_FLAGS="-D'INI_PATH=\"/etc/mame\"'" \
@@ -53,7 +54,7 @@
# Linux architectures
ifeq ($(DEB_HOST_ARCH),amd64)
DEB_MAME_OPTS += \
- ARCHOPTS=-march=athlon64 \
+ ARCHOPTS=-mtune=generic \
FORCE_DRC_C_BACKEND= \
PTR64=1 \
NOASM= \
@@ -62,7 +63,7 @@
ifeq ($(DEB_HOST_ARCH),i386)
DEB_MAME_OPTS += \
- ARCHOPTS=-march=pentium2 \
+ ARCHOPTS=-mtune=generic \
FORCE_DRC_C_BACKEND= \
PTR64= \
NOASM= \
@@ -140,7 +141,7 @@
dh $@
override_dh_auto_build:
- $(MAKE) -j$(NJOBS) $(DEB_MAME_OPTS)
+ $(MAKE) $(DEB_MAME_OPTS)
$(CURDIR)/mame -createconfig
mv mame.ini default.mame.ini
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/50a7ea8e.2000...@libera.cc
