maintenance update to 2.10.2 (which is also pretty old), 2.10.0 was

having issues (it segfaults when you try to create a network game, etc.)

ok naddy@
This commit is contained in:
aanriot 2007-08-08 14:59:47 +00:00
parent 1009d1428f
commit 3e784d05cd
5 changed files with 95 additions and 43 deletions

View File

@ -1,9 +1,15 @@
# $OpenBSD: Makefile,v 1.20 2005/07/17 18:51:53 aanriot Exp $
# $OpenBSD: Makefile,v 1.21 2007/08/08 14:59:47 aanriot Exp $
COMMENT= "graphical multi-player real-time strategy game for X11"
COMMENT= graphical multi-player real-time strategy game for X11
DISTNAME= xblast-complete-sounds-2.10.0
PKGNAME= xblast-2.10.0
DISTNAME= xblast-2.10.2
DIST_SUBDIR= xblast
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
images-2005-01-06${EXTRACT_SUFX} \
levels-2005-01-06${EXTRACT_SUFX} \
models-2005-01-06${EXTRACT_SUFX} \
musics-2005-01-06${EXTRACT_SUFX} \
sounds${EXTRACT_SUFX}
CATEGORIES= games
HOMEPAGE= http://xblast.sourceforge.net/
@ -18,12 +24,18 @@ WANTLIB= c ICE m ossaudio X11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xblast/}
USE_X11= Yes
WRKDIST= ${WRKDIR}/${DISTNAME:S/complete-sounds-//}
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_ENV= LDFLAGS="-lossaudio"
CONFIGURE_ARGS= --enable-sound
CONFIGURE_ARGS= --enable-sound \
--with-otherdatadir=$(PREFIX)/share/xblast
post-extract:
@cp -r ${WRKDIR}/images-2005-01-06 ${WRKSRC}/image
@cp -r ${WRKDIR}/levels-2005-01-06 ${WRKSRC}/level
@cp -r ${WRKDIR}/models-2005-01-06 ${WRKSRC}/image/sprite
@cp -r ${WRKDIR}/sounds ${WRKSRC}/sounds
@cp -r ${WRKDIR}/musics-2005-01-06/* ${WRKSRC}/sounds
NO_REGRESS= Yes

View File

@ -1,5 +1,30 @@
MD5 (xblast-complete-sounds-2.10.0.tar.gz) = M3fTUy+HK0TvgrCn+VeNWw==
RMD160 (xblast-complete-sounds-2.10.0.tar.gz) = UFyIsziZkfIp2DloDRjj7r33Pbs=
SHA1 (xblast-complete-sounds-2.10.0.tar.gz) = CDFfVwnZNmS3iWY6WQDaD9rZx98=
SHA256 (xblast-complete-sounds-2.10.0.tar.gz) = /lX9b7C9rcLHxt/wXLRlHzeWYbP9HGrjApIPUeWnIFA=
SIZE (xblast-complete-sounds-2.10.0.tar.gz) = 10377957
MD5 (xblast/images-2005-01-06.tar.gz) = +S0JZcdZaV5qGDEPiFxvQA==
MD5 (xblast/levels-2005-01-06.tar.gz) = 6mJ3rw6XrX6uoJNw9P5Vug==
MD5 (xblast/models-2005-01-06.tar.gz) = iH6EyeeESCPjyLWeY+iFmw==
MD5 (xblast/musics-2005-01-06.tar.gz) = 5yGi5Ej4HKg9mgp3IlH2EQ==
MD5 (xblast/sounds.tar.gz) = gJwn8QAq1Neqg24IP1KhmQ==
MD5 (xblast/xblast-2.10.2.tar.gz) = FAUH8SbIV2E3+ly/vqfLqQ==
RMD160 (xblast/images-2005-01-06.tar.gz) = PCbJ1XAALWM0OJBVxGUakIQfDsg=
RMD160 (xblast/levels-2005-01-06.tar.gz) = U3sRhmqEIyjHjiB897SE1wgjxEM=
RMD160 (xblast/models-2005-01-06.tar.gz) = 9YaXHoe/lkhXlxDh6LGmEnWOVz8=
RMD160 (xblast/musics-2005-01-06.tar.gz) = Yz7+oVwuuapX1Y9BYO7rGly0Xjk=
RMD160 (xblast/sounds.tar.gz) = mo4LSI+AqeVKFJI2imj/19JWKsw=
RMD160 (xblast/xblast-2.10.2.tar.gz) = uVj+nRMOHLsT/nERlBH2rVBCD3Q=
SHA1 (xblast/images-2005-01-06.tar.gz) = P9WXpo6WwyVlSjdy4HUopbDtyAI=
SHA1 (xblast/levels-2005-01-06.tar.gz) = 0LAZIYR5qPlhf4WNd1j34bS9hms=
SHA1 (xblast/models-2005-01-06.tar.gz) = j0IRMwCaSA+b4FrBd2LKtmkcH0I=
SHA1 (xblast/musics-2005-01-06.tar.gz) = UZ5LQBSHcrcrsSN1xdGgXzyyb+o=
SHA1 (xblast/sounds.tar.gz) = iHVijeDdpNT3n/4yT36OVgxOBHE=
SHA1 (xblast/xblast-2.10.2.tar.gz) = H/CyasADqmjflkrWqORFBdgt5f0=
SHA256 (xblast/images-2005-01-06.tar.gz) = JLYnrx1IhPo5y/tK0tlTZhqlKD+W7meBN7pVS2dCNUI=
SHA256 (xblast/levels-2005-01-06.tar.gz) = rxRdy0DJTgeVPzoSrfKrZ0EUKLMaBEbfPffJHV8mB1o=
SHA256 (xblast/models-2005-01-06.tar.gz) = 2u0NUMA3Gv4YcVnHaS19JtEk6A6cMggEPYOltsphD3c=
SHA256 (xblast/musics-2005-01-06.tar.gz) = QqRbB0kldV19Kg7/uaWenjh0+Sp6qeELuQ+Y7rEcvGE=
SHA256 (xblast/sounds.tar.gz) = MQyJWSE532F+bpgatb87/KhKd3jVGRM0vajrBpySS2E=
SHA256 (xblast/xblast-2.10.2.tar.gz) = ZLbAsaj9CZIEyj4nhp8I85YKocOYfT5qwqmO0ciwlxE=
SIZE (xblast/images-2005-01-06.tar.gz) = 860830
SIZE (xblast/levels-2005-01-06.tar.gz) = 283353
SIZE (xblast/models-2005-01-06.tar.gz) = 1738564
SIZE (xblast/musics-2005-01-06.tar.gz) = 5317575
SIZE (xblast/sounds.tar.gz) = 1612625
SIZE (xblast/xblast-2.10.2.tar.gz) = 590442

View File

@ -0,0 +1,32 @@
$OpenBSD: patch-Makefile_in,v 1.1 2007/08/08 14:59:47 aanriot Exp $
--- Makefile.in.orig Mon Aug 6 14:24:56 2007
+++ Makefile.in Mon Aug 6 14:26:11 2007
@@ -782,19 +782,19 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
install-data-local:
@$(NORMAL_INSTALL)
if test -d $(srcdir)/image; then \
- $(mkinstalldirs) $(game_datadir); \
- $(mkinstalldirs) $(game_datadir)/image; \
- cp -r $(srcdir)/image/* $(game_datadir)/image;\
+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir); \
+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/image; \
+ cp -r $(srcdir)/image/* $(DESTDIR)/$(game_datadir)/image;\
fi; \
if test -d $(srcdir)/level; then \
- $(mkinstalldirs) $(game_datadir)/ ; \
- $(mkinstalldirs) $(game_datadir)//level; \
- cp -r $(srcdir)/level/* $(game_datadir)//level;\
+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/ ; \
+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/level; \
+ cp -r $(srcdir)/level/* $(DESTDIR)/$(game_datadir)/level;\
fi; \
if test -d $(srcdir)/sounds; then \
- $(mkinstalldirs) $(game_datadir)/ ; \
- $(mkinstalldirs) $(game_datadir)//sounds; \
- cp -r $(srcdir)/sounds/* $(game_datadir)//sounds;\
+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/ ; \
+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/sounds; \
+ cp -r $(srcdir)/sounds/* $(DESTDIR)/$(game_datadir)/sounds;\
fi;
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure_in,v 1.1 2005/07/17 08:53:54 aanriot Exp $
--- configure.in.orig Sat Jul 16 17:54:35 2005
+++ configure.in Sat Jul 16 17:55:30 2005
@@ -40,7 +40,7 @@ AH_TEMPLATE([GAME_DATADIR], [for packed]
AC_ARG_ENABLE([admin],[ --enable-admin, data will be installed (and can be only started from) $prefix/share/XBlast-TNT/], MY_EXPAND_DIR(game_datadir, "$datadir"))
AC_ARG_WITH([otherdatadir],[ --with-otherdatadir=OTHERDATADIR If you dont want that the data go to: $prefix/share/XBlast-TNT/],
game_datadir="$with_otherdatadir",
-game_datadir="./")
+game_datadir="\$(PREFIX)/share/xblast")
dnl AC_DEFINE_UNQUOTED( [GAME_DATADIR] , ["$game_datadir"] , ["a comment here"] )
datadir=$game_datadir;

View File

@ -1,28 +1,23 @@
$OpenBSD: patch-xbsndsrv_c,v 1.1 2005/07/17 08:53:54 aanriot Exp $
--- xbsndsrv.c.orig Wed Jan 5 18:12:00 2005
+++ xbsndsrv.c Sun Jul 17 10:21:04 2005
@@ -46,8 +46,12 @@
$OpenBSD: patch-xbsndsrv_c,v 1.2 2007/08/08 14:59:47 aanriot Exp $
--- xbsndsrv.c.orig Tue Mar 8 18:27:15 2005
+++ xbsndsrv.c Mon Aug 6 21:21:39 2007
@@ -63,6 +63,8 @@
/* non-sun audio includes */
#ifdef __FreeBSD__
#include <machine/soundcard.h>
#else
+#ifdef __OpenBSD__
+#elif __OpenBSD__
+#include <soundcard.h>
+#else
#else
#include <linux/soundcard.h>
#endif
+#endif
#include <signal.h>
#include "snd.h"
@@ -174,7 +178,11 @@ static struct _sound_name {
#define SUBSIZE 2048
#define FRAGSIZE 0x0004000a
+#ifdef __OpenBSD__
@@ -195,6 +197,10 @@ static struct _sound_name {
#define SAMPLE_CHANNELS 2
#define SAMPLE_SIZE 16
#define SUN_AUDIO_REF 0
+#elif __OpenBSD__
+#define SOUND_DEVICE "/dev/sound"
+#else
+#define SAMPLE_CHANNELS 1
+#define SAMPLE_SIZE 8
#else
#define SOUND_DEVICE "/dev/dsp"
+#endif
#define SAMPLE_RATE 22050
#define SAMPLE_CHANNELS 1
#define SAMPLE_SIZE 8