diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 07:34:19 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:09:51 +0100 |
| commit | c3c36dbc599d60d2334cc6f084b4e12c99931904 (patch) | |
| tree | ff83d47e87e27a2b907b4c8cfc8a9e814759c3e5 /games-emulation | |
| parent | games-arcade/methane: respect ${PKG_CONFIG} (diff) | |
| download | gentoo-c3c36dbc599d60d2334cc6f084b4e12c99931904.tar.gz gentoo-c3c36dbc599d60d2334cc6f084b4e12c99931904.tar.bz2 gentoo-c3c36dbc599d60d2334cc6f084b4e12c99931904.zip | |
games-emulation/fbzx: respect ${PKG_CONFIG}
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/fbzx/fbzx-3.0.0-r1.ebuild | 15 | ||||
| -rw-r--r-- | games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch | 12 |
2 files changed, 15 insertions, 12 deletions
diff --git a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild index 8fcb34dbfc9c..7b67cf93384e 100644 --- a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild +++ b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild @@ -1,7 +1,8 @@ -# 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 DESCRIPTION="Full Screen Sinclair Spectrum emulator" @@ -11,7 +12,6 @@ SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" media-libs/libsdl[video] @@ -22,16 +22,21 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + src_prepare() { - default sed -i -e "s|/usr/share/|/usr/share/${PN}/|g" src/llscreen.cpp || die - eapply "${FILESDIR}"/${P}-gentoo.patch + default } src_install() { dobin src/fbzx - insinto "/usr/share/${PN}" + + insinto /usr/share/${PN} doins -r data/{keymap.bmp,spectrum-roms} + dodoc AMSTRAD CAPABILITIES FAQ PORTING README* TODO VERSIONS doicon data/fbzx.svg make_desktop_entry fbzx FBZX diff --git a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch index 0e1f02337146..f9751d7486dd 100644 --- a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch +++ b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch @@ -1,6 +1,5 @@ -diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile ---- fbzx-3.0.0.orig/src/Makefile 2015-04-01 17:22:47.000000000 -0400 -+++ fbzx-3.0.0/src/Makefile 2016-04-01 13:15:27.230190807 -0400 +--- a/src/Makefile ++++ b/src/Makefile @@ -1,78 +1,74 @@ -CC=g++ -c -O2 -CPP=g++ -c -O2 @@ -8,7 +7,7 @@ diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile - CFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS -CPPFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS -+CXXFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS ++CXXFLAGS += `${PKG_CONFIG} --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS LDFLAGS += `pkg-config --libs sdl libpulse-simple alsa` @@ -104,9 +103,8 @@ diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile - $(CPP) $(CPPFLAGS) -o tape.o tape.cpp + $(CXX) -c $(CXXFLAGS) -o tape.o tape.cpp -diff -ru fbzx-3.0.0.orig/src/menus.cpp fbzx-3.0.0/src/menus.cpp ---- fbzx-3.0.0.orig/src/menus.cpp 2015-04-01 17:22:47.000000000 -0400 -+++ fbzx-3.0.0/src/menus.cpp 2016-04-01 13:15:33.213974823 -0400 +--- a/src/menus.cpp ++++ b/src/menus.cpp @@ -1691,7 +1691,7 @@ void keyboard_menu() { |