diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 07:31:34 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:09:49 +0100 |
| commit | 655767d6aa612ced09b1a9bb31ee68656817cc35 (patch) | |
| tree | 591041ad78348f60cc7e1efc196972a9233b1654 /games-action/wordwarvi | |
| parent | games-action/battalion: respect ${PKG_CONFIG} (diff) | |
| download | gentoo-655767d6aa612ced09b1a9bb31ee68656817cc35.tar.gz gentoo-655767d6aa612ced09b1a9bb31ee68656817cc35.tar.bz2 gentoo-655767d6aa612ced09b1a9bb31ee68656817cc35.zip | |
games-action/wordwarvi: respect ${PKG_CONFIG}
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-action/wordwarvi')
| -rw-r--r-- | games-action/wordwarvi/files/wordwarvi-1.00-sound.patch | 14 | ||||
| -rw-r--r-- | games-action/wordwarvi/wordwarvi-1.00-r1.ebuild | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch index 5ad7bc8440b9..a0a6db3a222a 100644 --- a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch +++ b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch @@ -1,6 +1,5 @@ -diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile ---- wordwarvi-1.00.orig/Makefile 2011-06-09 00:06:22.000000000 -0400 -+++ wordwarvi-1.00/Makefile 2011-06-11 19:57:55.609619777 -0400 +--- a/Makefile ++++ b/Makefile @@ -1,5 +1,5 @@ PREFIX=/usr -DATADIR=${PREFIX}/share/wordwarvi @@ -36,7 +35,7 @@ diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile ogg_to_pcm.o: ogg_to_pcm.c ogg_to_pcm.h Makefile - $(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \ -+ $(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \ ++ $(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `${PKG_CONFIG} --cflags vorbisfile` \ -pthread -Wall -c ogg_to_pcm.c wwviaudio.o: wwviaudio.c wwviaudio.h ogg_to_pcm.h my_point.h Makefile @@ -48,7 +47,7 @@ diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile rumble.o: rumble.c rumble.h Makefile - $(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \ -+ $(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \ ++ $(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `${PKG_CONFIG} --cflags vorbisfile` \ -pthread -Wall -c rumble.c wwvi_font.o: wwvi_font.c wwvi_font.h my_point.h Makefile @@ -66,9 +65,8 @@ diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile joystick.o \ rumble.o \ wwvi_font.o \ -diff -ru wordwarvi-1.00.orig/wwviaudio.c wordwarvi-1.00/wwviaudio.c ---- wordwarvi-1.00.orig/wwviaudio.c 2011-06-09 00:06:22.000000000 -0400 -+++ wordwarvi-1.00/wwviaudio.c 2011-06-11 19:57:17.394274660 -0400 +--- a/wwviaudio.c ++++ b/wwviaudio.c @@ -121,7 +121,7 @@ if (clipnum >= max_sound_clips || clipnum < 0) return -1; diff --git a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild index 096c489f0c65..da2395b0216c 100644 --- a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild +++ b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit desktop +inherit desktop toolchain-funcs DESCRIPTION="A retro side-scrolling shoot'em up based on the editor war story" HOMEPAGE="http://wordwarvi.sourceforge.net" @@ -36,6 +36,8 @@ src_prepare() { } src_compile() { + tc-export PKG_CONFIG + emake \ PREFIX="/usr" \ DATADIR="/usr/share/${PN}" \ @@ -51,7 +53,7 @@ src_install() { install if ! use portaudio ; then - rm -rf "${D}/usr/share" || die + rm -rf "${ED}/usr/share" || die fi dodoc README AUTHORS changelog.txt AAA_HOW_TO_MAKE_NEW_LEVELS.txt |