rpms/teeworlds/F-10 teeworlds-datadir.patch, NONE, 1.1 teeworlds-extlibs.patch, NONE, 1.1 teeworlds.desktop, NONE, 1.1 teeworlds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Lubomir Rintel
lkundrak at fedoraproject.org
Thu Jan 8 14:49:52 UTC 2009
- Previous message (by thread): rpms/teeworlds/F-9 teeworlds-datadir.patch, NONE, 1.1 teeworlds-extlibs.patch, NONE, 1.1 teeworlds.desktop, NONE, 1.1 teeworlds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/teeworlds/devel teeworlds-datadir.patch, NONE, 1.1 teeworlds-extlibs.patch, NONE, 1.1 teeworlds.desktop, NONE, 1.1 teeworlds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/teeworlds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17025/F-10
Modified Files:
.cvsignore sources
Added Files:
teeworlds-datadir.patch teeworlds-extlibs.patch
teeworlds.desktop teeworlds.spec
Log Message:
Import teeworlds
teeworlds-datadir.patch:
--- NEW FILE teeworlds-datadir.patch ---
diff -Naur teeworlds-0.4.3-src.old/datasrc/data.ds teeworlds-0.4.3-src/datasrc/data.ds
--- teeworlds-0.4.3-src.old/datasrc/data.ds 2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/datasrc/data.ds 2008-11-04 18:45:37.000000000 +0100
@@ -1,228 +1,228 @@
sounds {
gun_fire {
- "data/audio/wp_gun_fire-01.wv"
- "data/audio/wp_gun_fire-02.wv"
- "data/audio/wp_gun_fire-03.wv"
+ "/usr/share/teeworlds/audio/wp_gun_fire-01.wv"
+ "/usr/share/teeworlds/audio/wp_gun_fire-02.wv"
+ "/usr/share/teeworlds/audio/wp_gun_fire-03.wv"
}
shotgun_fire {
- "data/audio/wp_shotty_fire-01.wv"
- "data/audio/wp_shotty_fire-02.wv"
- "data/audio/wp_shotty_fire-03.wv"
+ "/usr/share/teeworlds/audio/wp_shotty_fire-01.wv"
+ "/usr/share/teeworlds/audio/wp_shotty_fire-02.wv"
+ "/usr/share/teeworlds/audio/wp_shotty_fire-03.wv"
}
grenade_fire {
- "data/audio/wp_flump_launch-01.wv"
- "data/audio/wp_flump_launch-02.wv"
- "data/audio/wp_flump_launch-03.wv"
+ "/usr/share/teeworlds/audio/wp_flump_launch-01.wv"
+ "/usr/share/teeworlds/audio/wp_flump_launch-02.wv"
+ "/usr/share/teeworlds/audio/wp_flump_launch-03.wv"
}
hammer_fire {
- "data/audio/wp_hammer_swing-01.wv"
- "data/audio/wp_hammer_swing-02.wv"
- "data/audio/wp_hammer_swing-03.wv"
+ "/usr/share/teeworlds/audio/wp_hammer_swing-01.wv"
+ "/usr/share/teeworlds/audio/wp_hammer_swing-02.wv"
+ "/usr/share/teeworlds/audio/wp_hammer_swing-03.wv"
}
hammer_hit {
- "data/audio/wp_hammer_hit-01.wv"
- "data/audio/wp_hammer_hit-02.wv"
- "data/audio/wp_hammer_hit-03.wv"
+ "/usr/share/teeworlds/audio/wp_hammer_hit-01.wv"
+ "/usr/share/teeworlds/audio/wp_hammer_hit-02.wv"
+ "/usr/share/teeworlds/audio/wp_hammer_hit-03.wv"
}
ninja_fire {
- "data/audio/wp_ninja_attack-01.wv"
- "data/audio/wp_ninja_attack-02.wv"
- "data/audio/wp_ninja_attack-03.wv"
+ "/usr/share/teeworlds/audio/wp_ninja_attack-01.wv"
+ "/usr/share/teeworlds/audio/wp_ninja_attack-02.wv"
+ "/usr/share/teeworlds/audio/wp_ninja_attack-03.wv"
}
grenade_explode {
- "data/audio/wp_flump_explo-01.wv"
- "data/audio/wp_flump_explo-02.wv"
- "data/audio/wp_flump_explo-03.wv"
+ "/usr/share/teeworlds/audio/wp_flump_explo-01.wv"
+ "/usr/share/teeworlds/audio/wp_flump_explo-02.wv"
+ "/usr/share/teeworlds/audio/wp_flump_explo-03.wv"
}
ninja_hit {
- "data/audio/wp_ninja_hit-01.wv"
- "data/audio/wp_ninja_hit-02.wv"
- "data/audio/wp_ninja_hit-03.wv"
+ "/usr/share/teeworlds/audio/wp_ninja_hit-01.wv"
+ "/usr/share/teeworlds/audio/wp_ninja_hit-02.wv"
+ "/usr/share/teeworlds/audio/wp_ninja_hit-03.wv"
}
rifle_fire {
- "data/audio/wp_rifle_fire-01.wv"
- "data/audio/wp_rifle_fire-02.wv"
- "data/audio/wp_rifle_fire-03.wv"
+ "/usr/share/teeworlds/audio/wp_rifle_fire-01.wv"
+ "/usr/share/teeworlds/audio/wp_rifle_fire-02.wv"
+ "/usr/share/teeworlds/audio/wp_rifle_fire-03.wv"
}
rifle_bounce {
- "data/audio/wp_rifle_bnce-01.wv"
- "data/audio/wp_rifle_bnce-02.wv"
- "data/audio/wp_rifle_bnce-03.wv"
+ "/usr/share/teeworlds/audio/wp_rifle_bnce-01.wv"
+ "/usr/share/teeworlds/audio/wp_rifle_bnce-02.wv"
+ "/usr/share/teeworlds/audio/wp_rifle_bnce-03.wv"
}
weapon_switch {
- "data/audio/wp_switch-01.wv"
- "data/audio/wp_switch-02.wv"
- "data/audio/wp_switch-03.wv"
+ "/usr/share/teeworlds/audio/wp_switch-01.wv"
+ "/usr/share/teeworlds/audio/wp_switch-02.wv"
+ "/usr/share/teeworlds/audio/wp_switch-03.wv"
}
player_pain_short {
- "data/audio/vo_teefault_pain_short-01.wv"
- "data/audio/vo_teefault_pain_short-02.wv"
- "data/audio/vo_teefault_pain_short-03.wv"
- "data/audio/vo_teefault_pain_short-04.wv"
- "data/audio/vo_teefault_pain_short-05.wv"
- "data/audio/vo_teefault_pain_short-06.wv"
- "data/audio/vo_teefault_pain_short-07.wv"
- "data/audio/vo_teefault_pain_short-08.wv"
- "data/audio/vo_teefault_pain_short-09.wv"
- "data/audio/vo_teefault_pain_short-10.wv"
- "data/audio/vo_teefault_pain_short-11.wv"
- "data/audio/vo_teefault_pain_short-12.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-01.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-02.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-03.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-04.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-05.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-06.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-07.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-08.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-09.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-10.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-11.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_short-12.wv"
}
player_pain_long {
- "data/audio/vo_teefault_pain_long-01.wv"
- "data/audio/vo_teefault_pain_long-02.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_long-01.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_pain_long-02.wv"
}
body_land {
- "data/audio/foley_land-01.wv"
- "data/audio/foley_land-02.wv"
- "data/audio/foley_land-03.wv"
- "data/audio/foley_land-04.wv"
+ "/usr/share/teeworlds/audio/foley_land-01.wv"
+ "/usr/share/teeworlds/audio/foley_land-02.wv"
+ "/usr/share/teeworlds/audio/foley_land-03.wv"
+ "/usr/share/teeworlds/audio/foley_land-04.wv"
}
player_airjump {
- "data/audio/foley_dbljump-01.wv"
- "data/audio/foley_dbljump-02.wv"
- "data/audio/foley_dbljump-03.wv"
+ "/usr/share/teeworlds/audio/foley_dbljump-01.wv"
+ "/usr/share/teeworlds/audio/foley_dbljump-02.wv"
+ "/usr/share/teeworlds/audio/foley_dbljump-03.wv"
}
player_jump {
- "data/audio/foley_foot_left-01.wv"
- "data/audio/foley_foot_left-02.wv"
- "data/audio/foley_foot_left-03.wv"
- "data/audio/foley_foot_left-04.wv"
- "data/audio/foley_foot_right-01.wv"
- "data/audio/foley_foot_right-02.wv"
- "data/audio/foley_foot_right-03.wv"
- "data/audio/foley_foot_right-04.wv"
+ "/usr/share/teeworlds/audio/foley_foot_left-01.wv"
+ "/usr/share/teeworlds/audio/foley_foot_left-02.wv"
+ "/usr/share/teeworlds/audio/foley_foot_left-03.wv"
+ "/usr/share/teeworlds/audio/foley_foot_left-04.wv"
+ "/usr/share/teeworlds/audio/foley_foot_right-01.wv"
+ "/usr/share/teeworlds/audio/foley_foot_right-02.wv"
+ "/usr/share/teeworlds/audio/foley_foot_right-03.wv"
+ "/usr/share/teeworlds/audio/foley_foot_right-04.wv"
}
player_die {
- "data/audio/foley_body_splat-02.wv"
- "data/audio/foley_body_splat-03.wv"
- "data/audio/foley_body_splat-04.wv"
+ "/usr/share/teeworlds/audio/foley_body_splat-02.wv"
+ "/usr/share/teeworlds/audio/foley_body_splat-03.wv"
+ "/usr/share/teeworlds/audio/foley_body_splat-04.wv"
}
player_spawn {
- "data/audio/vo_teefault_spawn-01.wv"
- "data/audio/vo_teefault_spawn-02.wv"
- "data/audio/vo_teefault_spawn-03.wv"
- "data/audio/vo_teefault_spawn-04.wv"
- "data/audio/vo_teefault_spawn-05.wv"
- "data/audio/vo_teefault_spawn-06.wv"
- "data/audio/vo_teefault_spawn-07.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_spawn-01.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_spawn-02.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_spawn-03.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_spawn-04.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_spawn-05.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_spawn-06.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_spawn-07.wv"
}
player_skid {
- "data/audio/sfx_skid-01.wv"
- "data/audio/sfx_skid-02.wv"
- "data/audio/sfx_skid-03.wv"
- "data/audio/sfx_skid-04.wv"
+ "/usr/share/teeworlds/audio/sfx_skid-01.wv"
+ "/usr/share/teeworlds/audio/sfx_skid-02.wv"
+ "/usr/share/teeworlds/audio/sfx_skid-03.wv"
+ "/usr/share/teeworlds/audio/sfx_skid-04.wv"
}
tee_cry {
- "data/audio/vo_teefault_cry-01.wv"
- "data/audio/vo_teefault_cry-02.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_cry-01.wv"
+ "/usr/share/teeworlds/audio/vo_teefault_cry-02.wv"
}
hook_loop {
- "data/audio/hook_loop-01.wv"
- "data/audio/hook_loop-02.wv"
+ "/usr/share/teeworlds/audio/hook_loop-01.wv"
+ "/usr/share/teeworlds/audio/hook_loop-02.wv"
}
hook_attach_ground {
- "data/audio/hook_attach-01.wv"
- "data/audio/hook_attach-02.wv"
- "data/audio/hook_attach-03.wv"
+ "/usr/share/teeworlds/audio/hook_attach-01.wv"
+ "/usr/share/teeworlds/audio/hook_attach-02.wv"
+ "/usr/share/teeworlds/audio/hook_attach-03.wv"
}
hook_attach_player {
- "data/audio/foley_body_impact-01.wv"
- "data/audio/foley_body_impact-02.wv"
- "data/audio/foley_body_impact-03.wv"
+ "/usr/share/teeworlds/audio/foley_body_impact-01.wv"
+ "/usr/share/teeworlds/audio/foley_body_impact-02.wv"
+ "/usr/share/teeworlds/audio/foley_body_impact-03.wv"
}
pickup_health {
- "data/audio/sfx_pickup_hrt-01.wv"
- "data/audio/sfx_pickup_hrt-02.wv"
+ "/usr/share/teeworlds/audio/sfx_pickup_hrt-01.wv"
+ "/usr/share/teeworlds/audio/sfx_pickup_hrt-02.wv"
}
pickup_armor {
- "data/audio/sfx_pickup_arm-01.wv"
- "data/audio/sfx_pickup_arm-02.wv"
- "data/audio/sfx_pickup_arm-03.wv"
- "data/audio/sfx_pickup_arm-04.wv"
+ "/usr/share/teeworlds/audio/sfx_pickup_arm-01.wv"
+ "/usr/share/teeworlds/audio/sfx_pickup_arm-02.wv"
+ "/usr/share/teeworlds/audio/sfx_pickup_arm-03.wv"
+ "/usr/share/teeworlds/audio/sfx_pickup_arm-04.wv"
}
pickup_grenade {
- "data/audio/sfx_pickup_launcher.wv"
+ "/usr/share/teeworlds/audio/sfx_pickup_launcher.wv"
}
pickup_shotgun {
- "data/audio/sfx_pickup_sg.wv"
+ "/usr/share/teeworlds/audio/sfx_pickup_sg.wv"
}
pickup_ninja {
- "data/audio/sfx_pickup_ninja.wv"
+ "/usr/share/teeworlds/audio/sfx_pickup_ninja.wv"
}
weapon_spawn {
- "data/audio/sfx_spawn_wpn-01.wv"
- "data/audio/sfx_spawn_wpn-02.wv"
- "data/audio/sfx_spawn_wpn-03.wv"
+ "/usr/share/teeworlds/audio/sfx_spawn_wpn-01.wv"
+ "/usr/share/teeworlds/audio/sfx_spawn_wpn-02.wv"
+ "/usr/share/teeworlds/audio/sfx_spawn_wpn-03.wv"
}
weapon_noammo {
- "data/audio/wp_noammo-01.wv"
- "data/audio/wp_noammo-02.wv"
- "data/audio/wp_noammo-03.wv"
- "data/audio/wp_noammo-04.wv"
- "data/audio/wp_noammo-05.wv"
+ "/usr/share/teeworlds/audio/wp_noammo-01.wv"
+ "/usr/share/teeworlds/audio/wp_noammo-02.wv"
+ "/usr/share/teeworlds/audio/wp_noammo-03.wv"
+ "/usr/share/teeworlds/audio/wp_noammo-04.wv"
+ "/usr/share/teeworlds/audio/wp_noammo-05.wv"
}
hit {
- "data/audio/sfx_hit_weak-01.wv"
- "data/audio/sfx_hit_weak-02.wv"
+ "/usr/share/teeworlds/audio/sfx_hit_weak-01.wv"
+ "/usr/share/teeworlds/audio/sfx_hit_weak-02.wv"
}
chat_server {
- "data/audio/sfx_msg-server.wv"
+ "/usr/share/teeworlds/audio/sfx_msg-server.wv"
}
chat_client {
- "data/audio/sfx_msg-client.wv"
+ "/usr/share/teeworlds/audio/sfx_msg-client.wv"
}
ctf_drop {
- "data/audio/sfx_ctf_drop.wv"
+ "/usr/share/teeworlds/audio/sfx_ctf_drop.wv"
}
ctf_return {
- "data/audio/sfx_ctf_rtn.wv"
+ "/usr/share/teeworlds/audio/sfx_ctf_rtn.wv"
}
ctf_grab_pl {
- "data/audio/sfx_ctf_grab_pl.wv"
+ "/usr/share/teeworlds/audio/sfx_ctf_grab_pl.wv"
}
ctf_grab_en {
- "data/audio/sfx_ctf_grab_en.wv"
+ "/usr/share/teeworlds/audio/sfx_ctf_grab_en.wv"
}
ctf_capture {
- "data/audio/sfx_ctf_cap_pl.wv"
+ "/usr/share/teeworlds/audio/sfx_ctf_cap_pl.wv"
}
}
@@ -233,34 +233,34 @@
}
game {
- filename "data/game.png"
+ filename "/usr/share/teeworlds/game.png"
}
particles {
- filename "data/particles.png"
+ filename "/usr/share/teeworlds/particles.png"
}
cursor {
- filename "data/gui_cursor.png"
+ filename "/usr/share/teeworlds/gui_cursor.png"
}
banner {
- filename "data/gui_logo.png"
+ filename "/usr/share/teeworlds/gui_logo.png"
}
emoticons {
- filename "data/emoticons.png"
+ filename "/usr/share/teeworlds/emoticons.png"
}
browseicons {
- filename "data/browse_icons.png"
+ filename "/usr/share/teeworlds/browse_icons.png"
}
console_bg {
- filename "data/console.png"
+ filename "/usr/share/teeworlds/console.png"
}
console_bar {
- filename "data/console_bar.png"
+ filename "/usr/share/teeworlds/console_bar.png"
}
}
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_hooks.cpp teeworlds-0.4.3-src/src/game/client/gc_hooks.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_hooks.cpp 2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_hooks.cpp 2008-11-04 18:45:37.000000000 +0100
@@ -68,7 +68,7 @@
int before = gfx_memory_usage();
- font_set_load(&default_font, "data/fonts/default_font%d.tfnt", "data/fonts/default_font%d.png", "data/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
+ font_set_load(&default_font, "/usr/share/teeworlds/fonts/default_font%d.tfnt", "/usr/share/teeworlds/fonts/default_font%d.png", "/usr/share/teeworlds/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
dbg_msg("font", "gfx memory used for font textures: %d", gfx_memory_usage()-before);
gfx_text_set_default_font(&default_font);
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_map_image.cpp teeworlds-0.4.3-src/src/game/client/gc_map_image.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_map_image.cpp 2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_map_image.cpp 2008-11-04 18:45:37.000000000 +0100
@@ -110,7 +110,7 @@
{
char buf[256];
char *name = (char *)map_get_data(img->image_name);
- str_format(buf, sizeof(buf), "data/mapres/%s.png", name);
+ str_format(buf, sizeof(buf), "/usr/share/teeworlds/mapres/%s.png", name);
map_textures[i] = gfx_load_texture(buf, IMG_AUTO, 0);
}
else
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_skin.cpp teeworlds-0.4.3-src/src/game/client/gc_skin.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_skin.cpp 2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_skin.cpp 2008-11-04 18:45:37.000000000 +0100
@@ -24,7 +24,7 @@
return;
char buf[512];
- str_format(buf, sizeof(buf), "data/skins/%s", name);
+ str_format(buf, sizeof(buf), "/usr/share/teeworlds/skins/%s", name);
IMAGE_INFO info;
if(!gfx_load_png(&info, buf))
{
@@ -118,7 +118,7 @@
void skin_init()
{
// load skins
- fs_listdir("data/skins", skinscan, 0);
+ fs_listdir("/usr/share/teeworlds/skins", skinscan, 0);
}
int skin_num()
diff -Naur teeworlds-0.4.3-src.old/src/game/editor/ed_editor.cpp teeworlds-0.4.3-src/src/game/editor/ed_editor.cpp
--- teeworlds-0.4.3-src.old/src/game/editor/ed_editor.cpp 2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/editor/ed_editor.cpp 2008-11-04 18:45:37.000000000 +0100
@@ -422,11 +422,11 @@
// ctrl+o to open
if(inp_key_down('O') && (inp_key_pressed(KEY_LCTRL) || inp_key_pressed(KEY_RCTRL)))
- editor.invoke_file_dialog("Open Map", "Open", "data/maps/", "", callback_open_map);
+ editor.invoke_file_dialog("Open Map", "Open", "/usr/share/teeworlds/maps/", "", callback_open_map);
// ctrl+s to save
if(inp_key_down('S') && (inp_key_pressed(KEY_LCTRL) || inp_key_pressed(KEY_RCTRL)))
- editor.invoke_file_dialog("Save Map", "Save", "data/maps/", "", callback_save_map);
+ editor.invoke_file_dialog("Save Map", "Save", "/usr/share/teeworlds/maps/", "", callback_save_map);
// animate button
ui_vsplit_l(&toolbar, 30.0f, &button, &toolbar);
@@ -1551,7 +1551,7 @@
ui_hsplit_t(&view, 12.0f, &slot, &view);
if(do_editor_button(&replace_button, "Replace", 0, &slot, draw_editor_button_menuitem, 0, "Replaces the image with a new one"))
{
- editor.invoke_file_dialog("Replace Image", "Replace", "data/mapres/", "", replace_image);
+ editor.invoke_file_dialog("Replace Image", "Replace", "/usr/share/teeworlds/mapres/", "", replace_image);
return 1;
}
@@ -1632,7 +1632,7 @@
ui_hsplit_t(&toolbox, 10.0f, &slot, &toolbox);
ui_hsplit_t(&toolbox, 12.0f, &slot, &toolbox);
if(do_editor_button(&new_image_button, "Add", 0, &slot, draw_editor_button, 0, "Load a new image to use in the map"))
- editor.invoke_file_dialog("Add Image", "Add", "data/mapres/", "", add_image);
+ editor.invoke_file_dialog("Add Image", "Add", "/usr/share/teeworlds/mapres/", "", add_image);
}
@@ -2168,7 +2168,7 @@
ui_hsplit_t(&view, 12.0f, &slot, &view);
if(do_editor_button(&open_button, "Open", 0, &slot, draw_editor_button_menuitem, 0, "Opens a map for editing"))
{
- editor.invoke_file_dialog("Open Map", "Open", "data/maps/", "", callback_open_map);
+ editor.invoke_file_dialog("Open Map", "Open", "/usr/share/teeworlds/maps/", "", callback_open_map);
return 1;
}
@@ -2176,7 +2176,7 @@
ui_hsplit_t(&view, 12.0f, &slot, &view);
if(do_editor_button(&append_button, "Append", 0, &slot, draw_editor_button_menuitem, 0, "Opens a map and adds everything from that map to the current one"))
{
- editor.invoke_file_dialog("Append Map", "Append", "data/maps/", "", callback_append_map);
+ editor.invoke_file_dialog("Append Map", "Append", "/usr/share/teeworlds/maps/", "", callback_append_map);
return 1;
}
@@ -2191,7 +2191,7 @@
ui_hsplit_t(&view, 12.0f, &slot, &view);
if(do_editor_button(&save_as_button, "Save As", 0, &slot, draw_editor_button_menuitem, 0, "Saves the current map under a new name"))
{
- editor.invoke_file_dialog("Save Map", "Save", "data/maps/", "", callback_save_map);
+ editor.invoke_file_dialog("Save Map", "Save", "/usr/share/teeworlds/maps/", "", callback_save_map);
return 1;
}
@@ -2402,10 +2402,10 @@
extern "C" void editor_init()
{
- checker_texture = gfx_load_texture("data/editor/checker.png", IMG_AUTO, 0);
- background_texture = gfx_load_texture("data/editor/background.png", IMG_AUTO, 0);
- cursor_texture = gfx_load_texture("data/editor/cursor.png", IMG_AUTO, 0);
- entities_texture = gfx_load_texture("data/editor/entities.png", IMG_AUTO, 0);
+ checker_texture = gfx_load_texture("/usr/share/teeworlds/editor/checker.png", IMG_AUTO, 0);
+ background_texture = gfx_load_texture("/usr/share/teeworlds/editor/background.png", IMG_AUTO, 0);
+ cursor_texture = gfx_load_texture("/usr/share/teeworlds/editor/cursor.png", IMG_AUTO, 0);
+ entities_texture = gfx_load_texture("/usr/share/teeworlds/editor/entities.png", IMG_AUTO, 0);
tileset_picker.make_palette();
tileset_picker.readonly = true;
@@ -2478,13 +2478,13 @@
editor.gui_active = !editor.gui_active;
if(inp_key_down(KEY_F5))
- editor.save("data/maps/debug_test2.map");
+ editor.save("/usr/share/teeworlds/maps/debug_test2.map");
if(inp_key_down(KEY_F6))
- editor.load("data/maps/debug_test2.map");
+ editor.load("/usr/share/teeworlds/maps/debug_test2.map");
if(inp_key_down(KEY_F8))
- editor.load("data/maps/debug_test.map");
+ editor.load("/usr/share/teeworlds/maps/debug_test.map");
if(inp_key_down(KEY_F10))
editor.show_mouse_pointer = false;
diff -Naur teeworlds-0.4.3-src.old/src/game/editor/ed_io.cpp teeworlds-0.4.3-src/src/game/editor/ed_io.cpp
--- teeworlds-0.4.3-src.old/src/game/editor/ed_io.cpp 2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/editor/ed_io.cpp 2008-11-04 18:45:37.000000000 +0100
@@ -398,7 +398,7 @@
if(item->external)
{
char buf[256];
- sprintf(buf, "data/mapres/%s.png", name);
+ sprintf(buf, "/usr/share/teeworlds/mapres/%s.png", name);
// load external
IMAGE imginfo;
teeworlds-extlibs.patch:
--- NEW FILE teeworlds-extlibs.patch ---
* Do not use bundled libraries, link against Fedora-packaged ones
* Substitute compiler flags with a magic string, so we can sed it in SPEC file
- Is there a way to pass BAM parameters? I guess not.
- The magic string is "-D__OPTFLAGS__", which is useful to compile this without sedding
Lubomir Rintel <lkundrak at v3.sk>
diff -up teeworlds-0.4.3-src/default.bam.extlibs teeworlds-0.4.3-src/default.bam
--- teeworlds-0.4.3-src/default.bam.extlibs 2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/default.bam 2009-01-08 15:43:48.000000000 +0100
@@ -214,7 +214,7 @@ function build(settings)
-- set some platform specific settings
settings.cc.includes:add("src")
- settings.cc.includes:add("src/external/zlib")
+ --# settings.cc.includes:add("src/external/zlib")
if family == "unix" then
if platform == "macosx" then
@@ -232,6 +232,7 @@ function build(settings)
end
settings.linker.libs:add("pthread")
+ settings.linker.libs:add("z")
end
elseif family == "windows" then
glfw_platform = "win32"
@@ -245,28 +246,31 @@ function build(settings)
end
-- build glfw
- glfw_settings = settings:copy()
- glfw_settings.cc.includes:add("src/external/glfw/include")
- glfw_settings.cc.includes:add("src/engine/external/glfw/lib")
- glfw_settings.cc.includes:add("src/engine/external/glfw/lib/" .. glfw_platform)
-
- glfw = Compile(glfw_settings, Collect(
- "src/engine/external/glfw/lib/*.c",
- "src/engine/external/glfw/lib/" .. glfw_platform .. "/*.c"))
+ --#plfw_settings = settings:copy()
+ --#plfw_settings.cc.includes:add("src/external/glfw/include")
+ --#plfw_settings.cc.includes:add("src/engine/external/glfw/lib")
+ --#plfw_settings.cc.includes:add("src/engine/external/glfw/lib/" .. glfw_platform)
+
+ --#plfw = Compile(glfw_settings, Collect(
+ --# "src/en--#pine/external/glfw/lib/*.c",
+ --# "src/en--#pine/external/glfw/lib/" .. glfw_platform .. "/*.c"))
-- build portaudio
- pa_settings = settings:copy()
- pa_settings.cc.defines:add("PA_USE_" .. string.upper(pa_hostapi))
- pa_settings.cc.defines:add("PA_NO_WMME")
- pa_settings.cc.defines:add("PA_NO_ASIO")
- pa_settings.cc.includes:add("src/engine/external/portaudio/include")
- pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
- pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform)
-
- portaudio = Compile(pa_settings,
- Collect("src/engine/external/portaudio/src/common/*.c"),
- Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
- Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
+ --#pa_settings = settings:copy()
+ --#pa_settings.cc.defines:add("PA_USE_" .. string.upper(pa_hostapi))
+ --#pa_settings.cc.defines:add("PA_NO_WMME")
+ --#pa_settings.cc.defines:add("PA_NO_ASIO")
+ --#pa_settings.cc.includes:add("src/engine/external/portaudio/include")
+ --#pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
+ --#pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform)
+
+ --#portaudio = Compile(pa_settings,
+ --# Collect("src/engine/external/portaudio/src/common/*.c"),
+ --# Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
+ --# Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
+
+ settings.cc.flags = "-D__OPTFLAGS__"
+ settings.linker.flags = "-D__OPTFLAGS__"
-- build game components
engine_settings = settings:copy()
@@ -275,11 +279,11 @@ function build(settings)
engine_settings.cc.flags = "/wd4244"
else
if platform == "macosx" then
- engine_settings.cc.flags = "-Wall"
+ engine_settings.cc.flags = "-D__OPTFLAGS__"
else
- engine_settings.cc.flags = "-Wall -pedantic-errors"
+ engine_settings.cc.flags = "-D__OPTFLAGS__ -pedantic-errors"
end
- engine_settings.linker.flags = ""
+ engine_settings.linker.flags = "-D__OPTFLAGS__"
end
-- server
@@ -287,7 +291,7 @@ function build(settings)
-- client
client_settings = engine_settings:copy()
- client_settings.cc.includes:add("src/external/glfw/include")
+ --#client_settings.cc.includes:add("src/external/glfw/include")
if family == "unix" then
if platform == "macosx" then
@@ -303,6 +307,10 @@ function build(settings)
client_settings.linker.libs:add("X11")
client_settings.linker.libs:add("GL")
client_settings.linker.libs:add("GLU")
+ client_settings.linker.libs:add("wavpack")
+ client_settings.linker.libs:add("portaudio")
+ client_settings.linker.libs:add("pnglite")
+ client_settings.linker.libs:add("glfw")
end
elseif family == "windows" then
client_settings.linker.libs:add("opengl32.lib")
@@ -311,9 +319,9 @@ function build(settings)
end
external_settings = settings:copy()
- zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
- wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
- pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
+ --#zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
+ --#wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
+ --#pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
engine = Compile(engine_settings, Collect("src/engine/*.c"))
client = Compile(client_settings, Collect("src/engine/client/*.c"))
@@ -333,22 +341,26 @@ function build(settings)
tools = {}
for i,v in objs do
toolname = PathFilename(PathBase(v))
- tools[i] = Link(settings, toolname, v, engine, zlib)
+ tools_settings = settings:copy()
+ if toolname == "tileset_borderfix" or toolname == "dilate" then
+ tools_settings.linker.libs:add("pnglite")
+ end
+ tools[i] = Link(tools_settings, toolname, v, engine)
end
-- build client, server, version server and master server
client_exe = Link(client_settings, "teeworlds", game_shared, game_client,
- engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack,
+ engine, client, game_editor,
client_link_other)
server_exe = Link(server_settings, "teeworlds_srv", engine, server,
- game_shared, game_server, zlib)
+ game_shared, game_server)
versionserver_exe = Link(server_settings, "versionsrv", versionserver,
- engine, zlib)
+ engine)
masterserver_exe = Link(server_settings, "mastersrv", masterserver,
- engine, zlib)
+ engine)
if platform == "macosx" then
osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
diff -up teeworlds-0.4.3-src/src/engine/client/ec_gfx.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_gfx.c
--- teeworlds-0.4.3-src/src/engine/client/ec_gfx.c.extlibs 2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_gfx.c 2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,6 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/external/glfw/include/GL/glfw.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <GL/glfw.h>
+#include <pnglite.h>
#include <engine/e_system.h>
#include <engine/e_client_interface.h>
diff -up teeworlds-0.4.3-src/src/engine/client/ec_inp.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_inp.c
--- teeworlds-0.4.3-src/src/engine/client/ec_inp.c.extlibs 2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_inp.c 2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,6 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
#include <string.h>
-#include <engine/external/glfw/include/GL/glfw.h>
+#include <GL/glfw.h>
#include <engine/e_system.h>
#include <engine/e_client_interface.h>
diff -up teeworlds-0.4.3-src/src/engine/client/ec_snd.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_snd.c
--- teeworlds-0.4.3-src/src/engine/client/ec_snd.c.extlibs 2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_snd.c 2009-01-08 15:42:46.000000000 +0100
@@ -3,8 +3,8 @@
#include <engine/e_client_interface.h>
#include <engine/e_config.h>
-#include <engine/external/portaudio/include/portaudio.h>
-#include <engine/external/wavpack/wavpack.h>
+#include <portaudio.h>
+#include <wavpack/wavpack.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -372,13 +372,6 @@ static void rate_convert(int sid)
}
-static FILE *file = NULL;
-
-static int read_data(void *buffer, int size)
-{
- return fread(buffer, 1, size, file);
-}
-
int snd_load_wv(const char *filename)
{
SAMPLE *snd;
@@ -394,19 +387,12 @@ int snd_load_wv(const char *filename)
if(!sound_enabled)
return 1;
- file = fopen(filename, "rb"); /* TODO: use system.h stuff for this */
- if(!file)
- {
- dbg_msg("sound/wv", "failed to open %s", filename);
- return -1;
- }
-
sid = snd_alloc_id();
if(sid < 0)
return -1;
snd = &samples[sid];
- context = WavpackOpenFileInput(read_data, error);
+ context = WavpackOpenFileInput(filename, error, 0, 0);
if (context)
{
int samples = WavpackGetNumSamples(context);
@@ -461,9 +447,6 @@ int snd_load_wv(const char *filename)
dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
}
- fclose(file);
- file = NULL;
-
if(config.debug)
dbg_msg("sound/wv", "loaded %s", filename);
diff -up teeworlds-0.4.3-src/src/engine/e_datafile.c.extlibs teeworlds-0.4.3-src/src/engine/e_datafile.c
--- teeworlds-0.4.3-src/src/engine/e_datafile.c.extlibs 2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/e_datafile.c 2009-01-08 15:42:46.000000000 +0100
@@ -1,7 +1,7 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
#include "e_system.h"
#include "e_datafile.h"
-#include "external/zlib/zlib.h"
+#include <zlib.h>
static const int DEBUG=0;
diff -up teeworlds-0.4.3-src/src/tools/dilate.c.extlibs teeworlds-0.4.3-src/src/tools/dilate.c
--- teeworlds-0.4.3-src/src/tools/dilate.c.extlibs 2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/tools/dilate.c 2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,9 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
typedef struct pixel_t
{
diff -up teeworlds-0.4.3-src/src/tools/tileset_borderfix.c.extlibs teeworlds-0.4.3-src/src/tools/tileset_borderfix.c
--- teeworlds-0.4.3-src/src/tools/tileset_borderfix.c.extlibs 2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/tools/tileset_borderfix.c 2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,9 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
typedef struct pixel_t
{
--- NEW FILE teeworlds.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=Teeworlds
Type=Application
Terminal=false
Exec=teeworlds
Icon=teeworlds
Comment=Online multi-player platform 2D shooter
Encoding=UTF-8
--- NEW FILE teeworlds.spec ---
Name: teeworlds
Version: 0.4.3
Release: 5%{?dist}
Summary: Online multi-player platform 2D shooter
Group: Amusements/Games
License: Teeworlds
URL: http://www.teeworlds.com/
Source0: http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
Source1: %{name}.png
Source2: %{name}.desktop
Patch0: %{name}-datadir.patch
Patch1: %{name}-extlibs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mesa-libGLU-devel
BuildRequires: bam = 0.0.%{version}
BuildRequires: python-devel
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: zlib-devel
BuildRequires: libglfw-devel
BuildRequires: wavpack-devel
BuildRequires: portaudio-devel
BuildRequires: pnglite-devel
Requires: %{name}-data
%description
The game features cartoon-themed graphics and physics,
and relies heavily on classic shooter weaponry and gameplay.
The controls are heavily inspired by the FPS genre of computer games.
%package server
Summary: Server for %{name}
Group: Amusements/Games
Requires: %{name}-data
%description server
Data for %{name}, an online multi-player platform 2D shooter.
%package data
Summary: Data-files for %{name}
Group: Amusements/Games
%description data
Data-files for %{name}, an online multi-player platform 2D shooter.
%prep
%setup -q -n %{name}-%{version}-src
%patch0 -p1 -b .datadir
%patch1 -p1 -b .extlibs
rm -rf src/engine/external
iconv -f iso-8859-1 -t utf-8 readme.txt > readme.txt.utf8
sed -i 's|\r$||g' readme.txt.utf8
touch -c -r readme.txt readme.txt.utf8
mv readme.txt.utf8 readme.txt
%build
sed 's|-D__OPTFLAGS__|%{optflags}|' -i default.bam
bam -v release
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}/data
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -D -m 0755 %{name} \
%{buildroot}%{_bindir}/%{name}
install -D -m 0755 %{name}_srv \
%{buildroot}%{_bindir}/%{name}-srv
cp -pr data/* \
%{buildroot}%{_datadir}/%{name}
install -p -m 0644 %{SOURCE1} \
%{buildroot}%{_datadir}/pixmaps/%{name}.png
desktop-file-install \
%if 0%{?rhel}
--vendor="" \
%endif
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%files data
%defattr(-,root,root,-)
%{_datadir}/%{name}/
%files server
%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}-srv
%changelog
* Fri Jan 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-5
- Remove requires from subpackage 'data'
- Correct description
* Thu Jan 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-4
- Drop desktop-file and icon for subpackage 'server'
- Honor timestamp for converted file
- Add and correct Lubomir's changes
- Remove all comments
- Correct License-Tag (again)
- Add datadir patch
* Wed Dec 31 2008 Lubomir Rintel <lkundrak at v3.sk> 0.4.3-3
- Outsource the dependencies (extlib-patch)
- Use optflags
* Thu Sep 18 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-2
- Recheck and conform licensing and list it in a comment
- Correct BuildRequires
* Sat Sep 13 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-1
- Initial Release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 4 Jan 2009 20:09:55 -0000 1.1
+++ .cvsignore 8 Jan 2009 14:49:21 -0000 1.2
@@ -0,0 +1,2 @@
+teeworlds-0.4.3-src.tar.gz
+teeworlds.png
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 4 Jan 2009 20:09:55 -0000 1.1
+++ sources 8 Jan 2009 14:49:21 -0000 1.2
@@ -0,0 +1,2 @@
+a31a8cbd1af3f71a462122166e5872d6 teeworlds-0.4.3-src.tar.gz
+d541e3afa7809bd73bb64adb0795cb65 teeworlds.png
- Previous message (by thread): rpms/teeworlds/F-9 teeworlds-datadir.patch, NONE, 1.1 teeworlds-extlibs.patch, NONE, 1.1 teeworlds.desktop, NONE, 1.1 teeworlds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/teeworlds/devel teeworlds-datadir.patch, NONE, 1.1 teeworlds-extlibs.patch, NONE, 1.1 teeworlds.desktop, NONE, 1.1 teeworlds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list