From fbda87924e6faa7a1919f1a2b4182490bde5ec5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 3 Sep 2021 20:56:28 +0100 Subject: gentoo resync : 03.09.2021 --- games-arcade/Manifest.gz | Bin 20924 -> 20922 bytes games-arcade/fishsupper/Manifest | 3 +- .../fishsupper/files/fishsupper-0.1.6-int16.patch | 14 +++++++ games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild | 42 -------------------- games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild | 43 +++++++++++++++++++++ 5 files changed, 59 insertions(+), 43 deletions(-) create mode 100644 games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch delete mode 100644 games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild create mode 100644 games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild (limited to 'games-arcade') diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz index 772b23a88202..6045b0858850 100644 Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ diff --git a/games-arcade/fishsupper/Manifest b/games-arcade/fishsupper/Manifest index 5b26be86fd3c..5ce17df692ef 100644 --- a/games-arcade/fishsupper/Manifest +++ b/games-arcade/fishsupper/Manifest @@ -1,6 +1,7 @@ AUX fishsupper-0.1.6-asneeded.patch 297 BLAKE2B 18b749a0e6733ee92bbe38ef2fd65fc5acfdb440ccbce23c0d1ae78d7b3f7601ebd3c6f23d5fdd89cd95caac11a9acea2a217b1ef6bd0f1e938d49d7c0735311 SHA512 934d5a308ae6c25e34e437c773ed71d12ac146555848a21855116a848768edd8c4e30e1d789c20a75e8c89f2b5a586c75d9ef122a70e83206848919c7c275be5 AUX fishsupper-0.1.6-gcc6.patch 1730 BLAKE2B 41317933789d096b9b00a184e15df47b8daf946e9730e6688895497a94bf3efe7d96adf1a39b016dd9874b97a2721472fe98650732689464283495e817d76223 SHA512 9dfaf5c9a5a9554c87e93a3876cb9fb858a638b2ead10a3a10e4c9d8a68fca1608f08c1920d506aa09bc2c965c93ffc748ef3b4e3dad3b24bb86bd1481703d48 +AUX fishsupper-0.1.6-int16.patch 522 BLAKE2B 84810244ec0b7f3104bf03936242669062adb9c5de086e6441f4c660ac8b71e869f1364e331e59f43e84a87c95843d8307ca9824485f195a22f6b7aecac7e955 SHA512 ca30f83e07bffe03913dbf796b0ae08b37ad21aa5802c0a0a59c359363208ae4c66cbedad9a0cccfac841eed9b5beb8f1d1f57f84ed804cf64e5b5e41737455c AUX fishsupper-0.1.6-ovflfix.patch 308 BLAKE2B 16d9956ad39c518c171a7d99151853329c0fe76a092494a04d0e4f549819fa07f29a4bc01cd0dcfac104c3dc1df9e25c835dec7fb834b8b9ded24b742e56dda9 SHA512 75501a6ca44c510d73859d4339ee041e71dd3d0bbde3e071cfe438b014b515e868e8788d14ddef461b6402c8ef6c67c14bc3ad94e9a06a553c3aadbba602013a DIST fishsupper-0.1.6.tar.gz 1136893 BLAKE2B f07e5cc8fcfef4547fe2af029db1472ab0299fb5267e8f3a4fb29b9aa2cb39115101c217f509f35a4dc81a0e4f6c72f70bb2102c74c7c45981ced4e50230cd5c SHA512 a6b3df47010e8ac186ff4446db3659fd9173e9e3fc973ab376eed46da9cd13f7a4c0c02b25f3427232252e7fe5728036fa91ea773affe0948387a56f617fc7af -EBUILD fishsupper-0.1.6-r2.ebuild 835 BLAKE2B 6d3750784c9b5172387406435511c108e6941f9bd60719c3b8409f188322b4479bb7f04f55c0a892f39c7240795e84cf580dabf91efa33bf4e49065f0fd5884b SHA512 ecdfc0071041c15cef8e7211c13da64cf3412e542d08a40a452afa86abb985e232b1bbebe7292b1860b67ebc115d713cd2b73955e76366d01a33d1238ae84bd6 +EBUILD fishsupper-0.1.6-r3.ebuild 867 BLAKE2B 2fc972151848d14cd84568bf0b5427c8f786098c5a73f69bda0be5be32cc0fe8004ba8ba2d99a83aec8d780b950633b6dd7371e59326f14c0e7d2e26d6a3a657 SHA512 24a05440528fbcfd38ec58e4f50e4b6d1d709f312b255d54c7c03808f6d19c34e14c4fb3d06b9d91400e5cc4d84179828796b83adfb2582f55284fbc6b0175e1 MISC metadata.xml 333 BLAKE2B de23175a8ff9c7bd8f8e2d59072017d790d2594882ac5963acdf28e4bab252152c01754cf9c3b57122dbc37fc857f2e749bbc52333700d25b43ac4b0b1ecd165 SHA512 6a3a977950808ae8b79c2c34c17fe8e1dd9ae21b9f9a43a2f2808931a4569042825f381d4c10024480eb2e2635893de8433eacf94f5f755d086285e3fe6770b3 diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch new file mode 100644 index 000000000000..3e4f6edbf631 --- /dev/null +++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch @@ -0,0 +1,14 @@ +Fix build with clang +https://bugs.gentoo.org/739090 + +--- a/src/SFont_gl.cpp ++++ b/src/SFont_gl.cpp +@@ -223,7 +223,7 @@ void Mafferyew::SFont_gl::create_font_char(SDL_Surface* image, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000); + #endif + +- SDL_Rect src_rect = { begin_x, 1, font_char_w, font_height }; ++ SDL_Rect src_rect = { (Sint16)begin_x, 1, (Uint16)font_char_w, (Uint16)font_height }; + SDL_BlitSurface(image, &src_rect, converted, 0); + + GLuint texture; diff --git a/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild deleted file mode 100644 index 1ffdfa94712f..000000000000 --- a/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop - -DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger" -HOMEPAGE="https://sourceforge.net/projects/fishsupper/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="CC-BY-SA-2.5 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - media-libs/libsdl[joystick,sound,video,opengl,X] - media-libs/sdl-image[png] - media-libs/sdl-mixer[wav] - virtual/opengl -" -DEPEND="${RDEPEND} - dev-libs/boost -" - -PATCHES=( - "${FILESDIR}"/${P}-ovflfix.patch - "${FILESDIR}"/${P}-asneeded.patch - "${FILESDIR}"/${P}-gcc6.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - - newicon data/images/fs_sprite_042.png ${PN}.png - make_desktop_entry ${PN} "Fish Supper" -} diff --git a/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild new file mode 100644 index 000000000000..09a8ec5b5f2a --- /dev/null +++ b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger" +HOMEPAGE="https://sourceforge.net/projects/fishsupper/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="CC-BY-SA-2.5 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl[joystick,sound,video,opengl,X] + media-libs/sdl-image[png] + media-libs/sdl-mixer[wav] + virtual/opengl +" +DEPEND="${RDEPEND} + dev-libs/boost +" + +PATCHES=( + "${FILESDIR}"/${P}-ovflfix.patch + "${FILESDIR}"/${P}-asneeded.patch + "${FILESDIR}"/${P}-gcc6.patch + "${FILESDIR}"/${P}-int16.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + newicon data/images/fs_sprite_042.png ${PN}.png + make_desktop_entry ${PN} "Fish Supper" +} -- cgit v1.2.3