[happy-kitty] r715 committed - opensurge: sync with svn...

[happy...@googlecode.com]

Revision: 715
Author: ozbekanil
Date: Sun Apr 1 07:02:51 2012
Log: opensurge: sync with svn
no it's fatal

http://code.google.com/p/happy-kitty/source/detail?r=715

Added:
/trunk/game/arcade/opensurge/files/not-fatal.diff
Modified:
/trunk/game/arcade/opensurge/actions.py
/trunk/game/arcade/opensurge/files/opensurge-paths.diff
/trunk/game/arcade/opensurge/pspec.xml

=======================================
--- /dev/null
+++ /trunk/game/arcade/opensurge/files/not-fatal.diff Sun Apr 1 07:02:51
2012
@@ -0,0 +1,41 @@
+--- src/entities/background.c.orig 2010-12-27 03:29:01.000000000 +0200
++++ src/entities/background.c 2012-04-01 16:59:05.553216605 +0300
+@@ -369,7 +369,7 @@
+ actor_change_animation(bg->actor, bg->data->animation_data[0]);
+ }
+ else
+- fatal_error("Can't read background. Unknown identifier: '%s'",
identifier);
++ logfile_message("Can't read background. Unknown
identifier: '%s'", identifier);
+
+ return 0;
+ }
+@@ -452,7 +452,7 @@
+ );
+ }
+ else
+- fatal_error("Unknown background behavior: '%s'",
nanoparser_get_string(p1));
++ logfile_message("Unknown background behavior: '%s'",
nanoparser_get_string(p1));
+ }
+ else if(str_icmp(identifier, "repeat_x") == 0) {
+ p1 = nanoparser_get_nth_parameter(param_list, 1);
+@@ -477,7 +477,7 @@
+ bg->data = spriteinfo_create(nanoparser_get_program(p1));
+ }
+ else
+- fatal_error("Can't read background attributes. Unknown
identifier: '%s'", identifier);
++ logfile_message("Can't read background attributes. Unknown
identifier: '%s'", identifier);
+
+ return 0;
+ }
+@@ -485,9 +485,9 @@
+ void validate_background(const background_t *bg)
+ {
+ if(bg->data == NULL)
+- fatal_error("Can't read background: no sprite data given");
++ logfile_message("Can't read background: no sprite data given");
+
+ if(bg->strategy == NULL)
+- fatal_error("Can't read background: no behavior given");
++ logfile_message("Can't read background: no behavior given");
+ }
+
=======================================
--- /trunk/game/arcade/opensurge/actions.py Thu Oct 13 11:39:24 2011
+++ /trunk/game/arcade/opensurge/actions.py Sun Apr 1 07:02:51 2012
@@ -9,21 +9,17 @@
from pisi.actionsapi import pisitools
from pisi.actionsapi import get

-WorkDir = "opensurge-src-build597"
+WorkDir = "opensurge-src-build697"

def setup():
- shelltools.system("./configure")
- #cmaketools.configure()
+ pisitools.dosed("CMakeLists.txt", "icon.png logo_big.png", " ")
+
+ shelltools.system("./configure -DUSE_OPENAL=NO")

def build():
cmaketools.make()

def install():
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
- pisitools.dobin("opensurge")
- pisitools.insinto("/usr/share/opensurge/characters", "characters/*")
- pisitools.remove("/usr/share/opensurge/opensurge")
- pisitools.remove("/usr/share/opensurge/readme.html")
- pisitools.remove("/usr/share/opensurge/license.txt")
-
- pisitools.dodoc("readme.html", "bleeding_edge.txt", "license.txt")
+
+ pisitools.dodoc("readme.html", "license.txt")
=======================================
--- /trunk/game/arcade/opensurge/files/opensurge-paths.diff Thu Oct 13
11:39:24 2011
+++ /trunk/game/arcade/opensurge/files/opensurge-paths.diff Sun Apr 1
07:02:51 2012
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2011-10-13 11:00:18.000000000 +0300
-+++ CMakeLists.txt 2011-10-13 21:08:06.786000032 +0300
-@@ -478,16 +478,12 @@
+--- CMakeLists.txt.orig 2012-03-26 20:44:50.000000000 +0300
++++ CMakeLists.txt 2012-04-01 16:42:33.394105700 +0300
+@@ -541,16 +541,12 @@

# Installing on *nix
IF(UNIX)
@@ -10,8 +10,9 @@
+ SET(GAME_FINAL_DIR "${DESTDIR}/usr/bin")

INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make
sure you have root privileges.\")")
- INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION
${GAME_INSTALL_DIR})
- INSTALL(FILES license.txt readme.html DESTINATION ${GAME_INSTALL_DIR})
+- INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION
${GAME_INSTALL_DIR})
++ INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION ${GAME_FINAL_DIR})
+ INSTALL(FILES license.txt readme.html bg.png icon.png logo_big.png
logo.png surge.png DESTINATION ${GAME_INSTALL_DIR})
INSTALL(DIRECTORY characters src objects sprites config images levels
licenses musics quests samples screenshots themes languages fonts ttf
DESTINATION ${GAME_INSTALL_DIR} PATTERN ".svn" EXCLUDE)

- INSTALL(CODE "MESSAGE(\"Creating files at ${GAME_FINAL_DIR}...\")")
=======================================
--- /trunk/game/arcade/opensurge/pspec.xml Sat Oct 22 15:39:23 2011
+++ /trunk/game/arcade/opensurge/pspec.xml Sun Apr 1 07:02:51 2012
@@ -13,15 +13,17 @@
<IsA>app:gui</IsA>
<Summary>A game based on the Sonic the Hedgehog universe</Summary>
<Description>Open Sonic is an open-source game based on the Sonic
the Hedgehog universe. It introduces a different style of gameplay called
cooperative play, in which it's possible to control 3 characters
simultaneously. Unlike most similar games, Open Sonic provides a greater
level of interaction between the player and the levels. It's more than just
a jump'n'run; the user must come up with some strategy in order to get
through the levels.</Description>
- <Archive sha1sum="d11f97bdbd95e43195600a4849d878203b16dfd5"
type="targz">http://dl.dropbox.com/u/1836567/Paketler/opensurge-src-build597.tar.gz</Archive>
+ <Archive sha1sum="b91bc7b2fac4501f34361de56f4535a479d1482e"
type="tarbz2">http://happy-kitty.googlecode.com/files/opensurge-src-build697.tar.bz2</Archive>
<BuildDependencies>
<Dependency>alfont</Dependency>
<Dependency>allegro-devel</Dependency>
+ <Dependency>alure-devel</Dependency>
<Dependency>dumb-devel</Dependency>
<Dependency>libpng-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>opensurge-paths.diff</Patch>
+ <Patch>not-fatal.diff</Patch>
</Patches>
</Source>

@@ -30,6 +32,7 @@
<RuntimeDependencies>
<Dependency>alfont</Dependency>
<Dependency>allegro</Dependency>
+ <Dependency>alure</Dependency>
<Dependency>dumb</Dependency>
</RuntimeDependencies>
<Files>
@@ -46,6 +49,13 @@
</Package>

<History>
+ <Update release="3">
+ <Date>2012-04-01</Date>
+ <Version>0.2.0</Version>
+ <Comment>Version bump</Comment>
+ <Name>Anıl Özbek</Name>
+ <Email>ozbe...@gmail.com</Email>
+ </Update>
<Update release="2">
<Date>2011-10-13</Date>
<Version>0.2.0</Version>