* [gentoo-commits] repo/gentoo:master commit in: games-arcade/xgalaga/, games-arcade/xgalaga/files/
@ 2021-04-07 9:02 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-04-07 9:02 UTC (permalink / raw
To: gentoo-commits
commit: e73a0e5dcf5f39f0ebc9ff9199d87e1aca5ad43e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 08:36:40 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 09:02:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73a0e5d
games-arcade/xgalaga: port to EAPI 7, games.eclass-, respect AR
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch | 10 +++++
...ga-2.1.1.0.ebuild => xgalaga-2.1.1.0-r1.ebuild} | 45 ++++++++++++++--------
2 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
new file mode 100644
index 00000000000..eedc9b24ce1
--- /dev/null
+++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -14,6 +14,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
++AM_PROG_AR
+
+ AC_ARG_WITH(xpm-lib,[ --with-xpm-lib Directory containing libXpm (may be autodetected)],xpm_lib=$withval)
+ AC_ARG_WITH(sound, [ --with-sound Type of sound to use (native or nas)],sound_type=$withval)
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
similarity index 54%
rename from games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild
rename to games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
index 4d3b86a9756..d644d2087dd 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.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=5
-inherit eutils games
+EAPI=7
+
+inherit autotools desktop
DESCRIPTION="A clone of the classic game Galaga for the X Window System"
HOMEPAGE="https://sourceforge.net/projects/xgalaga"
@@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXmu
@@ -21,34 +21,49 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.1.0-respect-AR.patch
+)
+
src_prepare() {
+ default
+
+ eautoreconf
+
sed -i \
-e "/LEVELDIR\|SOUNDDIR/ s:prefix:datadir/${PN}:" \
-e "/\/scores/ s:prefix:localstatedir/${PN}:" \
- configure \
- || die "sed configure failed"
+ configure || die "sed configure failed"
+
sed -i \
-e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \
-e 's:make ;:$(MAKE) ;:' \
- Makefile.in \
- || die "sed Makefile.in failed"
+ Makefile.in || die "sed Makefile.in failed"
+
+ sed -i \
+ -e 's/AR = ar/AR = @AR@/' \
+ libsprite/Makefile.in || die
}
src_install() {
- dogamesbin xgalaga xgal.sndsrv.oss xgalaga-hyperspace
+ dobin xgalaga xgal.sndsrv.oss xgalaga-hyperspace
dodoc README README.SOUND CHANGES
newman xgalaga.6x xgalaga.6
- insinto "${GAMES_DATADIR}/${PN}/sounds"
+ insinto /usr/share/${PN}/sounds
doins sounds/*.raw
- insinto "${GAMES_DATADIR}/${PN}/levels"
+ insinto /usr/share/${PN}/levels
doins levels/*.xgl
make_desktop_entry ${PN} XGalaga
- dodir "${GAMES_STATEDIR}/${PN}"
- touch "${D}${GAMES_STATEDIR}/${PN}/scores"
- fperms 660 "${GAMES_STATEDIR}/${PN}/scores"
- prepgamesdirs
+ dodir /var/games/${PN}
+ touch "${ED}"/var/games/${PN}/scores || die
+
+ fperms -R 660 /var/games/${PN}
+ fowners -R root:gamestat /var/games/${PN}
+ fperms g+s /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace}
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/xgalaga/, games-arcade/xgalaga/files/
@ 2021-08-04 11:59 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2021-08-04 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 28e0619ae605eb068871d93776fb915ff1cd44c6
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 4 11:56:23 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 11:59:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28e0619a
games-arcade/xgalaga: fix AR support patch
AM_PROG_AR should be used only in build systems that use automake.
For those that don't `AC_CHECK_TOOL` is usually good enough.
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/806382
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch | 14 +++++++++++++-
games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild | 4 ----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
index eedc9b24ce1..4d7547658bd 100644
--- a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
+++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
@@ -1,10 +1,22 @@
+Allow user to specify AR. Derive ar from --host=.
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_RANLIB
-+AM_PROG_AR
++AC_CHECK_TOOL(AR, ar)
AC_ARG_WITH(xpm-lib,[ --with-xpm-lib Directory containing libXpm (may be autodetected)],xpm_lib=$withval)
AC_ARG_WITH(sound, [ --with-sound Type of sound to use (native or nas)],sound_type=$withval)
+--- a/libsprite/Makefile.in
++++ b/libsprite/Makefile.in
+@@ -8,7 +8,7 @@ VPATH = @srcdir@
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+
+-AR = ar
++AR = @AR@
+ AR_FLAGS = rc
+ RANLIB = @RANLIB@
+
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
index d644d2087dd..45c550a058b 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
@@ -41,10 +41,6 @@ src_prepare() {
-e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \
-e 's:make ;:$(MAKE) ;:' \
Makefile.in || die "sed Makefile.in failed"
-
- sed -i \
- -e 's/AR = ar/AR = @AR@/' \
- libsprite/Makefile.in || die
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/xgalaga/, games-arcade/xgalaga/files/
@ 2023-04-23 7:47 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-04-23 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 429f3311a0dc776e0e4da58463487b0e5038a9c1
Author: Anna (navi) Figueiredo Gomes <navi <AT> vlhl <DOT> dev>
AuthorDate: Sat Apr 22 17:00:25 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 07:47:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429f3311
games-arcade/xgalaga: Add patch to fix Wimplicit-int
Closes: https://bugs.gentoo.org/877287
Signed-off-by: Anna (navi) Figueiredo Gomes <navi <AT> vlhl.dev>
Closes: https://github.com/gentoo/gentoo/pull/30705
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/xgalaga-2.1.1.0-function-and-ints.patch | 24 ++++++++++++++++++++++
...2.1.1.0-r1.ebuild => xgalaga-2.1.1.0-r2.ebuild} | 3 ++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch
new file mode 100644
index 000000000000..349f01216f35
--- /dev/null
+++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch
@@ -0,0 +1,24 @@
+Bug: https://bugs.gentoo.org/877287
+--- a/title.c
++++ b/title.c
+@@ -5,6 +5,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
+@@ -17,9 +18,9 @@
+ #include "proto.h"
+
+ /* for scrolling credits */
+-const LINESIZE= 70;
+-const VISIBLELINES=7;
+-const SPEEDFACTOR=5;
++const int LINESIZE=70;
++const int VISIBLELINES=7;
++const int SPEEDFACTOR=5;
+ char *gchLBuf;
+ int giCreditLines=0, giActCreditLine=0;
+
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild
similarity index 94%
rename from games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
rename to games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild
index 1b87b13d58d9..a8367332b7e3 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,6 +25,7 @@ RDEPEND+=" acct-group/gamestat"
PATCHES=(
"${FILESDIR}"/${PN}-2.1.1.0-respect-AR.patch
+ "${FILESDIR}"/${PN}-2.1.1.0-function-and-ints.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/xgalaga/, games-arcade/xgalaga/files/
@ 2025-10-12 7:08 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-10-12 7:08 UTC (permalink / raw
To: gentoo-commits
commit: 7821e90fb49645eeab586fb06534c96088bb382b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 12 07:07:53 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 07:07:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7821e90f
games-arcade/xgalaga: update EAPI 7 -> 8, C23 fix, -Wreturn-type fix
Thanks to Erik Zeek for the C23 fix.
Closes: https://bugs.gentoo.org/943793
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../xgalaga/files/xgalaga-2.1.1.0-c23.patch | 24 ++++++++
.../files/xgalaga-2.1.1.0-return-type.patch | 23 +++++++
games-arcade/xgalaga/xgalaga-2.1.1.0-r3.ebuild | 71 ++++++++++++++++++++++
3 files changed, 118 insertions(+)
diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-c23.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-c23.patch
new file mode 100644
index 000000000000..d0a10e983984
--- /dev/null
+++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-c23.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/943793
+--- a/libsprite/data.c
++++ b/libsprite/data.c
+@@ -79,9 +79,6 @@ W_Font W_HighlightFont = (W_Font) & two, W_UnderlineFont = (W_Font) & three;
+ W_Color W_White = WHITE, W_Black = BLACK, W_Red = RED, W_Green = GREEN;
+ W_Color W_Yellow = YELLOW, W_Cyan = CYAN, W_Grey = LIGHT_GREY, W_DarkGrey = DARK_GREY;
+ int W_Textwidth, W_Textheight, W_BigTextwidth, W_BigTextheight;
+-#ifndef strdup
+-char *strdup();
+-#endif
+ int W_in_message = 0; /* jfy -- for Jerry's warp message hack */
+
+ #ifdef RJC
+--- a/xgal.sndsrv.linux.c
++++ b/xgal.sndsrv.linux.c
+@@ -49,7 +49,7 @@ int fragsize;
+
+
+ /* Terminate: Signal Handler */
+-void quit ()
++void quit (int n)
+ {
+ exit (0);
+ }
diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-return-type.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-return-type.patch
new file mode 100644
index 000000000000..2e379ee3cd74
--- /dev/null
+++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-return-type.patch
@@ -0,0 +1,23 @@
+--- a/title.c
++++ b/title.c
+@@ -108,7 +108,7 @@ static void show_help()
+ top+150, W_Cyan);
+ }
+
+-int read_credits()
++void read_credits()
+ {
+ int hsf;
+ int i,j,l,lines;
+@@ -117,9 +117,9 @@ int read_credits()
+
+ j = 0; lines = 0;
+ chFBuf = (char *) malloc (8000+1);
+- if (chFBuf == 0) return (-1);
++ if (chFBuf == 0) return;
+ gchLBuf = (char *) malloc (LINESIZE+1);
+- if (gchLBuf == 0) return (-2);
++ if (gchLBuf == 0) return;
+ hsf = open (CREDITSFILE, O_RDONLY);
+ if ( hsf > 0 )
+ {
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r3.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r3.ebuild
new file mode 100644
index 000000000000..a463f80abd32
--- /dev/null
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="Clone of the classic game Galaga for the X Window System"
+HOMEPAGE="https://sourceforge.net/projects/xgalaga"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXext
+ x11-libs/libXt
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.1.0-respect-AR.patch
+ "${FILESDIR}"/${PN}-2.1.1.0-function-and-ints.patch
+ "${FILESDIR}"/${PN}-2.1.1.0-c23.patch
+ "${FILESDIR}"/${PN}-2.1.1.0-return-type.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ sed -i \
+ -e "/LEVELDIR\|SOUNDDIR/ s:prefix:datadir/${PN}:" \
+ -e "/\/scores/ s:prefix:localstatedir/${PN}:" \
+ configure || die "sed configure failed"
+
+ sed -i \
+ -e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \
+ -e 's:make ;:$(MAKE) ;:' \
+ Makefile.in || die "sed Makefile.in failed"
+}
+
+src_install() {
+ dobin xgalaga xgal.sndsrv.oss xgalaga-hyperspace
+ dodoc README README.SOUND CHANGES
+ newman xgalaga.6x xgalaga.6
+
+ insinto /usr/share/${PN}/sounds
+ doins sounds/*.raw
+
+ insinto /usr/share/${PN}/levels
+ doins levels/*.xgl
+
+ make_desktop_entry ${PN} XGalaga
+
+ dodir /var/games/${PN}
+ touch "${ED}"/var/games/${PN}/scores || die
+
+ fperms -R 660 /var/games/${PN}
+ fowners -R root:gamestat /var/games/${PN} /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace}
+ fperms g+s /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace}
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-10-12 7:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-07 9:02 [gentoo-commits] repo/gentoo:master commit in: games-arcade/xgalaga/, games-arcade/xgalaga/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-08-04 11:59 Sergei Trofimovich
2023-04-23 7:47 Sam James
2025-10-12 7:08 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox