public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/, games-roguelike/angband/files/
@ 2017-09-09 20:41 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2017-09-09 20:41 UTC (permalink / raw
  To: gentoo-commits

commit:     b2832338426a96d988945b1b8e3af751ff27ba26
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  9 20:41:13 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 20:41:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2832338

games-roguelike/angband: fix build on pie gcc, bug #617982

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/617982
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-roguelike/angband/angband-4.0.5-r1.ebuild           |  4 +++-
 games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.0.5-r1.ebuild b/games-roguelike/angband/angband-4.0.5-r1.ebuild
index 473728f8c4a..48866f76317 100644
--- a/games-roguelike/angband/angband-4.0.5-r1.ebuild
+++ b/games-roguelike/angband/angband-4.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 	dev-python/docutils
 	virtual/pkgconfig"
 
+PATCHES=("${FILESDIR}"/${P}-pie-gcc.patch)
+
 src_prepare() {
 	default
 

diff --git a/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch b/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch
new file mode 100644
index 00000000000..b4f3c5707d4
--- /dev/null
+++ b/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch
@@ -0,0 +1,13 @@
+Allow gcc to construct correct partial linking command to ld.
+Otherwise ld gets an incompatible mix of '-pie -r'.
+
+https://bugs.gentoo.org/617982
+diff --git a/src/Makefile b/src/Makefile
+index 79be4cc..d27bb91 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -33,3 +33,3 @@ win/$(PROGNAME).res: win/$(PROGNAME).rc
+ $(PROGNAME).o: $(OBJECTS)
+-	$(LD) -nostdlib -Wl,-r -o $@ $(OBJECTS)
++	$(LD) -nostdlib -r -o $@ $(OBJECTS)
+ 	@printf "%10s %-20s\n" LINK $@


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/, games-roguelike/angband/files/
@ 2019-03-09 22:35 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2019-03-09 22:35 UTC (permalink / raw
  To: gentoo-commits

commit:     89c0db210e7ecc771db7e4161cccfc9b47f6de6e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  9 22:34:32 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Mar  9 22:34:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c0db21

games-roguelike/angband: Drop old 4.0.5

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-roguelike/angband/Manifest                   |   1 -
 games-roguelike/angband/angband-4.0.5-r1.ebuild    | 115 ---------------------
 .../angband/files/angband-4.0.5-pie-gcc.patch      |  13 ---
 3 files changed, 129 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 692435871b6..89392c28f50 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1 @@
-DIST angband-4.0.5.tar.gz 19886562 BLAKE2B 3b8410187a66dacc5f2310e116f3abe8ca04e1363701d455df68f3daaf2a23b0ad4811cee2a50129e1f8e096c6ee9e40f8879b25e97510946b4e4ac2a9124631 SHA512 9ad46430d7e3c4b7676042b28107a2a5b9b2ed967dd1f45b91ca37583fa2d5e9ba25d963a6510ee091b8fdb3a704a60002d851d7898a6298567f804dce36a88b
 DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47 SHA512 7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a

diff --git a/games-roguelike/angband/angband-4.0.5-r1.ebuild b/games-roguelike/angband/angband-4.0.5-r1.ebuild
deleted file mode 100644
index d8830482e59..00000000000
--- a/games-roguelike/angband/angband-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils versionator
-
-MAJOR_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
-HOMEPAGE="http://rephial.org/"
-SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses sdl +sound X"
-
-RDEPEND="X? ( x11-libs/libX11 )
-	!ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	sdl? ( media-libs/libsdl[video,X]
-		media-libs/sdl-image
-		media-libs/sdl-ttf
-		sound? ( media-libs/libsdl[sound] )
-			media-libs/sdl-mixer[mp3] )"
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-PATCHES=("${FILESDIR}"/${P}-pie-gcc.patch)
-
-src_prepare() {
-	default
-
-	sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
-	sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
-	sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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
-
-	if use sdl; then
-		myconf="$(use_enable sound sdl-mixer)"
-	else
-		myconf="--disable-sdl-mixer"
-	fi
-
-	ac_cv_path_NCURSES_CONFIG="pkg-config ncursesw" \
-	econf \
-		--bindir="${EPREFIX}"/usr/bin \
-		--with-private-dirs \
-		$(use_enable X x11) \
-		$(use_enable sdl) \
-		$(use_enable ncurses curses) \
-		$(use !sdl && use !ncurses && use !X && \
-			echo --enable-curses) \
-		${myconf}
-}
-
-src_install() {
-	DOCS="changes.txt faq.txt readme.txt thanks.txt" \
-		default
-
-	dodoc doc/manual.html
-	doenvd "${T}"/99${PN}
-
-	if use X || use sdl ; then
-		if use X; then
-			make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}"
-		fi
-
-		if use sdl; then
-			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_preinst() {
-	if use X || use sdl ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "Angband now uses private savefiles instead of system-wide ones."
-	elog "This version of Angband is not compatible with the save files"
-	elog "of previous versions."
-	echo
-
-	if use X || use sdl ; then
-		gnome2_icon_cache_update
-	fi
-}

diff --git a/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch b/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch
deleted file mode 100644
index b4f3c5707d4..00000000000
--- a/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Allow gcc to construct correct partial linking command to ld.
-Otherwise ld gets an incompatible mix of '-pie -r'.
-
-https://bugs.gentoo.org/617982
-diff --git a/src/Makefile b/src/Makefile
-index 79be4cc..d27bb91 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -33,3 +33,3 @@ win/$(PROGNAME).res: win/$(PROGNAME).rc
- $(PROGNAME).o: $(OBJECTS)
--	$(LD) -nostdlib -Wl,-r -o $@ $(OBJECTS)
-+	$(LD) -nostdlib -r -o $@ $(OBJECTS)
- 	@printf "%10s %-20s\n" LINK $@


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/, games-roguelike/angband/files/
@ 2020-02-29 11:40 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-02-29 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     03c993729b80cc6835e8213ef80265b3b02e5305
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 11:39:27 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 29 11:40:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c99372

games-roguelike/angband: tweak for gcc-10, bug #707770

Closes: https://bugs.gentoo.org/707770
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 games-roguelike/angband/angband-4.2.0.ebuild       |  4 +++-
 .../angband/files/angband-4.2.0-gcc-10.patch       | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.2.0.ebuild b/games-roguelike/angband/angband-4.2.0.ebuild
index acb1f3d093c..f9dfb300662 100644
--- a/games-roguelike/angband/angband-4.2.0.ebuild
+++ b/games-roguelike/angband/angband-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,6 +48,8 @@ RDEPEND="X? (
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
 src_prepare() {
 	default
 

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
new file mode 100644
index 00000000000..6aeb1f7a204
--- /dev/null
+++ b/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch
@@ -0,0 +1,22 @@
+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);


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/, games-roguelike/angband/files/
@ 2020-08-10 22:23 Stefan Strogin
  0 siblings, 0 replies; 6+ messages in thread
From: Stefan Strogin @ 2020-08-10 22:23 UTC (permalink / raw
  To: gentoo-commits

commit:     6052cff30f398cf28089db8988666c6c2a189116
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 22:14:48 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 22:23:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6052cff3

games-roguelike/angband: add patch to fix SDL2 sound

Closes: https://bugs.gentoo.org/728096
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-roguelike/angband/angband-4.2.1-r1.ebuild    | 108 +++++++++++++++++++++
 .../angband/files/angband-4.2.1-sdl2-sound.patch   |  50 ++++++++++
 2 files changed, 158 insertions(+)

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 00000000000..5261fcba166
--- /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.1-sdl2-sound.patch b/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch
new file mode 100644
index 00000000000..accbc835557
--- /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 <ebranlund@fastmail.com>
+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 <steils@gentoo.org>
+---
+ 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)) 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/, games-roguelike/angband/files/
@ 2021-01-05 21:59 Andreas K. Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2021-01-05 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     91cc87dd2f35e5ca1c8d9959bf0e26621e6a16d4
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 21:30:41 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 21:58:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91cc87dd

games-roguelike/angband: Remove old

Bug: https://bugs.gentoo.org/707770
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>

 games-roguelike/angband/Manifest                   |   1 -
 games-roguelike/angband/angband-4.1.3.ebuild       | 104 ---------------------
 .../angband/files/angband-4.1.3-tinfo.patch        |  29 ------
 3 files changed, 134 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 17c6cad788a..6964bef4177 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,3 +1,2 @@
-DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47 SHA512 7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a
 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

diff --git a/games-roguelike/angband/angband-4.1.3.ebuild b/games-roguelike/angband/angband-4.1.3.ebuild
deleted file mode 100644
index 29f6be451fb..00000000000
--- a/games-roguelike/angband/angband-4.1.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 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 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/libsdl[video,X]
-		media-libs/sdl-image
-		media-libs/sdl-ttf
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[mp3]
-		)
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/docutils
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
-
-src_prepare() {
-	default
-
-	sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
-	sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
-	sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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 sdl)
-		$(use_enable sound sdl-mixer)
-		$(use_enable ncurses curses)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	dodoc changes.txt faq.txt readme.txt thanks.txt doc/manual.html
-	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 -msdl" "Angband (SDL)" "${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.1.3-tinfo.patch b/games-roguelike/angband/files/angband-4.1.3-tinfo.patch
deleted file mode 100644
index 8a1f487e6f6..00000000000
--- a/games-roguelike/angband/files/angband-4.1.3-tinfo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From de53f9644323af0ff084bc82ef17b26aa6db250e Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Thu, 4 Apr 2019 04:24:49 +0300
-Subject: [PATCH] Link against tinfow or tinfo if needed
-
-It is needed on systems where libtinfo is separate from libncurses.
-See: https://bugs.gentoo.org/679942
-
-Upstream-Status: Submitted [https://github.com/angband/angband/pull/522]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 4a671f33..04fa8cae 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -244,6 +244,7 @@ if test "$enable_curses" = "yes"; then
- 			LIBS="${LIBS} -lncursesw"
- 			MAINFILES="${MAINFILES} \$(GCUMAINFILES)"
- 		])
-+		AC_SEARCH_LIBS([keypad], [tinfow tinfo])
- 	fi
- fi
- 
--- 
-2.21.0
-


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/, games-roguelike/angband/files/
@ 2021-07-04  9:30 Stefan Strogin
  0 siblings, 0 replies; 6+ messages in thread
From: Stefan Strogin @ 2021-07-04  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     8183d70cf4dd71abbeb29df5cb113a67d5c43a5f
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  4 09:29:02 2021 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 09:29:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8183d70c

games-roguelike/angband: upgrade 4.2.1 -> 4.2.2

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-roguelike/angband/Manifest                   |  4 +-
 ...ngband-4.2.1-r1.ebuild => angband-4.2.2.ebuild} |  8 +---
 .../angband/files/angband-4.2.1-sdl2-sound.patch   | 50 ----------------------
 3 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 6964bef4177..0b221405b67 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1,2 @@
-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
+DIST angband-4.2.2-man.tar.gz 105892 BLAKE2B 226210bd45f463e2b6bc099f889393832b5ce9bf5f95b5de1bc38fbcef61287515435ceef83a717bd62220fe01d5acf33e3fe240c08e3cf7d04e9d59fee132f1 SHA512 f373ea55c5f2349c615c47207c1dbbcc6a77246fbb0615d00a1fcb2a2a0cdf839bb5d57c2e29a2f2698f2d6b72698fbaec6bb221994566be04046ce03ea6253a
+DIST angband-4.2.2.tar.gz 24992436 BLAKE2B 6beab7d0481167538714f540e9825e930d57457c923b77e2a9be71e8a6e382b70f375e85e68f0ebf9a65b61b835d62df0a5958a21198d9049088cdbe32c81efc SHA512 07a9b6a10a47afafde8f5db1e463c70198d386e07737666e044de291eab4b425d76bc8124153b7c371248f0c9aedc01578a90e513d744e3f30d26ab22c940698

diff --git a/games-roguelike/angband/angband-4.2.1-r1.ebuild b/games-roguelike/angband/angband-4.2.2.ebuild
similarity index 92%
rename from games-roguelike/angband/angband-4.2.1-r1.ebuild
rename to games-roguelike/angband/angband-4.2.2.ebuild
index 5261fcba166..e4bebd7a381 100644
--- a/games-roguelike/angband/angband-4.2.1-r1.ebuild
+++ b/games-roguelike/angband/angband-4.2.2.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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
+SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz"
 
 LICENSE="GPL-2"
@@ -37,8 +35,6 @@ RDEPEND="X? (
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-sdl2-sound.patch" )
-
 src_prepare() {
 	default
 

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
deleted file mode 100644
index accbc835557..00000000000
--- a/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bbfe78654e2f67da264d81d25fe1e6332302e51a Mon Sep 17 00:00:00 2001
-From: Eric Branlund <ebranlund@fastmail.com>
-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 <steils@gentoo.org>
----
- 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)) 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-07-04  9:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-05 21:59 [gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/, games-roguelike/angband/files/ Andreas K. Hüttel
  -- strict thread matches above, loose matches on Subject: below --
2021-07-04  9:30 Stefan Strogin
2020-08-10 22:23 Stefan Strogin
2020-02-29 11:40 Sergei Trofimovich
2019-03-09 22:35 James Le Cuirot
2017-09-09 20:41 Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox