mame: update to 0.172

MAME finally switched to GPL-2.0
This commit is contained in:
Jürgen Buchmüller 2016-04-01 18:05:00 +02:00
parent 062a66ec08
commit 5efe8eeb99
3 changed files with 35 additions and 25 deletions

View File

@ -6,7 +6,7 @@ exec_mame() {
-ctrlrpath "$HOME/.mame/ctrlr;ctrlr" \
-inipath $HOME/.mame/ini \
-rompath $HOME/.mame/roms \
-samplepath $HOME/.mame/samples \
-samplepath "$HOME/.mame/samples;samples" \
-cfg_directory $HOME/.mame/cfg \
-comment_directory $HOME/.mame/comments \
-diff_directory $HOME/.mame/diff \
@ -20,8 +20,8 @@ exec_mame() {
if [ "$1" = "--newini" ]; then
echo "Rebuilding the ini file at $HOME/.mame/mame.ini"
echo "Modify this file for permanent changes to your SDLMAME"
echo "options and paths before running SDLMAME again."
echo "Modify this file for permanent changes to your MAME"
echo "options and paths before running MAME again."
cd $HOME/.mame
if [ -e mame.ini ]; then
echo "Your old ini file has been renamed to mame.ini.bak"
@ -29,10 +29,10 @@ if [ "$1" = "--newini" ]; then
fi
exec_mame
elif [ ! -e $HOME/.mame ]; then
echo "Running SDLMAME for the first time..."
echo "Creating an ini file for SDLMAME at $HOME/.mame/mame.ini"
echo "Modify this file for permanent changes to your SDLMAME"
echo "options and paths before running SDLMAME again."
echo "Running MAME for the first time..."
echo "Creating an ini file for MAME at $HOME/.mame/mame.ini"
echo "Modify this file for permanent changes to your MAME"
echo "options and paths before running MAME again."
mkdir $HOME/.mame
for f in artwork cfg comments ctrlr diff ini ip nvram \
samples snap sta roms; do

View File

@ -0,0 +1,12 @@
--- src/lib/util/strformat.h 2016-03-30 11:03:03.000000000 +0200
+++ src/lib/utils/strformat.h 2016-03-31 03:15:28.076259871 +0200
@@ -185,7 +185,8 @@
#include <type_traits>
#include <utility>
-#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)
+#if (defined(USE_INTERNAL_CBEGIN_CEND) && USE_INTERNAL_CBEGIN_CEND) || \
+ (defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413))
namespace std
{
template<class _Container>

View File

@ -1,28 +1,29 @@
# Template file for 'mame'
pkgname=mame
version=0171
version=0172
revision=1
wrksrc="mame-mame${version}"
homepage="http://mamedev.org"
distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
short_desc="The Multiple Arcade Machine Emulator"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="mame"
checksum=e543316e238b02ae80f8de6e1da3eaaac3754bc8370deb7c31a4bc73121763c5
license="GPL-2"
checksum=8e7f4dddf987b51c0166b4ca27443977ebea2618249e81dfc0066c3a3f4efb45
hostmakedepends="perl pkg-config python automoc4"
makedepends="SDL2_ttf-devel fontconfig-devel $(vopt_if qt qt5-devel) lua-devel
libjpeg-turbo-devel libflac-devel sqlite-devel portaudio-devel portmidi-devel"
makedepends="SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel libjpeg-turbo-devel
libflac-devel libuv-devel sqlite-devel portaudio-devel portmidi-devel"
depends="liberation-fonts-ttf"
nocross=yes
repository="nonfree"
replaces="sdlmame>=0 sdlmess>=0"
CXXFLAGS="-DUSE_INTERNAL_CBEGIN_CEND=1 -I${XBPS_CROSS_BASE}/usr/include/lua5.3"
build_options="qt"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="qt"
fi
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3"
do_build() {
local opts="REGENIE=1"
opts+=" NOWERROR=1"
@ -36,6 +37,8 @@ do_build() {
opts+=" USE_SYSTEM_LIB_SQLITE3=1"
opts+=" USE_SYSTEM_LIB_PORTMIDI=1"
opts+=" USE_SYSTEM_LIB_PORTAUDIO=1"
opts+=" USE_SYSTEM_LIB_UV=1"
opts+=" USE_SYSTEM_LIB_SDL2=1"
if [ "$build_option_qt" ]; then
opts+=" USE_QTDEBUG=1"
fi
@ -46,10 +49,12 @@ do_build() {
make ${opts} ${makejobs}
}
do_install() {
local f
# Install the mame script
vbin ${FILESDIR}/${pkgname}.sh ${pkgname}
# Install the applications and the UI font in /usr/share
# Install the applications and the UI font in /usr/share/${pkgname}
if [ -r mame64 ]; then
vinstall mame64 755 usr/share/${pkgname} ${pkgname}
else
@ -68,14 +73,7 @@ do_install() {
vman src/osd/sdl/man/mess.6
# Install the extra bits
install -d ${DESTDIR}/usr/share/${pkgname}/{artwork,ctrlr,keymaps,shader}
install -m644 src/osd/modules/opengl/shader/glsl*.*h \
${DESTDIR}/usr/share/${pkgname}/shader
install -m644 artwork/* ${DESTDIR}/usr/share/${pkgname}/artwork
install -m644 src/osd/sdl/keymaps/* \
${DESTDIR}/usr/share/${pkgname}/keymaps
# Include the license
vlicense docs/mamelicense.txt LICENSE
for f in artwork bgfx docs hash hlsl keymaps plugins samples; do
vcopy ${f} usr/share/${pkgname}
done
}