From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- games-roguelike/Manifest.gz | Bin 3226 -> 3220 bytes games-roguelike/angband/Manifest | 7 +- games-roguelike/angband/angband-4.2.0.ebuild | 129 --------------------- games-roguelike/angband/angband-4.2.1-r1.ebuild | 108 +++++++++++++++++ .../angband/files/angband-4.2.0-gcc-10.patch | 22 ---- .../angband/files/angband-4.2.1-sdl2-sound.patch | 50 ++++++++ games-roguelike/angband/metadata.xml | 1 - 7 files changed, 161 insertions(+), 156 deletions(-) delete mode 100644 games-roguelike/angband/angband-4.2.0.ebuild create mode 100644 games-roguelike/angband/angband-4.2.1-r1.ebuild delete mode 100644 games-roguelike/angband/files/angband-4.2.0-gcc-10.patch create mode 100644 games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch (limited to 'games-roguelike') diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz index 070ccd7bc6a1..bcd6d7d960c6 100644 Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest index 56c6b506196e..daa6641289a0 100644 --- a/games-roguelike/angband/Manifest +++ b/games-roguelike/angband/Manifest @@ -1,10 +1,9 @@ AUX angband-4.1.3-tinfo.patch 824 BLAKE2B cfcc662b6837c84b7758931744b446c269a7a2958c183a3cf86368231116aaed065b37d93aca2a1d6e42af5a04c2bbf4db96a0aa2f188cd96eb81b01bcbcadc2 SHA512 00770084dcbab766384cbb5617efd8ae73191c46b59e64658b063c51c49d8d82c9d03e9b995bab8a609a67b5f9e92c77fa92aff987fdc2ecfbcfae38b6d7f638 -AUX angband-4.2.0-gcc-10.patch 503 BLAKE2B e020ad8ec0515d1d7163e9b0611f6501b9b0131e3756d21a1b18f82e139b5b379b58059f4800595abe8af704b28c55de4f59c8b9c7bbd3c7c0c20d1c8852ae41 SHA512 8079f63ec939f72bb14d3b41d57e3434fba9c490577cd267e5dfce6af3db2027d97dcc1ff91eeffe4cd4cfd844c638dcf5f7d290c1c0f45b1aeef1c4338401fc +AUX angband-4.2.1-sdl2-sound.patch 1637 BLAKE2B b922eb6399fdd9f49b6a716a11b84101385f132ce46f8e6c30298f6c80a0a86fb09f0a55192d0cc927d2ea0ccc5d435900664757b47688cb2edafd4920e0a23c SHA512 1f35ad9480120112c78cd251710a40e70148f33e2edddcf4ce144b83ca6ed958a9d47a905a0c14c19633d8edee9410c9f9e929919380d0584ebb944b3d555268 DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47 SHA512 7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a -DIST angband-4.2.0.tar.gz 24727127 BLAKE2B 4bdd5cfe49080fc38b988e6606eadddc2e872ca7b01f34e692ca299a420689310e9e972355986e802e654a27837ac2621eb3bc0823b7e771dc0a851a5c5a8bc6 SHA512 b5c4884ce765bc45d7c21b8be06bc29c7d84c16e48341967b5d6a847f250db104ef509fc28e8887d4f1cd9ed545e504781186936a1f38931d5113e2fb58b32c3 DIST angband-4.2.1-man.tar.gz 104660 BLAKE2B ac7a413b1ec29cb3740fb1e57c238a5f87b9bc6965c4180a62e4089eb4b2cf7fa8f4eb2017d605255eacbb2856e64449745144ce0d9848a3b5cfd123fa1e39da SHA512 2dd9e40e6bd4804162fb810d40a81932c65d01b8c8f019e73194f83b222e3ae319fe4b22ad8f59f88cb473426ad59efd4988d0bfaf289726453fa83d678e9ae8 DIST angband-4.2.1.tar.gz 24938593 BLAKE2B ecacf4bd3681f205a3eb0a5b5ddf0fb7ff92600c26dffec3fc8addaccf7da26fd4f805e5fc11803c165c35e8adff9ae6bced08381ddde0e39bc914fac043e11c SHA512 e13681bcd74fa56fe5c606d62f1e9761c9fc5367194e0e46894a5ebf108e1553a1f96191e139f1574238b72c635436c3108c80bc656aba8e328fe4e5b301c6bc EBUILD angband-4.1.3.ebuild 2229 BLAKE2B d38bbb531edaae78e632eb0d9d74dfbdc3238d89005d1c9df1cecb54c8572d3932c5209042803ad1e5d58c684360cecd8276be99a0cae6bf720d570f372e8450 SHA512 b9425cf626ce9b4c5b4dd1d525c5373a6f68c63cc7240c4ea68446ae242a7c288365c43fdf67f126134f12d0bb6aaed7d4455cdbdf4763e7aec37a56d33e1f69 -EBUILD angband-4.2.0.ebuild 2651 BLAKE2B 0dbdf4d0c22eb29341c5145b4524122b58060359ce4ccb5e04058dbfe13679a038d395ad83e3a7bec9843fee7cef10288009f3c6b6bbc5627a9a50d10971ecdf SHA512 0b156bc86b3554a383cc15ba30ba93f921fd4cb5ebc40b33b2be6a4c149dbc8dd053e35e1485cbf97ea7904b556c4e5ff82d18286652fd93b228dcf3a6c04066 +EBUILD angband-4.2.1-r1.ebuild 2254 BLAKE2B 899ab9227e709e61a7d1208c4cbd6924371fa67e7d51c0c79132db0c740ea211332cc88633f6fa342b5517443b251a5b7425a824d1ec16be37b3f0a190e1676b SHA512 f0529dc562613f961e087a39e59676eb8f9a5b5cb4da62dbec8206872ffdeb5b962e3514b73151ca064b490c71ed6ab9a8d9dc58c07f5e6d9f31706b9c59d27d EBUILD angband-4.2.1.ebuild 2205 BLAKE2B 59b6d8be51e44c2db40b4cc9082a6e1f8bd04e6274f3b8597cae625f84769c1d2ec6e368060cdb86490dde48c0bedfd8f0036a97192c578875cabb910d4768fa SHA512 fe8e004693073996f2e7d5701f9265d8d65c350f50a69f64a7082d3f98283c75661a12ee228167313cc0f10ece561a85fd521150bfdb96a35e73e1a14e35590b -MISC metadata.xml 487 BLAKE2B 4b3f298db150c90e551d7ce2c46b9f3929eec0cc8ebd3c0e601841afae7234ab5f7369ea2d3a7189a3f407ffec918d612f238133166f3a565c2f056d9e7f443a SHA512 16308369154cd36398eae5339bfa8c8f387919635678be9b11040a0bad027a5df6d895ff9d598dc000af46751468d9964fac636794cb3c56438d10fc99b95af3 +MISC metadata.xml 430 BLAKE2B 7245504be968d4ce51d4a782520dd8e8b1acda9c16aeeea78674b350df8a15f88a6338ad8fe3852c5f8290c1198af0b32372fce2f3e13f7dac8063d0816f5431 SHA512 4cb61f2b253a390e59abb74f1d67171f73ec30cf38a3d05bdd23f36faf2b4a639f8dd117ec87b69a19faed0e7d117060c4aabae543aef988348591dd4c01a0f6 diff --git a/games-roguelike/angband/angband-4.2.0.ebuild b/games-roguelike/angband/angband-4.2.0.ebuild deleted file mode 100644 index f9dfb300662f..000000000000 --- a/games-roguelike/angband/angband-4.2.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop xdg-utils - -MAJOR_PV=$(ver_cut 1-2) - -DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien" -HOMEPAGE="https://rephial.org/" -SRC_URI="https://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+ncurses sdl sdl2 sound +X" - -REQUIRED_USE="sdl2? ( sdl ) - sound? ( sdl ) - || ( X ncurses )" - -RDEPEND="X? ( - media-fonts/font-misc-misc - x11-libs/libX11 - ) - ncurses? ( sys-libs/ncurses:0=[unicode] ) - sdl? ( - !sdl2? ( - media-libs/libsdl[video,X] - media-libs/sdl-image - media-libs/sdl-ttf - sound? ( - media-libs/libsdl[sound] - media-libs/sdl-mixer[mp3] - ) - ) - sdl2? ( - media-libs/libsdl2[video,X] - media-libs/sdl2-image - media-libs/sdl2-ttf - sound? ( - media-libs/libsdl2[sound] - media-libs/sdl2-mixer[mp3] - ) - ) - )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=("${FILESDIR}"/${P}-gcc-10.patch) - -src_prepare() { - default - - sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die - sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die - - if use !sound ; then - sed -i -e 's/sounds//' lib/Makefile || die - fi - - # Game constant files are now system config files in Angband, but - # users will be hidden from applying updates by default - { - echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/customize/\"" - echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/gamedata/\"" - } > "${T}"/99${PN} || die - - eautoreconf -} - -src_configure() { - local myconf=( - --bindir="${EPREFIX}"/usr/bin - --with-private-dirs - $(use_enable X x11) - $(use_enable ncurses curses) - ) - if use sdl; then - if use sdl2; then - myconf+=( - --enable-sdl2 - $(use_enable sound sdl2-mixer) - ) - else - myconf+=( - --enable-sdl - $(use_enable sound sdl-mixer) - ) - fi - fi - - econf "${myconf[@]}" -} - -src_install() { - default - - dodoc changes.txt readme.txt - dodoc docs/{a-quick-demo,attack,birth,command,customize,dungeon,faq,guide}.rst - doenvd "${T}"/99${PN} - - if use X || use sdl; then - use X && make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}" - if use sdl; then - use sdl2 && make_desktop_entry "angband -msdl2" "Angband (SDL2)" "${PN}" \ - || make_desktop_entry "angband -msdl" "Angband (SDL)" "${PN}" - fi - - local s - for s in 16 32 128 256 512; do - newicon -s ${s} lib/icons/att-${s}.png "${PN}.png" - done - newicon -s scalable lib/icons/att.svg "${PN}.svg" - fi -} - -pkg_postinst() { - if use X || use sdl; then - xdg_icon_cache_update - fi -} - -pkg_postrm() { - if use X || use sdl; then - xdg_icon_cache_update - fi -} diff --git a/games-roguelike/angband/angband-4.2.1-r1.ebuild b/games-roguelike/angband/angband-4.2.1-r1.ebuild new file mode 100644 index 000000000000..5261fcba1660 --- /dev/null +++ b/games-roguelike/angband/angband-4.2.1-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop xdg-utils + +MAJOR_PV=$(ver_cut 1-2) + +DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien" +HOMEPAGE="https://rephial.org/" +SRC_URI="https://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz + https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ncurses sdl sound +X" + +REQUIRED_USE="sound? ( sdl ) + || ( X ncurses )" + +RDEPEND="X? ( + media-fonts/font-misc-misc + x11-libs/libX11 + ) + ncurses? ( sys-libs/ncurses:0=[unicode] ) + sdl? ( + media-libs/libsdl2[video,X] + media-libs/sdl2-image + media-libs/sdl2-ttf + sound? ( + media-libs/libsdl2[sound] + media-libs/sdl2-mixer[mp3] + ) + )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${P}-sdl2-sound.patch" ) + +src_prepare() { + default + + sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die + sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die + + if use !sound ; then + sed -i -e 's/sounds//' lib/Makefile || die + fi + + # Game constant files are now system config files in Angband, but + # users will be hidden from applying updates by default + { + echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/customize/\"" + echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/gamedata/\"" + } > "${T}"/99${PN} || die + + eautoreconf +} + +src_configure() { + local myconf=( + --bindir="${EPREFIX}"/usr/bin + --with-private-dirs + $(use_enable X x11) + $(use_enable ncurses curses) + ) + if use sdl; then + myconf+=( + --enable-sdl2 + $(use_enable sound sdl2-mixer) + ) + fi + + econf "${myconf[@]}" +} + +src_install() { + default + + dodoc changes.txt README.md + doman "${WORKDIR}"/${PN}.1 + doenvd "${T}"/99${PN} + + if use X || use sdl; then + use X && make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}" + use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" "${PN}" + + local s + for s in 16 32 128 256 512; do + newicon -s ${s} lib/icons/att-${s}.png "${PN}.png" + done + newicon -s scalable lib/icons/att.svg "${PN}.svg" + fi +} + +pkg_postinst() { + if use X || use sdl; then + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use X || use sdl; then + xdg_icon_cache_update + fi +} diff --git a/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch b/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch deleted file mode 100644 index 6aeb1f7a2047..000000000000 --- a/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/707770 - ---- a/src/mon-blows.h -+++ b/src/mon-blows.h -@@ -41,7 +41,7 @@ struct blow_method { - struct blow_method *next; - }; - --struct blow_method *blow_methods; -+extern struct blow_method *blow_methods; - - /** - * Storage for context information for effect handlers called in -@@ -83,7 +83,7 @@ struct blow_effect { - struct blow_effect *next; - }; - --struct blow_effect *blow_effects; -+extern struct blow_effect *blow_effects; - - /* Functions */ - int blow_index(const char *name); diff --git a/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch b/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch new file mode 100644 index 000000000000..accbc8355579 --- /dev/null +++ b/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch @@ -0,0 +1,50 @@ +From bbfe78654e2f67da264d81d25fe1e6332302e51a Mon Sep 17 00:00:00 2001 +From: Eric Branlund +Date: Sat, 11 Jul 2020 11:07:24 -0700 +Subject: [PATCH] Adjusted so "./configure --enable-sdl2-mixer" and then + compiling generates an executable where "angband --help" lists the SDL sound + module as available. + +Upstream-Status: Accepted +[https://github.com/angband/angband/commit/bbfe78654e2f67da264d81d25fe1e6332302e51a] +Signed-off-by: Stefan Strogin +--- + configure.ac | 2 +- + src/sound-core.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 968aaa914..9d0b1e600 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -337,7 +337,7 @@ if test "$enable_sdl2_mixer" = "yes"; then + SDL2_LIBS=`sdl2-config --libs` + LIBS="${LIBS} ${SDL2_LIBS} -lSDL2_mixer" + fi +- MAINFILES="${MAINFILES} \$(SNDSDL2FILES)" ++ MAINFILES="${MAINFILES} \$(SNDSDLFILES)" + fi + fi + +diff --git a/src/sound-core.c b/src/sound-core.c +index 261009429..8b8ef7ffd 100644 +--- a/src/sound-core.c ++++ b/src/sound-core.c +@@ -20,7 +20,7 @@ + #include "sound.h" + #include "main.h" + #include "ui-prefs.h" +-#ifdef SOUND_SDL ++#if defined(SOUND_SDL) || defined(SOUND_SDL2) + #include "snd-sdl.h" + #endif + +@@ -55,7 +55,7 @@ static struct msg_snd_data message_sounds[MSG_MAX]; + */ + static const struct sound_module sound_modules[] = + { +-#ifdef SOUND_SDL ++#if defined(SOUND_SDL) || defined(SOUND_SDL2) + { "sdl", "SDL_mixer sound module", init_sound_sdl }, + #endif /* SOUND_SDL */ + #if (!defined(WIN32_CONSOLE_MODE) && defined(WINDOWS) && !defined(USE_SDL) && !defined(USE_SDL2)) diff --git a/games-roguelike/angband/metadata.xml b/games-roguelike/angband/metadata.xml index a3f5689683f2..3f75f809dba5 100644 --- a/games-roguelike/angband/metadata.xml +++ b/games-roguelike/angband/metadata.xml @@ -10,7 +10,6 @@ Stefan Strogin - Use libsdl2 instead of libsdl Enable and install sounds -- cgit v1.2.3