opentyrian: add 2.1.20130907
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
From de64bf5798755f4ea24cc1b8f1d6197b8a0fc7c7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 16 Aug 2015 15:43:44 +0200
|
||||
Subject: [PATCH 1/2] Makefile: use pkgconfig to find sdl
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [Configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
Makefile | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 88a8bd6..63c2983 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -14,8 +14,6 @@ WITH_NETWORK := true
|
||||
|
||||
STRIP := strip
|
||||
|
||||
-SDL_CONFIG := sdl-config
|
||||
-
|
||||
SRCS := $(wildcard src/*.c)
|
||||
OBJS := $(SRCS:src/%.c=obj/%.o)
|
||||
|
||||
@@ -39,8 +37,8 @@ endif
|
||||
|
||||
EXTRA_LDLIBS += -lm
|
||||
|
||||
-SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
|
||||
-SDL_LDLIBS := $(shell $(SDL_CONFIG) --libs)
|
||||
+SDL_CFLAGS := $(shell pkg-config --cflags sdl)
|
||||
+SDL_LDLIBS := $(shell pkg-config --libs sdl)
|
||||
ifeq ($(WITH_NETWORK), true)
|
||||
SDL_LDLIBS += -lSDL_net
|
||||
endif
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
From 7e1c9fb3c30d12139ad531b6b14c53fb5764b24c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 16 Aug 2015 16:04:41 +0200
|
||||
Subject: [PATCH 2/2] Fix several uninitialized variable warnings
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Backport [1]
|
||||
|
||||
[1] https://bitbucket.org/opentyrian/opentyrian/commits/03cdbc8922f7856378f2e4b51f9adb5073f6fc9e/raw/
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/mainint.c | 2 +-
|
||||
src/shots.c | 2 +-
|
||||
src/tyrian2.c | 4 ++--
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/mainint.c b/src/mainint.c
|
||||
index 2805752..b00074e 100644
|
||||
--- a/src/mainint.c
|
||||
+++ b/src/mainint.c
|
||||
@@ -3635,7 +3635,7 @@ redo:
|
||||
blit_sprite2x2(VGAScreen, this_player->x - 17, this_player->y - 7, *shapes9ptr_, 220);
|
||||
blit_sprite2x2(VGAScreen, this_player->x + 7, this_player->y - 7, *shapes9ptr_, 222);
|
||||
|
||||
- int ship_banking;
|
||||
+ int ship_banking = 0;
|
||||
switch (ship_sprite)
|
||||
{
|
||||
case 5:
|
||||
diff --git a/src/shots.c b/src/shots.c
|
||||
index 606a19f..7aa6ac5 100644
|
||||
--- a/src/shots.c
|
||||
+++ b/src/shots.c
|
||||
@@ -319,7 +319,7 @@ JE_integer player_shot_create( JE_word portNum, uint bay_i, JE_word PX, JE_word
|
||||
if (weapon->sound > 0)
|
||||
soundQueue[soundChannel[bay_i]] = weapon->sound;
|
||||
|
||||
- int shot_id;
|
||||
+ int shot_id = MAX_PWEAPON;
|
||||
/*Rot*/
|
||||
for (int multi_i = 1; multi_i <= weapon->multi; multi_i++)
|
||||
{
|
||||
diff --git a/src/tyrian2.c b/src/tyrian2.c
|
||||
index 3a0a101..4d528cf 100644
|
||||
--- a/src/tyrian2.c
|
||||
+++ b/src/tyrian2.c
|
||||
@@ -4325,8 +4325,8 @@ void JE_eventSystem( void )
|
||||
|
||||
case 19: /* Enemy Global Move */
|
||||
{
|
||||
- int initial_i, max_i;
|
||||
- bool all_enemies;
|
||||
+ int initial_i = 0, max_i = 0;
|
||||
+ bool all_enemies = false;
|
||||
|
||||
if (eventRec[eventLoc-1].eventdat3 > 79 && eventRec[eventLoc-1].eventdat3 < 90)
|
||||
{
|
||||
--
|
||||
2.1.0
|
||||
|
||||
45
recipes-games/opentyrian/opentyrian_2.1.20130907.bb
Normal file
45
recipes-games/opentyrian/opentyrian_2.1.20130907.bb
Normal file
@@ -0,0 +1,45 @@
|
||||
SUMMARY = "OpenTyrian is a port of the DOS shoot-em-up Tyrian"
|
||||
HOMEPAGE = "https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
|
||||
SECTION = "games"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||
|
||||
DEPENDS = "libsdl libsdl-net"
|
||||
|
||||
inherit autotools-brokensep
|
||||
|
||||
SRC_URI = " \
|
||||
http://www.camanis.net/opentyrian/releases/${BPN}-${PV}-src.tar.gz \
|
||||
http://camanis.net/opentyrian/tyrian21.zip;name=data \
|
||||
file://0001-Makefile-use-pkgconfig-to-find-sdl.patch \
|
||||
file://0002-Fix-several-uninitialized-variable-warnings.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "978686c5a1dfbac69a2161aadf084c2b"
|
||||
SRC_URI[sha256sum] = "f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f"
|
||||
|
||||
SRC_URI[data.md5sum] = "2a3b206a6de25ed4b771af073f8ca904"
|
||||
SRC_URI[data.sha256sum] = "7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install ${BPN} ${D}${bindir}
|
||||
|
||||
install -d ${D}${mandir}/man6
|
||||
install linux/man/${BPN}.6 ${D}${mandir}/man6
|
||||
|
||||
install -d ${D}${datadir}/applications
|
||||
install linux/${BPN}.desktop ${D}${datadir}/applications
|
||||
|
||||
install -d ${D}${datadir}/pixmaps
|
||||
install linux/icons/tyrian-128.png ${D}${datadir}/pixmaps/${BPN}.png
|
||||
|
||||
install -d ${D}${datadir}/${BPN}/data
|
||||
install ${WORKDIR}/tyrian21/* ${D}${datadir}/${BPN}/data
|
||||
|
||||
# remove unneeded DOS stuff
|
||||
find ${D}${datadir}/${BPN}/data -name '*.exe' -exec rm -f {} \;
|
||||
find ${D}${datadir}/${BPN}/data -name '*.ovl' -exec rm -f {} \;
|
||||
find ${D}${datadir}/${BPN}/data -name 'setup.*' -exec rm -f {} \;
|
||||
find ${D}${datadir}/${BPN}/data -name '*.doc' -exec rm -f {} \;
|
||||
find ${D}${datadir}/${BPN}/data -name '*.tfp' -exec rm -f {} \;
|
||||
}
|
||||
Reference in New Issue
Block a user