diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-emulation/advancemame/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-emulation/advancemame/files')
4 files changed, 174 insertions, 0 deletions
diff --git a/games-emulation/advancemame/files/advancemame-1.2-pic.patch b/games-emulation/advancemame/files/advancemame-1.2-pic.patch new file mode 100644 index 000000000000..049befbfac2c --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-1.2-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-1.2-verboselog.patch b/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch new file mode 100644 index 000000000000..b72c1224e75f --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch @@ -0,0 +1,42 @@ +From: Julian Ospald <hasufell@gentoo.org> +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 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 <amadvance@gmail.com> +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 <amadvance@gmail.com> +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 + |