commit: c3186ef8817aa6de849eb0c6fe74fa1ee36667a0 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Nov 7 18:49:48 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Nov 7 18:50:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3186ef8
games-misc/sdljoytest: tweak for gcc-10 Fix-by: Samuel Bauer Closes: https://bugs.gentoo.org/706448 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../sdljoytest/files/sdljoytest-11102003-no-common.patch | 11 +++++++++++ games-misc/sdljoytest/sdljoytest-11102003.ebuild | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/games-misc/sdljoytest/files/sdljoytest-11102003-no-common.patch b/games-misc/sdljoytest/files/sdljoytest-11102003-no-common.patch new file mode 100644 index 00000000000..6775c2b6655 --- /dev/null +++ b/games-misc/sdljoytest/files/sdljoytest-11102003-no-common.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/706448 +--- a/init_quit.h ++++ b/init_quit.h +@@ -36,7 +36,6 @@ extern int joyXCenter; + extern int videoFlags; + extern int lightCol; + extern int lightRow; +-int hello; + extern GLint textures[2]; + extern GLuint base; + diff --git a/games-misc/sdljoytest/sdljoytest-11102003.ebuild b/games-misc/sdljoytest/sdljoytest-11102003.ebuild index 905eb148733..335b1b27c35 100644 --- a/games-misc/sdljoytest/sdljoytest-11102003.ebuild +++ b/games-misc/sdljoytest/sdljoytest-11102003.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs DESCRIPTION="SDL app to test joysticks and game controllers" @@ -20,7 +20,10 @@ RDEPEND=${DEPEND} S=${WORKDIR}/SDLJoytest-GL +PATCHES=("${FILESDIR}"/${P}-no-common.patch) + src_prepare() { + default emake clean sed -i -e 's:/usr/local:/usr:' joytest.h || die sed -i -e 's:SDL/::' *.c || die
