From 3c4962cb82cd717a3732b0d97b8a73a917aa3e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 28 Feb 2018 11:34:58 +0100 Subject: [PATCH] mame: update to 0.195 Enable i686* again but build only the arcade subtarget to avoid ENOMEM when linking the resulting binary. If there is demand, a separate `mess' target could perhaps be built for i686*. --- srcpkgs/mame/template | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index c9cc19c863..5a46cdbb68 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0194 +version=0195 revision=1 wrksrc="mame-mame${version}" homepage="http://mamedev.org" @@ -8,22 +8,19 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" short_desc="The Multiple Arcade Machine Emulator" maintainer="Jürgen Buchmüller " license="GPL-2" -checksum=1faffab72d0d671232a14c73f6e0bec720e086af5c81f8e9c235c314123e761d +checksum=b18d0e23ecf6b218c43a6770213c850b3c605ead9d29301de34101ed14c28a57 hostmakedepends="perl pkg-config python automoc4" makedepends="libstdc++-devel SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel -libjpeg-turbo-devel libflac-devel libuv-devel sqlite-devel portaudio-devel portmidi-devel" + libjpeg-turbo-devel libflac-devel libuv-devel sqlite-devel portaudio-devel + portmidi-devel libutf8proc-devel glm rapidjson" depends="liberation-fonts-ttf" nocross=yes replaces="sdlmame>=0 sdlmess>=0" -CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3" +CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3 -I${XBPS_CROSS_BASE}/usr/include/libutf8proc" case "$XBPS_TARGET_MACHINE" in - *-musl) CXXFLAGS+=" -DBX_CRT_MUSL=1" - ;; - i686*) # was: nodebug=yes - broken="https://build.voidlinux.eu/builders/i686_builder/builds/2964/steps/shell_3/logs/stdio" - ;; + *-musl) CXXFLAGS+=" -DBX_CRT_MUSL=1" ;; esac build_options="qt" @@ -35,10 +32,10 @@ do_build() { local opts="REGENIE=1" opts+=" TARGETOS=linux" case "$XBPS_TARGET_MACHINE" in + i686*) opts+=" SUBTARGET=arcade" ;; x86_64*|aarch64*) opts+=" PTR64=1" ;; esac opts+=" NOWERROR=1" - opts+=" VERBOSE=1" opts+=" OPTIMIZE=3" opts+=" PRECOMPILE=0" opts+=" TOOLS=1" @@ -50,13 +47,14 @@ do_build() { opts+=" USE_SYSTEM_LIB_SQLITE3=1" opts+=" USE_SYSTEM_LIB_PORTMIDI=1" opts+=" USE_SYSTEM_LIB_PORTAUDIO=1" - # opts+=" USE_SYSTEM_LIB_UTF8PROC=1" - if [ "$build_option_qt" ]; then - opts+=" USE_QTDEBUG=1" - fi + opts+=" USE_SYSTEM_LIB_UTF8PROC=1" + opts+=" USE_SYSTEM_LIB_GLM=1" + opts+=" USE_SYSTEM_LIB_RAPIDJSON=1" + [ "$build_option_qt" ] && opts+=" USE_QTDEBUG=1" if [ "${CROSS_BUILD}" ]; then # Doesn't work yet - opts+=" CROSS_BUILD=1 OVERRIDE_CC=${CC} OVERRIDE_CXX=${CXX} OVERRIDE_LD=${CC}" + opts+=" CROSS_BUILD=1 TOOLCHAIN=${XBPS_CROSS_TRIPLET}" + opts+=" OVERRIDE_CC=gcc OVERRIDE_CXX=g++ OVERRIDE_LD=g++" fi case "$XBPS_TARGET_MACHINE" in i686*) # Overcome linker memory exhaustion