From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- games-emulation/advancemame/Manifest | 15 +- games-emulation/advancemame/advancemame-3.7.ebuild | 101 ---------- games-emulation/advancemame/advancemame-3.9.ebuild | 86 +++++++++ .../advancemame/files/advancemame-1.2-pic.patch | 13 -- .../files/advancemame-1.2-verboselog.patch | 42 ---- ...advancemame-3.7-move_aclocal_to_acinclude.patch | 78 -------- ...cemame-3.7-remove_static_configure_option.patch | 41 ---- .../files/advancemame-3.9-DESTDIR.patch | 196 +++++++++++++++++++ .../advancemame/files/advancemame-3.9-FHS.patch | 212 +++++++++++++++++++++ .../files/advancemame-3.9-blank-flags.patch | 32 ++++ ...emame-3.9-pkgconfig_for_ncurses_and_slang.patch | 184 ++++++++++++++++++ .../advancemame/files/advancemame-pic.patch | 13 ++ .../advancemame/files/advancemame-verboselog.patch | 42 ++++ 13 files changed, 773 insertions(+), 282 deletions(-) delete mode 100644 games-emulation/advancemame/advancemame-3.7.ebuild create mode 100644 games-emulation/advancemame/advancemame-3.9.ebuild delete mode 100644 games-emulation/advancemame/files/advancemame-1.2-pic.patch delete mode 100644 games-emulation/advancemame/files/advancemame-1.2-verboselog.patch delete mode 100644 games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch delete mode 100644 games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch create mode 100644 games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch create mode 100644 games-emulation/advancemame/files/advancemame-3.9-FHS.patch create mode 100644 games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch create mode 100644 games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch create mode 100644 games-emulation/advancemame/files/advancemame-pic.patch create mode 100644 games-emulation/advancemame/files/advancemame-verboselog.patch (limited to 'games-emulation/advancemame') diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest index 600b261cab4d..9f080e78e74c 100644 --- a/games-emulation/advancemame/Manifest +++ b/games-emulation/advancemame/Manifest @@ -1,8 +1,9 @@ -AUX advancemame-1.2-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360 -AUX advancemame-1.2-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e -AUX advancemame-3.7-move_aclocal_to_acinclude.patch 2277 BLAKE2B f66691900297b845d9b20f93c989d4f31c7e9cd87be5168fc9e716080f6d23bcf590b372df3275149ad28927581d4e406a4bcd3bb6ba1af3b732f97c7f5483f6 SHA512 1ece971e4d51d4ac6e8bcc9b72413b6cb9d19206797131c1ed6af33da3eec18797be128776061a7478dac807dc4e83a75a9495dd0a6c788090f55eb13aeaa89b -AUX advancemame-3.7-remove_static_configure_option.patch 1076 BLAKE2B 17014295ddf61b910376338998791b645157175b640839ba076c72861cc643c2c5d969139230e7c49ee5e60ce790a100fc3f1612d2370e6bcb3a7a9f37ae4f14 SHA512 b7c1c961c123d8a175325626005c8d2081ba98f0f392dabde795732340f323caf513c6b691790afe254860044fca97cf497209d94dc0ff6e1d98fc8df4bda563 -DIST advancemame-3.7-use_pkgconfig_for_freetype_and_sdl.patch 21144 BLAKE2B ba374d664db45f938d3b054820868b5aaa63a7461938f5e8a320dc607ef3444c8fc5f87cdd3ef9db130c1048ef9e75afed4f856997f048bcb44eb99d3bcbaefc SHA512 80136d71117329997846fe0f03a3cf3439ee8ff3db649f50a3008595ed2d82cd0e3dcd9c6908edf30e19d516943eeed129eb994a6326effaf94a7eaa5d1b8fa2 -DIST advancemame-3.7.tar.gz 25616260 BLAKE2B 455004ff7ce3f7517c6b06767e9d1656bff6b93f822d363cbd42738e0f9ba988c243f600db5f20e24897c27faaf5c458072e2bc9c97cf92803f76299cf3010b8 SHA512 b5af59cdd3cf70dfae0769ed35eb6ce00a6f01d05eefcb687f322420faa2ee5aabf83394249c2ab7f7f1241d3fd09c2f0412666b2dbd27b91e7bc3622f925f74 -EBUILD advancemame-3.7.ebuild 2156 BLAKE2B 269e0044b610bf6c51d2de3cc689c3b4cf6a8529d66b94d08344404ae21eb64c5e225a7651e4639fff08373936a029d3815b32bc461c3706168d18bca7066546 SHA512 0cbe417469a221e735bdfc71b02f1b69e487e9fa903a7ff94a967ef7cc2364966ebf7107985d2cdbfdd760ee5b9492c60e2623782422f20c1e2c7aca1b86ba0d +AUX advancemame-3.9-DESTDIR.patch 6316 BLAKE2B f2b2c08ac5ed2300c58575a9aece9371284aa731dfe63ac5ef86fc1609b24ee1e83d728d8e4d0566f570add7414bd9aa6b4eed2e06a999a79590606474f87d3d SHA512 2d13cd27eb145d6bdd59d8e1bff02b2a99676af343c2569038329716f05990959570141854bf68186ae9d5fbe4dea9da9a67cba1bca790c77264cf9a9530efa1 +AUX advancemame-3.9-FHS.patch 6693 BLAKE2B 44c58b984dee0e2db71a4192fcfc6b281242c12bc5f8edc1d27f2b167b306819ae64c9910a6ec6549691cfdba9f49615a0789618dd784e9b0c12091bba4ae185 SHA512 6d68288214a0a230e08405ae70564a0d144e47cd1a767ddbfd4b5898d2e178d3f8c3feb0020bc0eea1329c689ed603eacbe71f6bfe7f8ba2d3d3fc5badc74f7b +AUX advancemame-3.9-blank-flags.patch 767 BLAKE2B 41601a7eec5ffff178f7da2448d01a7d3823c7ce800bafcbc33ea0a7f2a994e20d5fd3dd3f1eab77689c5965f173f5e432573ef6f04232001b69df141d60c9e5 SHA512 d622b0eb69f4653517c87a7caede4c8f1694efd8a103af360c06ebf704b9e98efe32176163361df73317714599033f004ce762973d475386c913465fea87047d +AUX advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch 4630 BLAKE2B 0655e2c879211d5cc70636cc89fc71d73e79e3f50c468c53f879341a2d81a6087a88e9343dd2dd8044b69a347a02f4e7f6020641cdfa0f40d5a098bf4269f2bf SHA512 c2407adc532208444802c7cab50d0b6edb7e6a3b3e9da9818d891267fb9471524bda2df94cc1974e8c2fbb7b7329e76e313fdfc7b149a3aea264097d96ccf99c +AUX advancemame-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360 +AUX advancemame-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e +DIST advancemame-3.9.tar.gz 27287755 BLAKE2B 020a10a9b9fa207a733747273e749b4d9adabbd50104ae10b1568144bcdcb3694fe19e4ca5fd31119a02c64bca9872b1b3d1eb3ce305a611f006a8168f5bcb89 SHA512 43f9ba746f222b17ade2d213d6af7cc8fe6b3ee6008633f02b8877f4c7f75628bdf1cc9718db09f5f9a482d194c8ba94f9047334e8012d23c598454e5dab2eb3 +EBUILD advancemame-3.9.ebuild 1738 BLAKE2B 7f721d6c4074803c3c5aeca2bccbacb9a8bce0f808e60f365b1ced00d26a5a701970ace4f0fd35571a630c9a80b6e9754e11a1b6dd74ceda0a0972404335e1d3 SHA512 b6a3aca29ab87465501e2169bc55f7c72e8b08e75ee3d79a8b62feb17b082cde8b253883fba88169e531c7679d7bf219dcc214e6feed35823326661cd0274f86 MISC metadata.xml 1139 BLAKE2B 0722cccd2aa4d9e24eb990e460c91d8df503c1adffa680ac5e1f2b900bdfc93099feb06aab43b43ce27defc3183c6b75c594ce99e7f1396f5512babfc9de68d0 SHA512 a9a85b10cfbf6c7a75c317db8d242d29655d14d9891b897171161af613221fe93ad776ddb53fcddd14f08295d1e02c3c3fbccdce027e2a0d1c434fe60e49f349 diff --git a/games-emulation/advancemame/advancemame-3.7.ebuild b/games-emulation/advancemame/advancemame-3.7.ebuild deleted file mode 100644 index c371c14107c3..000000000000 --- a/games-emulation/advancemame/advancemame-3.7.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic - -DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu" -HOMEPAGE="http://www.advancemame.it/" -SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz" - -# Fetch too big upstream patch -SRC_URI+=" https://github.com/amadvance/advancemame/commit/70f099ac49786a287ebd3949ce8f8670a5731abd.patch -> ${PN}-3.7-use_pkgconfig_for_freetype_and_sdl.patch" - -LICENSE="GPL-2 XMAME" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa fbcon oss truetype" - -# sdl is required (bug #158417) -RDEPEND=" - app-arch/unzip - app-arch/zip - dev-libs/expat - media-libs/libsdl2 - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - truetype? ( media-libs/freetype:2 ) -" -DEPEND="${RDEPEND} - virtual/os-headers - virtual/pkgconfig - x86? ( >=dev-lang/nasm-0.98 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.2-pic.patch" - "${FILESDIR}"/${PN}-1.2-verboselog.patch - - # Patches from upstream - "${FILESDIR}/${P}-move_aclocal_to_acinclude.patch" - "${DISTDIR}/${P}-use_pkgconfig_for_freetype_and_sdl.patch" - "${FILESDIR}/${P}-remove_static_configure_option.patch" -) - -src_prepare() { - default - eautoreconf - - sed -i -e 's/"-s"//' configure || die - - use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm" - ln -s $(type -P sdl2-config) "${T}/${CHOST}-sdl2-config" -} - -src_configure() { - # Fix for bug #78030 - if use ppc; then - append-ldflags "-Wl,--relax" - fi - - PATH="${PATH}:${T}" - econf \ - --enable-expat \ - --enable-sdl2 \ - --disable-sdl \ - --enable-zlib \ - --disable-slang \ - --disable-svgalib \ - $(use_enable alsa) \ - $(use_enable fbcon fb) \ - $(use_enable oss) \ - $(use_enable truetype freetype) \ - $(use_enable x86 asm) -} - -src_compile() { - STRIPPROG=true emake -} - -src_install() { - local f - - for f in adv* ; do - if [[ -L "${f}" ]] ; then - dobin "${f}" - fi - done - - insinto "/usr/share/advance" - doins support/event.dat - keepdir "/usr/share/advance/"{artwork,diff,image,rom,sample,snap} - - dodoc HISTORY README RELEASE - cd doc - dodoc *.txt - HTMLDOCS="*.html" einstalldocs - - for f in *.1 ; do - newman ${f} ${f/1/6} - done -} diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild b/games-emulation/advancemame/advancemame-3.9.ebuild new file mode 100644 index 000000000000..94f891024387 --- /dev/null +++ b/games-emulation/advancemame/advancemame-3.9.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu" +HOMEPAGE="http://www.advancemame.it/" +SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2 XMAME" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa fbcon ncurses oss slang truetype" + +DEPEND=" + dev-libs/expat + media-libs/libsdl2[video] + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + ncurses? ( sys-libs/ncurses:= ) + slang? ( sys-libs/slang ) + truetype? ( media-libs/freetype:2 ) +" +RDEPEND=" + ${DEPEND} + app-arch/unzip + app-arch/zip +" +BDEPEND=" + virtual/pkgconfig + x86? ( >=dev-lang/nasm-0.98 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-pic.patch + "${FILESDIR}"/${PN}-verboselog.patch + + # Patches from upstream + "${FILESDIR}"/${P}-pkgconfig_for_ncurses_and_slang.patch + "${FILESDIR}"/${P}-blank-flags.patch + "${FILESDIR}"/${P}-DESTDIR.patch + "${FILESDIR}"/${P}-FHS.patch +) + +src_prepare() { + default + + # AC_CHECK_CC_OPT is obsolete, superseded by AX_CHECK_COMPILE_FLAG + sed -i -e 's/AC_CHECK_CC_OPT/AX_CHECK_COMPILE_FLAG/' configure.ac || die + + eautoreconf +} + +src_configure() { + # Fix for bug #78030 + use ppc && append-ldflags "-Wl,--relax" + + ac_cv_prog_ASM=nasm \ + econf \ + --enable-expat \ + --enable-sdl2 \ + --disable-sdl \ + --enable-zlib \ + --disable-slang \ + --disable-svgalib \ + $(use_enable alsa) \ + $(use_enable fbcon fb) \ + $(use_enable ncurses) \ + $(use_enable oss) \ + $(use_enable slang) \ + $(use_enable truetype freetype) \ + $(use_enable x86 asm) +} + +src_compile() { + emake \ + VERSION="${PV}" +} + +src_install() { + emake -j1 install \ + VERSION="${PV}" \ + DESTDIR="${D}" +} diff --git a/games-emulation/advancemame/files/advancemame-1.2-pic.patch b/games-emulation/advancemame/files/advancemame-1.2-pic.patch deleted file mode 100644 index 049befbfac2c..000000000000 --- a/games-emulation/advancemame/files/advancemame-1.2-pic.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./advance/blit/blit.c.orig 2004-12-19 01:01:46.039956536 -0500 -+++ ./advance/blit/blit.c 2004-12-19 01:01:19.566981040 -0500 -@@ -28,6 +28,10 @@ - * do so, delete this exception statement from your version. - */ - -+#if defined(USE_ASM_INLINE) && defined(__PIC__) -+# undef USE_ASM_INLINE -+#endif -+ - #include "portable.h" - - #include "blit.h" diff --git a/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch b/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch deleted file mode 100644 index b72c1224e75f..000000000000 --- a/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Julian Ospald -Date: Sun Feb 17 03:39:55 UTC 2013 -Subject: build system - - make build log verbose - ---- advancemame-1.2/Makefile.in -+++ advancemame-1.2/Makefile.in -@@ -77,21 +77,21 @@ - srcdir=@srcdir@ - # Don't add the prefix @. This command must be used also in a shell script - INSTALL=@INSTALL@ --CC=@@CC@ --CXX=@@CXX@ --LD=@@CC@ --LDXX=@@CXX@ --AR=@@AR@ --ASM=@@ASM@ --RC=@@RC@ -+CC=@CC@ -+CXX=@CXX@ -+LD=@CC@ -+LDXX=@CXX@ -+AR=@AR@ -+ASM=@ASM@ -+RC=@RC@ - LN_S=@@LN_S@ - MD=-@@MKDIR@ -p - RM=@@RM@ -f - ECHO=@@ECHO@ --CC_FOR_BUILD=@@CC_FOR_BUILD@ --LD_FOR_BUILD=@@CC_FOR_BUILD@ --CXX_FOR_BUILD=@@CXX_FOR_BUILD@ --LDXX_FOR_BUILD=@@CXX_FOR_BUILD@ -+CC_FOR_BUILD=@CC_FOR_BUILD@ -+LD_FOR_BUILD=@CC_FOR_BUILD@ -+CXX_FOR_BUILD=@CXX_FOR_BUILD@ -+LDXX_FOR_BUILD=@CXX_FOR_BUILD@ - EXE=@EXE@ - EXE_FOR_BUILD=@EXE_FOR_BUILD@ - SDLCFLAGS=@SDLCFLAGS@ - diff --git a/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch b/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch deleted file mode 100644 index 4a30e179ae27..000000000000 --- a/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch +++ /dev/null @@ -1,78 +0,0 @@ -From b0edfe1e5bb1a705fad539e5ab1c299d38dcf9d4 Mon Sep 17 00:00:00 2001 -From: Andrea Mazzoleni -Date: Tue, 8 May 2018 18:55:39 +0200 -Subject: [PATCH 1/3] Use acinclude instead of aclocal - -aclocal.m4 is generated automatically, and we don't have to lose the content. ---- - acinclude.m4 | 20 ++++++++++++++++++++ - aclocal.m4 | 29 ++++++++++++----------------- - 2 files changed, 32 insertions(+), 17 deletions(-) - create mode 100644 acinclude.m4 - -diff --git a/acinclude.m4 b/acinclude.m4 -new file mode 100644 -index 00000000..ceed823a ---- /dev/null -+++ b/acinclude.m4 -@@ -0,0 +1,20 @@ -+dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno) -+dnl -+dnl Shows a message as like "checking wether gcc accepts flag ... no" -+dnl and executess ifyes or ifno. -+ -+AC_DEFUN([AC_CHECK_CC_OPT], -+[ -+AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) -+echo 'void f(){}' > conftest.c -+if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then -+ AC_MSG_RESULT([yes]) -+ $2 -+else -+ AC_MSG_RESULT([no]) -+ $3 -+fi -+rm -f conftest* -+]) -+ -+ -diff --git a/aclocal.m4 b/aclocal.m4 -index d6e7b527..56e944be 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1,20 +1,15 @@ --dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno) --dnl --dnl Shows a message as like "checking wether gcc accepts flag ... no" --dnl and executess ifyes or ifno. -+# generated automatically by aclocal 1.15 -*- Autoconf -*- - --AC_DEFUN(AC_CHECK_CC_OPT, --[ --AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) --echo 'void f(){}' > conftest.c --if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then -- AC_MSG_RESULT([yes]) -- $2 --else -- AC_MSG_RESULT([no]) -- $3 --fi --rm -f conftest* --]) -+# Copyright (C) 1996-2014 Free Software Foundation, Inc. - -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -+m4_include([acinclude.m4]) --- -2.17.0 - diff --git a/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch b/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch deleted file mode 100644 index 342ba1c5c07a..000000000000 --- a/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 890af36a3939f0978af779caa878ddeb44183d8d Mon Sep 17 00:00:00 2001 -From: Andrea Mazzoleni -Date: Tue, 8 May 2018 19:32:44 +0200 -Subject: [PATCH 3/3] Remove the --enable-static configure option - -I doubt it still work and it doesn't make sense anymore. ---- - configure.ac | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4e609993..1c94e037 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,13 +139,6 @@ AC_ARG_ENABLE( - ) - AC_SUBST([CONF_DEBUG],[$ac_enable_debug]) - --AC_ARG_ENABLE( -- [static], -- AC_HELP_STRING([--enable-static],[enable static compilation. (default no)]), -- [ac_enable_static=$enableval], -- [ac_enable_static=no] --) -- - AC_ARG_ENABLE( - [bare], - AC_HELP_STRING([--enable-bare],[enable compilation without drivers. (default no)]), -@@ -232,9 +225,6 @@ if test $ac_auto_ldflags = yes ; then - else - LDFLAGS="-s" - fi -- if test $ac_enable_static = yes ; then -- LDFLAGS="-static $LDFLAGS" -- fi - if test ! -z $ac_host_ldflags; then - LDFLAGS="$ac_host_ldflags $LDFLAGS" - fi --- -2.17.0 - diff --git a/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch b/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch new file mode 100644 index 000000000000..755f8b45188c --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch @@ -0,0 +1,196 @@ +From fca370c9f7a6dcb0a3625cc15f6d0a80182dd4b3 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 25 Apr 2020 10:56:27 +0100 +Subject: [PATCH] Support make install DESTDIR=/foo just like Automake does + +Distributions really need this. +--- + advance/advance.mak | 94 ++++++++++++++++++++++----------------------- + 1 file changed, 47 insertions(+), 47 deletions(-) + +diff --git a/advance/advance.mak b/advance/advance.mak +index 6c4d89c..100dd23 100644 +--- a/advance/advance.mak ++++ b/advance/advance.mak +@@ -376,131 +376,131 @@ pkgdir = $(datadir)/advance + pkgdocdir = $(docdir)/advance + + install-dirs: +- -$(INSTALL_PROGRAM_DIR) $(bindir) +- -$(INSTALL_DATA_DIR) $(pkgdir) +- -$(INSTALL_DATA_DIR) $(pkgdocdir) +- -$(INSTALL_MAN_DIR) $(mandir)/man1 +- -$(INSTALL_DATA_DIR) $(pkgdir)/rom +- -$(INSTALL_DATA_DIR) $(pkgdir)/sample +- -$(INSTALL_DATA_DIR) $(pkgdir)/artwork +- -$(INSTALL_DATA_DIR) $(pkgdir)/image +- -$(INSTALL_DATA_DIR) $(pkgdir)/image/ti99_4a +- -$(INSTALL_DATA_DIR) $(pkgdir)/crc +- -$(INSTALL_DATA_DIR) $(pkgdir)/snap +- -$(INSTALL_DATA_DIR) $(pkgdir)/snap/ti99_4a ++ -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir) ++ -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/artwork ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image/ti99_4a ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap/ti99_4a + + install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_IMAGEFILES_TI99_4A) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES) $(INSTALL_SNAPFILES_TI99_4A) + ifdef INSTALL_DATAFILES + @for i in $(INSTALL_DATAFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)"; \ +- $(INSTALL_DATA) $$i $(pkgdir); \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir); \ + done + endif + ifdef INSTALL_ROMFILES + @for i in $(INSTALL_ROMFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/rom"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/rom; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \ + done + endif + ifdef INSTALL_IMAGEFILES_TI99_4A + @for i in $(INSTALL_IMAGEFILES_TI99_4A); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/image/ti99_4a"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/image/ti99_4a; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/image/ti99_4a"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/image/ti99_4a; \ + done + endif + ifdef INSTALL_SAMPLEFILES + @for i in $(INSTALL_SAMPLEFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/sample; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample; \ + done + endif + ifdef INSTALL_SNAPFILES + @for i in $(INSTALL_SNAPFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/snap"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/snap; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \ + done + endif + ifdef INSTALL_SNAPFILES_TI99_4A + @for i in $(INSTALL_SNAPFILES_TI99_4A); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/snap/ti99_4a"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/snap/ti99_4a; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap/ti99_4a"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap/ti99_4a; \ + done + endif + + uninstall-data: + ifdef INSTALL_DATAFILES + @for i in $(notdir $(INSTALL_DATAFILES)); do \ +- rm -f $(pkgdir)/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/$$i; \ + done + endif + ifdef INSTALL_ROMFILES + @for i in $(notdir $(INSTALL_ROMFILES)); do \ +- rm -f $(pkgdir)/rom/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/rom/$$i; \ + done + endif + ifdef INSTALL_SAMPLEFILES + @for i in $(notdir $(INSTALL_SAMPLEFILES)); do \ +- rm -f $(pkgdir)/sample/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/sample/$$i; \ + done + endif + ifdef INSTALL_SNAPFILES + @for i in $(notdir $(INSTALL_SNAPFILES)); do \ +- rm -f $(pkgdir)/snap/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/snap/$$i; \ + done + endif + + install-bin: $(INSTALL_BINFILES) + @for i in $(INSTALL_BINFILES); do \ +- echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \ +- $(INSTALL_PROGRAM) $$i $(bindir); \ ++ echo "$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)"; \ ++ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \ + done + + uninstall-bin: + @for i in $(notdir $(INSTALL_BINFILES)); do \ +- rm -f $(bindir)/$$i; \ ++ rm -f $(DESTDIR)$(bindir)/$$i; \ + done + + install-doc: $(INSTALL_DOCFILES) + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \ +- $(INSTALL_DATA) $$i $(pkgdocdir); \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \ + done + endif + + uninstall-doc: + ifdef INSTALL_DOCFILES + @for i in $(notdir $(INSTALL_DOCFILES)); do \ +- rm -f $(pkgdocdir)/$$i; \ ++ rm -f $(DESTDIR)$(pkgdocdir)/$$i; \ + done + endif + + install-man: $(INSTALL_MANFILES) + ifdef INSTALL_MANFILES + @for i in $(INSTALL_MANFILES); do \ +- echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \ +- $(INSTALL_DATA) $$i $(mandir)/man1; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \ + done + endif + + uninstall-man: + ifdef INSTALL_MANFILES + @for i in $(notdir $(INSTALL_MANFILES)); do \ +- rm -f $(mandir)/man1/$$i; \ ++ rm -f $(DESTDIR)$(mandir)/man1/$$i; \ + done + endif + + uninstall-dirs: +- -rmdir $(pkgdir)/rom +- -rmdir $(pkgdir)/sample +- -rmdir $(pkgdir)/artwork +- -rmdir $(pkgdir)/image/ti99_4a +- -rmdir $(pkgdir)/image +- -rmdir $(pkgdir)/crc +- -rmdir $(pkgdir)/snap/ti99_4a +- -rmdir $(pkgdir)/snap +- -rmdir $(pkgdir) +- -rmdir $(pkgdocdir) ++ -rmdir $(DESTDIR)$(pkgdir)/rom ++ -rmdir $(DESTDIR)$(pkgdir)/sample ++ -rmdir $(DESTDIR)$(pkgdir)/artwork ++ -rmdir $(DESTDIR)$(pkgdir)/image/ti99_4a ++ -rmdir $(DESTDIR)$(pkgdir)/image ++ -rmdir $(DESTDIR)$(pkgdir)/crc ++ -rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a ++ -rmdir $(DESTDIR)$(pkgdir)/snap ++ -rmdir $(DESTDIR)$(pkgdir) ++ -rmdir $(DESTDIR)$(pkgdocdir) + + install: install-dirs install-bin install-data install-doc install-man + +-- +2.26.0 + diff --git a/games-emulation/advancemame/files/advancemame-3.9-FHS.patch b/games-emulation/advancemame/files/advancemame-3.9-FHS.patch new file mode 100644 index 000000000000..312e895b8fd8 --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-FHS.patch @@ -0,0 +1,212 @@ +From 6d8c1dc720b09fb9c6ff6edb273ad2a2ea31d768 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 25 Apr 2020 11:16:01 +0100 +Subject: [PATCH 1/2] Use /usr/share/man and /usr/share/doc and not /usr/man + and /usr/doc + +This has been mandated by the Filesystem Hierarchy Standard since 2.0 +in 1997. Autoconf actually does the right thing by default. +--- + Makefile.usr | 4 ++-- + advance/advance.mak | 11 +++++------ + configure.ac | 2 -- + 3 files changed, 7 insertions(+), 10 deletions(-) + +diff --git a/Makefile.usr b/Makefile.usr +index 4519857..74a4d53 100644 +--- a/Makefile.usr ++++ b/Makefile.usr +@@ -238,8 +238,8 @@ srcdir=. + datadir=${prefix}/share + sysconfdir=${prefix}/etc + bindir=${prefix}/bin +-mandir=${prefix}/man +-docdir=${prefix}/share/doc ++mandir=${datadir}/man ++docdir=${datadir}/doc/advancemame + + ############################################################################# + # Extra configuration common for ./configure and manual +diff --git a/advance/advance.mak b/advance/advance.mak +index 100dd23..8cd0444 100644 +--- a/advance/advance.mak ++++ b/advance/advance.mak +@@ -373,12 +373,11 @@ CONF_SRC = \ + # Install + + pkgdir = $(datadir)/advance +-pkgdocdir = $(docdir)/advance + + install-dirs: + -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) +- -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) + -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample +@@ -463,15 +462,15 @@ uninstall-bin: + install-doc: $(INSTALL_DOCFILES) + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ +- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir)"; \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ + done + endif + + uninstall-doc: + ifdef INSTALL_DOCFILES + @for i in $(notdir $(INSTALL_DOCFILES)); do \ +- rm -f $(DESTDIR)$(pkgdocdir)/$$i; \ ++ rm -f $(DESTDIR)$(docdir)/$$i; \ + done + endif + +@@ -500,7 +499,7 @@ uninstall-dirs: + -rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a + -rmdir $(DESTDIR)$(pkgdir)/snap + -rmdir $(DESTDIR)$(pkgdir) +- -rmdir $(DESTDIR)$(pkgdocdir) ++ -rmdir $(DESTDIR)$(docdir) + + install: install-dirs install-bin install-data install-doc install-man + +diff --git a/configure.ac b/configure.ac +index f8ba989..e54c038 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1220,8 +1220,6 @@ AC_SUBST([CONF_LIB_JEVENT],[$ac_lib_jevent]) + + dnl Final + AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag]) +-AC_SUBST([mandir],['${prefix}/man']) +-AC_SUBST([docdir],['${prefix}/doc']) + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT + +-- +2.26.0 + +From e35a602a73880bf529083bee5de911e1490a27b5 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 25 Apr 2020 11:52:13 +0100 +Subject: [PATCH 2/2] Install *.html files to a separately htmldir rather than + docdir + +Autoconf already sets up htmldir for you. It defaults to the same as +docdir but some distributions set it differently. +--- + Makefile.in | 1 + + Makefile.usr | 1 + + advance/advance.mak | 21 +++++++++++++++++---- + 3 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e92a107..86905d7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -14,6 +14,7 @@ exec_prefix=@exec_prefix@ + bindir=@bindir@ + mandir=@mandir@ + docdir=@docdir@ ++htmldir=@htmldir@ + CONF_SYSTEM=@CONF_SYSTEM@ + CONF_HOST=@CONF_HOST@ + CONF_BUILD=@CONF_BUILD@ +diff --git a/Makefile.usr b/Makefile.usr +index 74a4d53..c8e7430 100644 +--- a/Makefile.usr ++++ b/Makefile.usr +@@ -240,6 +240,7 @@ sysconfdir=${prefix}/etc + bindir=${prefix}/bin + mandir=${datadir}/man + docdir=${datadir}/doc/advancemame ++htmldir=${docdir} + + ############################################################################# + # Extra configuration common for ./configure and manual +diff --git a/advance/advance.mak b/advance/advance.mak +index 8cd0444..009ccd6 100644 +--- a/advance/advance.mak ++++ b/advance/advance.mak +@@ -152,7 +152,7 @@ endif + endif + + INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.txt,$(wildcard $(srcdir)/doc/*.d))) +-INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d))) ++INSTALL_HTMLFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d))) + WEB_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.hh,$(wildcard $(srcdir)/doc/*.d))) + + ############################################################################ +@@ -162,7 +162,7 @@ ifdef ADV_ALL + all_override: $(ADV_ALL) + endif + +-all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_MANFILES) ++all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) $(INSTALL_MANFILES) + mame: $(OBJ) $(OBJ)/advmame$(EXE) + mess: $(MESSOBJ) $(MESSOBJ)/advmess$(EXE) + emu: mame mess +@@ -182,7 +182,7 @@ web: $(WEB_DOCFILES) + # Ensure that the doc target is always created also if a doc directory exists + .PHONY: doc + +-doc: $(INSTALL_DOCFILES) ++doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) + + ############################################################################ + # Source +@@ -378,6 +378,7 @@ install-dirs: + -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) + -$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(htmldir) + -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample +@@ -459,13 +460,19 @@ uninstall-bin: + rm -f $(DESTDIR)$(bindir)/$$i; \ + done + +-install-doc: $(INSTALL_DOCFILES) ++install-doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ + echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ + done + endif ++ifdef INSTALL_HTMLFILES ++ @for i in $(INSTALL_HTMLFILES); do \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir); \ ++ done ++endif + + uninstall-doc: + ifdef INSTALL_DOCFILES +@@ -473,6 +480,11 @@ ifdef INSTALL_DOCFILES + rm -f $(DESTDIR)$(docdir)/$$i; \ + done + endif ++ifdef INSTALL_HTMLFILES ++ @for i in $(notdir $(INSTALL_HTMLFILES)); do \ ++ rm -f $(DESTDIR)$(htmldir)/$$i; \ ++ done ++endif + + install-man: $(INSTALL_MANFILES) + ifdef INSTALL_MANFILES +@@ -500,6 +512,7 @@ uninstall-dirs: + -rmdir $(DESTDIR)$(pkgdir)/snap + -rmdir $(DESTDIR)$(pkgdir) + -rmdir $(DESTDIR)$(docdir) ++ -rmdir $(DESTDIR)$(htmldir) + + install: install-dirs install-bin install-data install-doc install-man + +-- +2.26.0 + diff --git a/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch b/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch new file mode 100644 index 000000000000..68cfa62f1cad --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch @@ -0,0 +1,32 @@ +From f306234fbaa6bd3fbcb75ebe5e3b318a9fc1c5f0 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 25 Apr 2020 11:40:18 +0100 +Subject: [PATCH] Don't use auto CFLAGS/LDFLAGS if they are set but blank + +Explicitly blank flags are valid. +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f8ba989..330959c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,12 +82,12 @@ case "$build" in + esac + AC_SUBST([CONF_BUILD],[$ac_build]) + +-if test -z "$CFLAGS" ; then ++if test -z "${CFLAGS+set}" ; then + ac_auto_cflags=yes + else + ac_auto_cflags=no + fi +-if test -z "$LDFLAGS" ; then ++if test -z "${LDFLAGS+set}" ; then + ac_auto_ldflags=yes + else + ac_auto_ldflags=no +-- +2.26.0 + diff --git a/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch b/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch new file mode 100644 index 000000000000..b91c887e030f --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch @@ -0,0 +1,184 @@ +diff --git a/Makefile.in b/Makefile.in +index 4e30ada3..e92a1072 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,6 +27,8 @@ CONF_LIB_ALSA=@CONF_LIB_ALSA@ + CONF_LIB_OSS=@CONF_LIB_OSS@ + CONF_LIB_SDL=@CONF_LIB_SDL@ + CONF_LIB_FREETYPE=@CONF_LIB_FREETYPE@ ++CONF_LIB_SLANG=@CONF_LIB_SLANG@ ++CONF_LIB_NCURSES=@CONF_LIB_NCURSES@ + CONF_LIB_SVGAWIN=@CONF_LIB_SVGAWIN@ + CONF_LIB_PTHREAD=@CONF_LIB_PTHREAD@ + CONF_LIB_SLANG=@CONF_LIB_SLANG@ +@@ -97,6 +99,10 @@ SDLCFLAGS=@SDLCFLAGS@ + SDLLIBS=@SDLLIBS@ + FREETYPECFLAGS=@FREETYPECFLAGS@ + FREETYPELIBS=@FREETYPELIBS@ ++SLANGCFLAGS=@SLANGCFLAGS@ ++SLANGLIBS=@SLANGLIBS@ ++NCURSESCFLAGS=@NCURSESCFLAGS@ ++NCURSESLIBS=@NCURSESLIBS@ + VCCFLAGS=@VCCFLAGS@ + VCLIBS=@VCLIBS@ + ASMFLAGS=@ASMFLAGS@ +diff --git a/advance/cfg.mak b/advance/cfg.mak +index 222533ff..d2f83233 100644 +--- a/advance/cfg.mak ++++ b/advance/cfg.mak +@@ -57,15 +57,17 @@ CFGOBJS += \ + $(CFGOBJ)/linux/os.o + ifeq ($(CONF_LIB_SLANG),yes) + CFGCFLAGS += \ ++ $(SLANGCFLAGS) \ + -DUSE_VIDEO_SLANG +-CFGLIBS += -lslang ++CFGLIBS += $(SLANGLIBS) + CFGOBJS += \ + $(CFGOBJ)/linux/vslang.o + endif + ifeq ($(CONF_LIB_NCURSES),yes) + CFGCFLAGS += \ ++ $(NCURSESCFLAGS) \ + -DUSE_VIDEO_CURSES +-CFGLIBS += -lncurses ++CFGLIBS += $(NCURSESLIBS) + CFGOBJS += \ + $(CFGOBJ)/linux/vcurses.o + endif +diff --git a/advance/v.mak b/advance/v.mak +index 4ffe708f..451f0d55 100644 +--- a/advance/v.mak ++++ b/advance/v.mak +@@ -53,15 +53,17 @@ VOBJS += \ + $(VOBJ)/linux/os.o + ifeq ($(CONF_LIB_SLANG),yes) + VCFLAGS += \ ++ $(SLANGCFLAGS) \ + -DUSE_VIDEO_SLANG +-VLIBS += -lslang ++VLIBS += $(SLANGLIBS) + VOBJS += \ + $(VOBJ)/linux/vslang.o + endif + ifeq ($(CONF_LIB_NCURSES),yes) + VCFLAGS += \ ++ $(NCURSESCFLAGS) \ + -DUSE_VIDEO_CURSES +-VLIBS += -lncurses ++VLIBS += $(NCURSESLIBS) + VOBJS += \ + $(VOBJ)/linux/vcurses.o + endif +diff --git a/configure.ac b/configure.ac +index 063c407a..f8ba989a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -717,29 +717,41 @@ AC_ARG_ENABLE( + [ac_lib_slang=auto] + ) + if test $ac_lib_slang = auto; then +- AC_CHECK_LIB( +- [slang], +- [SLang_init_tty], +- [ac_lib_slang=yes], +- [ac_lib_slang=no], +- [] +- ) ++ PKG_CHECK_MODULES([SLANG], [slang], [ac_lib_slang=yes], [ac_lib_slang=no]) ++ if test $ac_lib_slang = yes; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="SLANG_CFLAGS $CFLAGS" ++ LIBS="$SLANG_LIBS $LIBS" ++ AC_MSG_CHECKING([for linking slang]) ++ AC_TRY_LINK([ ++ #include ++ ], [ ++ if (SLang_init_tty(-1, 0, 0) < 0) { ++ perror("SLang_init_tty"); ++ return 1; ++ } ++ ++ SLang_reset_tty(); ++ return 0; ++ ],[ac_lib_slang=yes],[ac_lib_slang=no]) ++ AC_MSG_RESULT([$ac_lib_slang]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi + elif test $ac_lib_slang = yes; then +- AC_CHECK_LIB( +- [slang], +- [SLang_init_tty], +- [], +- [AC_MSG_ERROR([the sLang library is missing])], +- [] +- ) ++ PKG_CHECK_MODULES([SLANG], [slang], [], AC_MSG_ERROR([the slang library is missing])) + fi + if test $ac_lib_slang = yes; then + AC_CHECK_HEADERS([slang.h slang/slang.h], [break]) + ac_lib_video="$ac_lib_video slang" + ac_lib_text_flag=yes + fi ++AC_SUBST([SLANGCFLAGS],[$SLANG_CFLAGS]) ++AC_SUBST([SLANGLIBS],[$SLANG_LIBS]) + AC_SUBST([CONF_LIB_SLANG],[$ac_lib_slang]) + ++ + dnl Checks for ncurses + AC_ARG_ENABLE( + [ncurses], +@@ -748,28 +760,37 @@ AC_ARG_ENABLE( + [ac_lib_ncurses=auto] + ) + if test $ac_lib_ncurses = auto; then +- AC_CHECK_LIB( +- [ncurses], +- [endwin], +- [ac_lib_ncurses=yes], +- [ac_lib_ncurses=no], +- [] +- ) ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [ac_lib_ncurses=yes], [ac_lib_ncurses=no]) ++ if test $ac_lib_ncurses = yes; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$NCURSES_CFLAGS $CFLAGS" ++ LIBS="$NCURSES_LIBS $LIBS" ++ AC_MSG_CHECKING([for linking ncurses]) ++ AC_TRY_LINK([ ++ #include ++ ], [ ++ initscr(); ++ noecho(); ++ curs_set(FALSE); ++ endwin(); ++ ],[ac_lib_ncurses=yes],[ac_lib_ncurses=no]) ++ AC_MSG_RESULT([$ac_lib_ncurses]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi + elif test $ac_lib_ncurses = yes; then +- AC_CHECK_LIB( +- [ncurses], +- [endwin], +- [], +- [AC_MSG_ERROR([the sLang library is missing])], +- [] +- ) ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [], AC_MSG_ERROR([the ncurses library is missing])) + fi + if test $ac_lib_ncurses = yes; then + ac_lib_video="$ac_lib_video ncurses" + ac_lib_text_flag=yes + fi ++AC_SUBST([NCURSESCFLAGS],[$NCURSES_CFLAGS]) ++AC_SUBST([NCURSESLIBS],[$NCURSES_LIBS]) + AC_SUBST([CONF_LIB_NCURSES],[$ac_lib_ncurses]) + ++ + dnl Checks for freetype + AC_ARG_ENABLE( + [freetype], diff --git a/games-emulation/advancemame/files/advancemame-pic.patch b/games-emulation/advancemame/files/advancemame-pic.patch new file mode 100644 index 000000000000..049befbfac2c --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-pic.patch @@ -0,0 +1,13 @@ +--- ./advance/blit/blit.c.orig 2004-12-19 01:01:46.039956536 -0500 ++++ ./advance/blit/blit.c 2004-12-19 01:01:19.566981040 -0500 +@@ -28,6 +28,10 @@ + * do so, delete this exception statement from your version. + */ + ++#if defined(USE_ASM_INLINE) && defined(__PIC__) ++# undef USE_ASM_INLINE ++#endif ++ + #include "portable.h" + + #include "blit.h" diff --git a/games-emulation/advancemame/files/advancemame-verboselog.patch b/games-emulation/advancemame/files/advancemame-verboselog.patch new file mode 100644 index 000000000000..b72c1224e75f --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-verboselog.patch @@ -0,0 +1,42 @@ +From: Julian Ospald +Date: Sun Feb 17 03:39:55 UTC 2013 +Subject: build system + + make build log verbose + +--- advancemame-1.2/Makefile.in ++++ advancemame-1.2/Makefile.in +@@ -77,21 +77,21 @@ + srcdir=@srcdir@ + # Don't add the prefix @. This command must be used also in a shell script + INSTALL=@INSTALL@ +-CC=@@CC@ +-CXX=@@CXX@ +-LD=@@CC@ +-LDXX=@@CXX@ +-AR=@@AR@ +-ASM=@@ASM@ +-RC=@@RC@ ++CC=@CC@ ++CXX=@CXX@ ++LD=@CC@ ++LDXX=@CXX@ ++AR=@AR@ ++ASM=@ASM@ ++RC=@RC@ + LN_S=@@LN_S@ + MD=-@@MKDIR@ -p + RM=@@RM@ -f + ECHO=@@ECHO@ +-CC_FOR_BUILD=@@CC_FOR_BUILD@ +-LD_FOR_BUILD=@@CC_FOR_BUILD@ +-CXX_FOR_BUILD=@@CXX_FOR_BUILD@ +-LDXX_FOR_BUILD=@@CXX_FOR_BUILD@ ++CC_FOR_BUILD=@CC_FOR_BUILD@ ++LD_FOR_BUILD=@CC_FOR_BUILD@ ++CXX_FOR_BUILD=@CXX_FOR_BUILD@ ++LDXX_FOR_BUILD=@CXX_FOR_BUILD@ + EXE=@EXE@ + EXE_FOR_BUILD=@EXE_FOR_BUILD@ + SDLCFLAGS=@SDLCFLAGS@ + -- cgit v1.2.3