From 88ebe56470c37b02a044e1091cad6b2df0f3be8f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 May 2018 16:02:49 +0100 Subject: gentoo resync : 11.05.2018 --- games-emulation/advancemame/Manifest | 5 +- games-emulation/advancemame/advancemame-3.7.ebuild | 22 ++++-- ...advancemame-3.7-move_aclocal_to_acinclude.patch | 78 ++++++++++++++++++++++ ...cemame-3.7-remove_static_configure_option.patch | 41 ++++++++++++ 4 files changed, 139 insertions(+), 7 deletions(-) create mode 100644 games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch create mode 100644 games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch (limited to 'games-emulation/advancemame') diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest index 52e3d74d5be6..600b261cab4d 100644 --- a/games-emulation/advancemame/Manifest +++ b/games-emulation/advancemame/Manifest @@ -1,5 +1,8 @@ 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 1827 BLAKE2B 685e054241036197c4e387d16a0b89167a37f12f10e57c5965fb7e3ebdf369f985c4c35e07dee275574ae77c5128d3676b6e53a4df22346485f57995bda1c247 SHA512 99ea75cdcb038bfb36d1cdc625162767867b72031c0823ad09386664f00c9c283a25df2b2b65f1ec74e65e955a656de2c721af6b7a6984131fc8f9a32ae70e99 +EBUILD advancemame-3.7.ebuild 2156 BLAKE2B 269e0044b610bf6c51d2de3cc689c3b4cf6a8529d66b94d08344404ae21eb64c5e225a7651e4639fff08373936a029d3815b32bc461c3706168d18bca7066546 SHA512 0cbe417469a221e735bdfc71b02f1b69e487e9fa903a7ff94a967ef7cc2364966ebf7107985d2cdbfdd760ee5b9492c60e2623782422f20c1e2c7aca1b86ba0d 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 index 37773715f8e2..c371c14107c3 100644 --- a/games-emulation/advancemame/advancemame-3.7.ebuild +++ b/games-emulation/advancemame/advancemame-3.7.ebuild @@ -2,12 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit flag-o-matic +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" @@ -25,20 +28,28 @@ RDEPEND=" " 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 - - eapply "${FILESDIR}/${PN}-1.2-pic.patch" \ - "${FILESDIR}"/${PN}-1.2-verboselog.patch + 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" - use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config" } src_configure() { @@ -55,7 +66,6 @@ src_configure() { --enable-zlib \ --disable-slang \ --disable-svgalib \ - --disable-static \ $(use_enable alsa) \ $(use_enable fbcon fb) \ $(use_enable oss) \ 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 new file mode 100644 index 000000000000..4a30e179ae27 --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch @@ -0,0 +1,78 @@ +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 new file mode 100644 index 000000000000..342ba1c5c07a --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch @@ -0,0 +1,41 @@ +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 + -- cgit v1.2.3