1 |
commit: 8183d70cf4dd71abbeb29df5cb113a67d5c43a5f |
2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 4 09:29:02 2021 +0000 |
4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 4 09:29:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8183d70c |
7 |
|
8 |
games-roguelike/angband: upgrade 4.2.1 -> 4.2.2 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
12 |
|
13 |
games-roguelike/angband/Manifest | 4 +- |
14 |
...ngband-4.2.1-r1.ebuild => angband-4.2.2.ebuild} | 8 +--- |
15 |
.../angband/files/angband-4.2.1-sdl2-sound.patch | 50 ---------------------- |
16 |
3 files changed, 4 insertions(+), 58 deletions(-) |
17 |
|
18 |
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest |
19 |
index 6964bef4177..0b221405b67 100644 |
20 |
--- a/games-roguelike/angband/Manifest |
21 |
+++ b/games-roguelike/angband/Manifest |
22 |
@@ -1,2 +1,2 @@ |
23 |
-DIST angband-4.2.1-man.tar.gz 104660 BLAKE2B ac7a413b1ec29cb3740fb1e57c238a5f87b9bc6965c4180a62e4089eb4b2cf7fa8f4eb2017d605255eacbb2856e64449745144ce0d9848a3b5cfd123fa1e39da SHA512 2dd9e40e6bd4804162fb810d40a81932c65d01b8c8f019e73194f83b222e3ae319fe4b22ad8f59f88cb473426ad59efd4988d0bfaf289726453fa83d678e9ae8 |
24 |
-DIST angband-4.2.1.tar.gz 24938593 BLAKE2B ecacf4bd3681f205a3eb0a5b5ddf0fb7ff92600c26dffec3fc8addaccf7da26fd4f805e5fc11803c165c35e8adff9ae6bced08381ddde0e39bc914fac043e11c SHA512 e13681bcd74fa56fe5c606d62f1e9761c9fc5367194e0e46894a5ebf108e1553a1f96191e139f1574238b72c635436c3108c80bc656aba8e328fe4e5b301c6bc |
25 |
+DIST angband-4.2.2-man.tar.gz 105892 BLAKE2B 226210bd45f463e2b6bc099f889393832b5ce9bf5f95b5de1bc38fbcef61287515435ceef83a717bd62220fe01d5acf33e3fe240c08e3cf7d04e9d59fee132f1 SHA512 f373ea55c5f2349c615c47207c1dbbcc6a77246fbb0615d00a1fcb2a2a0cdf839bb5d57c2e29a2f2698f2d6b72698fbaec6bb221994566be04046ce03ea6253a |
26 |
+DIST angband-4.2.2.tar.gz 24992436 BLAKE2B 6beab7d0481167538714f540e9825e930d57457c923b77e2a9be71e8a6e382b70f375e85e68f0ebf9a65b61b835d62df0a5958a21198d9049088cdbe32c81efc SHA512 07a9b6a10a47afafde8f5db1e463c70198d386e07737666e044de291eab4b425d76bc8124153b7c371248f0c9aedc01578a90e513d744e3f30d26ab22c940698 |
27 |
|
28 |
diff --git a/games-roguelike/angband/angband-4.2.1-r1.ebuild b/games-roguelike/angband/angband-4.2.2.ebuild |
29 |
similarity index 92% |
30 |
rename from games-roguelike/angband/angband-4.2.1-r1.ebuild |
31 |
rename to games-roguelike/angband/angband-4.2.2.ebuild |
32 |
index 5261fcba166..e4bebd7a381 100644 |
33 |
--- a/games-roguelike/angband/angband-4.2.1-r1.ebuild |
34 |
+++ b/games-roguelike/angband/angband-4.2.2.ebuild |
35 |
@@ -1,15 +1,13 @@ |
36 |
-# Copyright 1999-2020 Gentoo Authors |
37 |
+# Copyright 1999-2021 Gentoo Authors |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
EAPI=7 |
41 |
|
42 |
inherit autotools desktop xdg-utils |
43 |
|
44 |
-MAJOR_PV=$(ver_cut 1-2) |
45 |
- |
46 |
DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien" |
47 |
HOMEPAGE="https://rephial.org/" |
48 |
-SRC_URI="https://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz |
49 |
+SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz |
50 |
https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz" |
51 |
|
52 |
LICENSE="GPL-2" |
53 |
@@ -37,8 +35,6 @@ RDEPEND="X? ( |
54 |
DEPEND="${RDEPEND}" |
55 |
BDEPEND="virtual/pkgconfig" |
56 |
|
57 |
-PATCHES=( "${FILESDIR}/${P}-sdl2-sound.patch" ) |
58 |
- |
59 |
src_prepare() { |
60 |
default |
61 |
|
62 |
|
63 |
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 |
64 |
deleted file mode 100644 |
65 |
index accbc835557..00000000000 |
66 |
--- a/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch |
67 |
+++ /dev/null |
68 |
@@ -1,50 +0,0 @@ |
69 |
-From bbfe78654e2f67da264d81d25fe1e6332302e51a Mon Sep 17 00:00:00 2001 |
70 |
-From: Eric Branlund <ebranlund@××××××××.com> |
71 |
-Date: Sat, 11 Jul 2020 11:07:24 -0700 |
72 |
-Subject: [PATCH] Adjusted so "./configure --enable-sdl2-mixer" and then |
73 |
- compiling generates an executable where "angband --help" lists the SDL sound |
74 |
- module as available. |
75 |
- |
76 |
-Upstream-Status: Accepted |
77 |
-[https://github.com/angband/angband/commit/bbfe78654e2f67da264d81d25fe1e6332302e51a] |
78 |
-Signed-off-by: Stefan Strogin <steils@g.o> |
79 |
---- |
80 |
- configure.ac | 2 +- |
81 |
- src/sound-core.c | 4 ++-- |
82 |
- 2 files changed, 3 insertions(+), 3 deletions(-) |
83 |
- |
84 |
-diff --git a/configure.ac b/configure.ac |
85 |
-index 968aaa914..9d0b1e600 100644 |
86 |
---- a/configure.ac |
87 |
-+++ b/configure.ac |
88 |
-@@ -337,7 +337,7 @@ if test "$enable_sdl2_mixer" = "yes"; then |
89 |
- SDL2_LIBS=`sdl2-config --libs` |
90 |
- LIBS="${LIBS} ${SDL2_LIBS} -lSDL2_mixer" |
91 |
- fi |
92 |
-- MAINFILES="${MAINFILES} \$(SNDSDL2FILES)" |
93 |
-+ MAINFILES="${MAINFILES} \$(SNDSDLFILES)" |
94 |
- fi |
95 |
- fi |
96 |
- |
97 |
-diff --git a/src/sound-core.c b/src/sound-core.c |
98 |
-index 261009429..8b8ef7ffd 100644 |
99 |
---- a/src/sound-core.c |
100 |
-+++ b/src/sound-core.c |
101 |
-@@ -20,7 +20,7 @@ |
102 |
- #include "sound.h" |
103 |
- #include "main.h" |
104 |
- #include "ui-prefs.h" |
105 |
--#ifdef SOUND_SDL |
106 |
-+#if defined(SOUND_SDL) || defined(SOUND_SDL2) |
107 |
- #include "snd-sdl.h" |
108 |
- #endif |
109 |
- |
110 |
-@@ -55,7 +55,7 @@ static struct msg_snd_data message_sounds[MSG_MAX]; |
111 |
- */ |
112 |
- static const struct sound_module sound_modules[] = |
113 |
- { |
114 |
--#ifdef SOUND_SDL |
115 |
-+#if defined(SOUND_SDL) || defined(SOUND_SDL2) |
116 |
- { "sdl", "SDL_mixer sound module", init_sound_sdl }, |
117 |
- #endif /* SOUND_SDL */ |
118 |
- #if (!defined(WIN32_CONSOLE_MODE) && defined(WINDOWS) && !defined(USE_SDL) && !defined(USE_SDL2)) |