pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/xgalaga
Module Name: pkgsrc
Committed By: nia
Date: Fri Nov 20 13:50:24 UTC 2020
Modified Files:
pkgsrc/games/xgalaga: Makefile PLIST distinfo
Added Files:
pkgsrc/games/xgalaga/patches: patch-Makefile.in patch-configure
patch-main.c patch-title.c
Removed Files:
pkgsrc/games/xgalaga/patches: patch-aa patch-ab patch-ac patch-ad
patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak
Log Message:
xgalaga: Update to 2.1.1.0
Version 2.1.01.0 (HR 2008/03/05)
- Updated configure.in and Makefile.in for building an new configure
script and Makefile with BSD support (autoconf -o configure configure.in).
The goal is to build on supported platforms 'out of the box'. If there
is anything to do, please let me know at
tshe_hermann remove_this at web dot de
- Added scrolling credits in the title screen. Therefore increased
the third paragraph of the version number.
Version 2.1.00.2 (HR 2008/02/11)
- Changed numbering scheme to a dotted style to become better compatibility
with distro's numbering scheme.
- Fixed broken sound. xgal.sndsrv.linux opens /dev/dsp now with O_WRONLY.
This makes simultaneously playing oggs working.
- Added man page (content and build handling). Added <s> and <Q> key.
Version 2.1.00-1 (HR 2008/02/07)
- added ifdefs in score.c for compiling with no sound support
- added file mkinstalldirs. Needed by make install
Version 2.1.00-0 (HR 2008/02/06)
- This release is mainly a bugfix relase. Some of them are years old.
See hints below.
- added the xgalaga_2.0.34-44.diff from debian. Thanks to Joey Hess for
collecting all these stuff over the years.
Main changes are: compiling xgalaga-hyperspace, full screen mode, security
fixes for HOME-Variable and global score file, joystick support,
improvements of sound server, new weapons machine gun and spread shot, ....
- Bugs as reported at sourceforge Request ID 1394882 "make error on fc4 64-bit"
and 1167157 "make error on FC3" are supposed to be fixed. Changed the order
of header files in several .c files. I have no 64 bit system to test this,
but I got the same error on ubuntu 7.10
- Debian bug report #149743: "xgalaga starts when i want to turn sounds off" is
fixed. In fact, it started on any key except <q> or <Q>. Now starts only on
the keys <k> and <m> as stated in the last line on the title screen.
Turning sound off works during the game and at the title screen. For clarity
there is now a 'Q' (=quiet) right from the level, which appears, when sound
is switched off.
- Debian bug report #60266: "Too slow when sounds are not available" is
probably fixed. I could not exactly reproduce the bug. On my box, xgalaga
crashes totally. Maybe it depends on the sound system. I added the evaluation
of the returncode on writing to /dev/dsp. The crash was gone away.
- Debian bug report #399987 "xgalaga -level accepts ""impossible to loose""
levels" is partially fixed. The -level parameter value is cut to 15. Higher
levels are still avalable by playing (good luck).
- Added a couple of additional key codes. The <p> (pause) and <s> (toggle
sound) did not work, because they produce key codes increased with 256.
Editing the high score name also didn't work on the same reason.
- Added bugfix for "[1837041] Fix seg fault" as reported on sourceforge
- Changed order of libs in configure.in. This (and some other improvements)
makes xgalaga compile under Cygwin/X
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/games/xgalaga/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/xgalaga/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/xgalaga/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/xgalaga/patches/patch-Makefile.in \
pkgsrc/games/xgalaga/patches/patch-configure \
pkgsrc/games/xgalaga/patches/patch-main.c \
pkgsrc/games/xgalaga/patches/patch-title.c
cvs rdiff -u -r1.7 -r0 pkgsrc/games/xgalaga/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/games/xgalaga/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/games/xgalaga/patches/patch-ac \
pkgsrc/games/xgalaga/patches/patch-ad \
pkgsrc/games/xgalaga/patches/patch-ae \
pkgsrc/games/xgalaga/patches/patch-af \
pkgsrc/games/xgalaga/patches/patch-ag \
pkgsrc/games/xgalaga/patches/patch-ah \
pkgsrc/games/xgalaga/patches/patch-ai \
pkgsrc/games/xgalaga/patches/patch-aj \
pkgsrc/games/xgalaga/patches/patch-ak
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/xgalaga/Makefile
diff -u pkgsrc/games/xgalaga/Makefile:1.36 pkgsrc/games/xgalaga/Makefile:1.37
--- pkgsrc/games/xgalaga/Makefile:1.36 Sun Jan 14 15:26:49 2018
+++ pkgsrc/games/xgalaga/Makefile Fri Nov 20 13:50:23 2020
@@ -1,21 +1,17 @@
-# $NetBSD: Makefile,v 1.36 2018/01/14 15:26:49 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2020/11/20 13:50:23 nia Exp $
-DISTNAME= xgalaga-2.0.34
-PKGREVISION= 4
+DISTNAME= xgalaga-2.1.1.0
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xgalaga/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://sourceforge.net/projects/xgalaga/
COMMENT= Very fast true-to-the-original port of galaga for X11
+LICENSE= gnu-gpl-v2
-NO_SRC_ON_FTP= "already in MASTER_SITE_LOCAL"
-
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
-GNU_CONFIGURE_PREFIX= ${PREFIX}/share/xgalaga
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/bin
-SETGIDGAME= yes
-MAKE_ENV+= GAMEOWN=${GAMEOWN:Q} GAMEGRP=${GAMEGRP:Q} \
- GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE}
.include "../../mk/bsd.prefs.mk"
@@ -24,10 +20,12 @@ CONFIGURE_ARGS+= --x-includes=${PREFIX}/
CONFIGURE_ARGS+= --x-libraries=${PREFIX}/lib
.endif
-INSTALLATION_DIRS= libexec
+INSTALLATION_DIRS+= libexec
+INSTALLATION_DIRS+= share/xgalaga
+INSTALLATION_DIRS+= ${PKGMANDIR}/man6
post-install:
- ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/xgalaga/README
+ ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xgalaga/README
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
Index: pkgsrc/games/xgalaga/PLIST
diff -u pkgsrc/games/xgalaga/PLIST:1.5 pkgsrc/games/xgalaga/PLIST:1.6
--- pkgsrc/games/xgalaga/PLIST:1.5 Mon Jan 1 22:29:35 2018
+++ pkgsrc/games/xgalaga/PLIST Fri Nov 20 13:50:23 2020
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2018/01/01 22:29:35 rillig Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/11/20 13:50:23 nia Exp $
bin/xgalaga
-libexec/xgalaga.sndsrv
-share/xgalaga/README
+bin/xgalaga-hyperspace
+libexec/xgal.sndsrv
+man/man6/xgalaga.6x
+share/doc/xgalaga/CREDITS
+share/doc/xgalaga/README
share/xgalaga/levels/level1.xgl
share/xgalaga/levels/level10.xgl
share/xgalaga/levels/level11.xgl
@@ -17,7 +20,6 @@ share/xgalaga/levels/level6.xgl
share/xgalaga/levels/level7.xgl
share/xgalaga/levels/level8.xgl
share/xgalaga/levels/level9.xgl
-share/xgalaga/scores
share/xgalaga/sounds/ddloo.raw
share/xgalaga/sounds/explode.raw
share/xgalaga/sounds/explode_big.raw
@@ -26,4 +28,3 @@ share/xgalaga/sounds/shield.raw
share/xgalaga/sounds/smart.raw
share/xgalaga/sounds/torphit.raw
share/xgalaga/sounds/warp.raw
-@unexec ${RM} -f %D/share/xgalaga/scores
Index: pkgsrc/games/xgalaga/distinfo
diff -u pkgsrc/games/xgalaga/distinfo:1.13 pkgsrc/games/xgalaga/distinfo:1.14
--- pkgsrc/games/xgalaga/distinfo:1.13 Thu Mar 23 17:06:52 2017
+++ pkgsrc/games/xgalaga/distinfo Fri Nov 20 13:50:23 2020
@@ -1,17 +1,10 @@
-$NetBSD: distinfo,v 1.13 2017/03/23 17:06:52 joerg Exp $
+$NetBSD: distinfo,v 1.14 2020/11/20 13:50:23 nia Exp $
-SHA1 (xgalaga-2.0.34.tar.gz) = 82dcb328af0d9e779c566f4225d7f072b1c17b7d
-RMD160 (xgalaga-2.0.34.tar.gz) = bf2cc91820c1cdb8e02bd35347b309cac27b3ba4
-SHA512 (xgalaga-2.0.34.tar.gz) = 90cdc8a911e7de1d15af65ab100273d39c26a15761e7c3bc977eb3d55920f1a5b962a69d0a494d5c29ea28b724f8c69856955431de420f205fc638e88c3d62b0
-Size (xgalaga-2.0.34.tar.gz) = 314189 bytes
-SHA1 (patch-aa) = 63dc49d79e33ba4eaf596e600cdfaa1d00d70bce
-SHA1 (patch-ab) = 97bd43c07f76278245730bbc9724497ab87e552d
-SHA1 (patch-ac) = ca85bafaa637fc03d1c53a527c7804a95c146fe3
-SHA1 (patch-ad) = 22b946b261c4d0969e48bf5de1ba0d55c3649bb8
-SHA1 (patch-ae) = 2e9f31a279aa5ecd14a0843dc18d151e7990aed0
-SHA1 (patch-af) = 83856e8718bcbe6f40b4c156199c4db56cdf8777
-SHA1 (patch-ag) = 0e4270a29bac33ae21e5a837feb7fe87fa650173
-SHA1 (patch-ah) = 88bb0385cc1091eae83475fa26296419095f10a6
-SHA1 (patch-ai) = 21dc08a4d6d04fca2a374034b79de8ab9c953793
-SHA1 (patch-aj) = d1577211627e280aef977ff7c1cf2b48c02f1c3f
-SHA1 (patch-ak) = ef0077094fb3814c0b83f8dd274dc620e8e34f61
+SHA1 (xgalaga-2.1.1.0.tar.gz) = ef40ad833d2434b0643d4c00202bd75ec14b94ac
+RMD160 (xgalaga-2.1.1.0.tar.gz) = b55a97187b61ffe7c072ecd784cf9a16fe568c26
+SHA512 (xgalaga-2.1.1.0.tar.gz) = 087db9e0501cedb042bb673a217f9de32640d3e4f4f529a29fd25ed682a1aece9ae1beacdc2ee77fc93ac931411a1051e2cd19873578ccffe5f03a083bffe513
+Size (xgalaga-2.1.1.0.tar.gz) = 331621 bytes
+SHA1 (patch-Makefile.in) = f8eacc067c760dd5071fc9799a4587c6ee2b0a2c
+SHA1 (patch-configure) = 695098c4ea95139496d2dfb76dcf7164943c3f64
+SHA1 (patch-main.c) = a2743012bd84882c728f90990a1ec586273724ba
+SHA1 (patch-title.c) = cd94537f8ebcedf737af4208686f80bb42da00e7
Added files:
Index: pkgsrc/games/xgalaga/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/games/xgalaga/patches/patch-Makefile.in:1.1
--- /dev/null Fri Nov 20 13:50:24 2020
+++ pkgsrc/games/xgalaga/patches/patch-Makefile.in Fri Nov 20 13:50:23 2020
@@ -0,0 +1,61 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/11/20 13:50:23 nia Exp $
+
+Correct installation paths.
+
+--- Makefile.in.orig 2008-03-05 21:58:16.000000000 +0000
++++ Makefile.in
+@@ -11,12 +11,13 @@ VPATH = @srcdir@
+ .SUFFIXES: .c .o
+
+ prefix = @prefix@
++datadir = @datadir@/xgalaga
++docdir = @docdir@/xgalaga
+ exec_prefix = @exec_prefix@
+ bindir = $(exec_prefix)
+ libdir = $(prefix)/lib
+ infodir = $(prefix)/info
+-#mandir = @mandir@
+-mandir = /usr/share/man
++mandir = @mandir@
+ creditsfile = @CREDITSFILE@
+ distversion = 2.1.1.0
+
+@@ -27,11 +28,11 @@ SOUNDSRVDIR = @SOUNDSRVDIR@
+ SOUNDOBJS = xgal.sndsrv.linux.o
+ SOUNDSRCS = xgal.sndsrv.linux.c
+
+-SOUNDDEFS = -DSOUNDSERVER=\"$(prefix)$(SOUNDSRVDIR)/@SOUNDSERVER@\"
++SOUNDDEFS = -DSOUNDSERVER=\"$(prefix)$(SOUNDSRVDIR)/xgal.sndsrv\"
+
+ RM = rm -f
+ CC = @CC@
+-CFLAGS = -I. @CFLAGS@ @DEFS@ @X_CFLAGS@ -DXGALAGADIR=\"@prefix@/\" $(SOUNDDEFS)
++CFLAGS = -I. @CFLAGS@ @DEFS@ @X_CFLAGS@ -DXGALAGADIR=\"@datadir@/xgalaga/levels\" $(SOUNDDEFS)
+ LDFLAGS = @LDFLAGS@
+ LIBS = libsprite/libsprite.a @LIBS@ @X_LIBS@
+ INSTALL = @INSTALL@
+@@ -58,15 +59,16 @@ install: all
+ $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
+ $(INSTALL) $(TARGET2) $(DESTDIR)$(bindir)/$(TARGET2)
+ if test ! "$(SOUNDSRV)" = ""; then \
+- $(INSTALL) $(SOUNDSRV) $(DESTDIR)$(prefix)$(SOUNDSRVDIR)/$(SOUNDSRV); \
++ $(INSTALL) $(SOUNDSRV) $(DESTDIR)$(prefix)$(SOUNDSRVDIR)/xgal.sndsrv; \
+ fi
+- ./mkinstalldirs $(DESTDIR)$(prefix)/sounds
+- ./mkinstalldirs $(DESTDIR)$(prefix)/levels
+- for i in levels/*.xgl; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done
+- for i in sounds/*.raw; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done
+- $(INSTALL) CREDITS $(DESTDIR)$(creditsfile)
+- $(INSTALL) xgalaga.6x.gz $(mandir)/man6/xgalaga.6x.gz
+- chmod 644 $(mandir)/man6/xgalaga.6x.gz
++ ./mkinstalldirs $(DESTDIR)$(datadir)/sounds
++ ./mkinstalldirs $(DESTDIR)$(datadir)/levels
++ for i in levels/*.xgl; do $(INSTALL) $$i $(DESTDIR)$(datadir)/$$i ; done
++ for i in sounds/*.raw; do $(INSTALL) $$i $(DESTDIR)$(datadir)/$$i ; done
++ ./mkinstalldirs $(DESTDIR)$(docdir)
++ $(INSTALL) CREDITS $(DESTDIR)$(docdir)/CREDITS
++ $(INSTALL) xgalaga.6x $(DESTDIR)$(mandir)/man6/xgalaga.6x
++ chmod 644 $(DESTDIR)$(mandir)/man6/xgalaga.6x
+ # touch $(prefix)/scores
+ # chmod 666 $(prefix)/scores
+ # chown ${GAMEOWN}:${GAMEGRP} $(prefix)/scores
Index: pkgsrc/games/xgalaga/patches/patch-configure
diff -u /dev/null pkgsrc/games/xgalaga/patches/patch-configure:1.1
--- /dev/null Fri Nov 20 13:50:24 2020
+++ pkgsrc/games/xgalaga/patches/patch-configure Fri Nov 20 13:50:23 2020
@@ -0,0 +1,28 @@
+$NetBSD: patch-configure,v 1.1 2020/11/20 13:50:23 nia Exp $
+
+Correct installation paths.
+
+--- configure.orig 2008-03-05 21:58:16.000000000 +0000
++++ configure
+@@ -4664,10 +4664,10 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+-#define SOUNDDIR "$prefix/sounds/"
++#define SOUNDDIR "$prefix/share/xgalaga/sounds/"
+ _ACEOF
+
+-CREDITSFILE="$prefix/CREDITS"
++CREDITSFILE="$prefix/share/doc/xgalaga/CREDITS"
+ cat >>confdefs.h <<_ACEOF
+ #define CREDITSFILE "$CREDITSFILE"
+ _ACEOF
+@@ -4677,7 +4677,7 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+-#define LEVELDIR "$prefix/levels/"
++#define LEVELDIR "$prefix/share/xgalaga/levels/"
+ _ACEOF
+
+
Index: pkgsrc/games/xgalaga/patches/patch-main.c
diff -u /dev/null pkgsrc/games/xgalaga/patches/patch-main.c:1.1
--- /dev/null Fri Nov 20 13:50:24 2020
+++ pkgsrc/games/xgalaga/patches/patch-main.c Fri Nov 20 13:50:23 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-main.c,v 1.1 2020/11/20 13:50:23 nia Exp $
+
+Don't start fullscreen, appears to be buggy...
+
+--- main.c.orig 2008-03-05 21:58:16.000000000 +0000
++++ main.c
+@@ -1277,7 +1277,7 @@ char **argv;
+ int ac;
+ char *dpyname = 0;
+ int mx, my, but;
+- int start_fullscreen = 1;
++ int start_fullscreen = 0;
+
+ for(ac = 1; ac < argc; ac++) {
+ if(*argv[ac] == '-') {
Index: pkgsrc/games/xgalaga/patches/patch-title.c
diff -u /dev/null pkgsrc/games/xgalaga/patches/patch-title.c:1.1
--- /dev/null Fri Nov 20 13:50:24 2020
+++ pkgsrc/games/xgalaga/patches/patch-title.c Fri Nov 20 13:50:23 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-title.c,v 1.1 2020/11/20 13:50:23 nia Exp $
+
+Include unistd.h for close().
+
+--- title.c.orig 2008-03-05 21:58:16.000000000 +0000
++++ title.c
+@@ -5,6 +5,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
Home |
Main Index |
Thread Index |
Old Index