barrage, bump version (#4335)

This commit is contained in:
Schrijvers Luc
2019-11-02 18:36:11 +01:00
committed by Jérôme Duval
parent 6e188341fb
commit bff9bbba04
3 changed files with 89 additions and 44 deletions

View File

@@ -6,31 +6,38 @@ grenades at soldiers, jeeps and tanks. Targets are fast paced and require \
careful aiming as it takes half a second to reload the gun. In addition, \
you have to keep an eye on your ammo and reload in time."
HOMEPAGE="http://lgames.sourceforge.net/"
COPYRIGHT="2003-2011 Michael Speck"
COPYRIGHT="2003-2019 Michael Speck"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://downloads.sourceforge.net/project/lgames/barrage/barrage-1.0.4.tar.gz"
CHECKSUM_SHA256="ad74e049dfded3bca28b8dc1c5870408cfad9e024b35cc5b501ba90486d9af25"
PATCHES="barrage-1.0.4.patch"
SOURCE_URI="http://downloads.sourceforge.net/project/lgames/barrage/barrage-$portVersion.tar.gz"
CHECKSUM_SHA256="a78897ab6a8cf6d53d4093bb8abae204ddfa3a22c5cab9e76220e4987de76904"
PATCHES="barrage-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
GLOBAL_WRITABLE_FILES="
var/games/barrage/barrage.hscr keep-old
"
PROVIDES="
barrage = portVersion
cmd:barrage = $portVersion
"
REQUIRES="
haiku
lib:libsdl
lib:libsdl_mixer
lib:libSDL_1.2
lib:libSDL_mixer_1.2
"
BUILD_REQUIRES="
haiku_devel
devel:libsdl
devel:libsdl_mixer
devel:libSDL
devel:libSDL_mixer
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoreconf
cmd:awk
cmd:gcc
cmd:ld
cmd:libtoolize
@@ -39,8 +46,9 @@ BUILD_PREREQUIRES="
BUILD()
{
libtoolize -fci
runConfigure ./configure
autoreconf -vfi
runConfigure --omit-dirs binDir ./configure \
--bindir=$appsDir
make $jobArgs
}
@@ -49,5 +57,7 @@ INSTALL()
{
make install
addAppDeskbarSymlink $binDir/barrage Barrage
mv $appsDir/barrage $appsDir/Barrage
addAppDeskbarSymlink $appsDir/Barrage
}

View File

@@ -1,33 +0,0 @@
--- barrage-1.0.4/src/Makefile.in.org 2011-07-28 15:28:20.000000000 +0200
+++ barrage-1.0.4/src/Makefile.in 2014-07-14 13:05:29.277086208 +0200
@@ -185,7 +185,7 @@
SFont.c
barrage_LDFLAGS =
-barrage_LDADD = @audio_lib@ -lm
+barrage_LDADD = @audio_lib@
EXTRA_DIST = \
defs.h particle.h shots.h units.h\
data.h bfield.h menu.h SFont.h chart.h
--- barrage-1.0.4/src/main.c.org 2014-07-14 13:28:39.039321600 +0200
+++ barrage-1.0.4/src/main.c 2014-07-14 13:27:14.832831488 +0200
@@ -28,7 +28,7 @@
#define BITDEPTH 16
int delay = 0;
-int fullscreen = 1;
+int fullscreen = 0;
int audio_on = 1;
int audio_freq = 22050;
int audio_format = AUDIO_S16LSB;
--- barrage-1.0.4/configure.org 2014-08-25 19:56:32.913833984 +0200
+++ barrage-1.0.4/configure 2014-08-25 19:56:21.528744448 +0200
@@ -5483,7 +5483,7 @@
-src_dir="$datadir/games/barrage"
+src_dir="$datadir/barrage"
# Check whether --enable-install was given.
if test "${enable_install+set}" = set; then

View File

@@ -0,0 +1,68 @@
From 256e2156c29ba6676926e52b3ec9e04c77ae4f5d Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 2 Nov 2019 15:31:15 +0100
Subject: Don't use fullscreen on launch
diff --git a/src/main.c b/src/main.c
index 2dd7b12..134c94e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,7 +35,7 @@ int video_forced_w = 0, video_forced_h = 0; /* given by command line */
#define BITDEPTH 16
int delay = 0;
-int fullscreen = 1;
+int fullscreen = 0;
int audio_on = 1;
int audio_freq = 22050;
int audio_format = AUDIO_S16LSB;
--
2.23.0
From da9ae4b1483636601ce97163232b03787394fc0b Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 2 Nov 2019 15:49:21 +0100
Subject: Don't use -Wno-int-conversion for gcc2
diff --git a/configure.ac b/configure.ac
index b72c449..167c33e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_ARG_ENABLE( audio,
AC_SUBST(datdir)
AC_SUBST(hiscoredir)
-CFLAGS="$CFLAGS -Wall -Wno-int-conversion -Wno-format -Wno-implicit-function-declaration"
+CFLAGS="$CFLAGS -Wall -Wno-format -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS $SDL_CFLAGS $audio_flag $debugflags -DSRC_DIR=\\\"$datdir\\\" -DCONFIGDIRNAME=\\\"$configdir\\\" -DHISCOREDIR=\\\"$hiscoredir\\\""
LIBS="$LIBS -lm $SDL_LIBS $audio_lib"
--
2.23.0
From 9467cf955da0f00ebf427515afe17edb5c84b8e3 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 2 Nov 2019 15:50:42 +0100
Subject: use subfolder games for barrage.hscr
diff --git a/configure.ac b/configure.ac
index 167c33e..13e405e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_CHECK_FUNCS([memset strchr strdup strrchr])
# Flags
datdir=$datadir/$PACKAGE
-hiscoredir=$localstatedir
+hiscoredir=$localstatedir/games/barrage
configdir="~/.config"
debugflags=""
AC_ARG_ENABLE( install,
--
2.23.0