diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-emulation/fbzx | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'games-emulation/fbzx')
| -rw-r--r-- | games-emulation/fbzx/Manifest | 4 | ||||
| -rw-r--r-- | games-emulation/fbzx/fbzx-3.0.0-r1.ebuild | 20 | ||||
| -rw-r--r-- | games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch | 12 |
3 files changed, 21 insertions, 15 deletions
diff --git a/games-emulation/fbzx/Manifest b/games-emulation/fbzx/Manifest index bc3f10bc7431..2a060d525b5e 100644 --- a/games-emulation/fbzx/Manifest +++ b/games-emulation/fbzx/Manifest @@ -1,4 +1,4 @@ -AUX fbzx-3.0.0-gentoo.patch 6372 BLAKE2B 0e218a83a4eee9f7fbb632f74eb64358149715835f566c4256cecfa5857c615d732073a1346b0e8f4998fb5c560d7c2d39a083e5c1ae99cf4c889b6de42b8cde SHA512 4de9830dcfe015833939c1795f016d37afa0d364b94de2cc64b941f8d4df2acbe7220be951fa403bab6eba0db4882a8c15c376eac108fe6331e67708515b876e +AUX fbzx-3.0.0-gentoo.patch 6059 BLAKE2B 60850bd4bf8ca51ba2dcb251f0216107eb7887e0e2346b460e0968fc4c87ae83ef0de0333ecde9e485a5949569e87254cfa81a96b6a9521234cc8a5811dc534f SHA512 5a4b48cbc75f14bbc24b693792510f8837670a1ee6de40c7be15c2ffc7ac05be20c1170b514539907517527eef0be496efaa7b407e3f13dc120dd7894a3cd7fe DIST fbzx-3.0.0.tar.gz 435239 BLAKE2B 5105995a7972c7310628c0e4d3af7f1a749192bc24ac312e493d8821edf5ec329a65eedcbfa6c8479a4f4d134ca730acef7ee27ef2f89253f2e179c7cf8c2bf1 SHA512 cf2a01a1dde62da03c1f04e91f226859ae4cf06d099597dc1a1554c4ff9782dd287f9d924083829eee40cf0450c053d818f963f68381f9e16e0e61ca1f3d3083 -EBUILD fbzx-3.0.0-r1.ebuild 852 BLAKE2B c2c32bf293dc5803cbbc21b56cc5baee95bfc28f6e258482c3b9499f94cbe2f909329869e86bd1b49a4a5d6fb24054cb999d4bfc1dbbe45dc60ab9a0065e57c0 SHA512 775bfb04e9ba7c1bf47aa69260d4413caa5270202ca12434dd15f870570657d584eb2dee11cb4abeba57765dde96b4df2352a60504429203fa0ff7f44532cebf +EBUILD fbzx-3.0.0-r1.ebuild 888 BLAKE2B 476e145cba1d21d8bd4aa1a533cc7548e6666ad73127dbbfeda9f4bbdb7d8d5e9bc7561705907f98c9f1fab65542c3312e28f9fef09d5c545ad7ab4b4e1a5cf9 SHA512 dee4af74a2bf67953cd1aed76b4e209683660102f807f3b93efe681dab8fb557b8c12877a259c9d88096774e2ae5a2209de1ee13ff6ec99ed3f37d767cf0a391 MISC metadata.xml 333 BLAKE2B b7e32a98bd1f4530fd7ea419607e8ff57998633131c3cde906f698e91810af4b6750e5c70b3a17e1ebaa532022952bd8d0bd915a41fb755d30ca1759b3c0c189 SHA512 d865ef840f0a446091249c24b36dc7d5cca2aaeac727d0f1d45bf8699e7d55d396cca469b02e84e26cc056f506051bb81557c0cf33d74a5a01a8d114ed3f3554 diff --git a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild index 8fcb34dbfc9c..ffe2b98753cb 100644 --- a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild +++ b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild @@ -1,8 +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="Full Screen Sinclair Spectrum emulator" HOMEPAGE="https://github.com/rastersoft/fbzx" @@ -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,24 @@ 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 + + tc-export PKG_CONFIG + + 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() { |