propagate from branch 'org.openembedded.dev' (head 47c2f7f436790105a8af32ec352907b8ff53aba1)

            to branch 'org.openembedded.nslu2-linux' (head a69b542d88fdbf378cd19a8ef701895615c143f7)

9 files changed, 648 insertions, 1 deletions

diff --git a/packages/prboom/files/prboom.sh b/packages/prboom/files/prboom.sh
index 7e41d87fcb..636b17879d 100755
--- a/packages/prboom/files/prboom.sh
+++ b/packages/prboom/files/prboom.sh
@@ -9,6 +9,8 @@ case $model in
 *)		par="";;
 esac
 
+test -e /usr/share/games/doom/prboom.cfg && par="$par -config /usr/share/games/doom/prboom.cfg"
+
 echo "Model: [$model]"
 echo "Launching prboom $par $*"
 
diff --git a/packages/prboom/prboom-devconfig.bb b/packages/prboom/prboom-devconfig.bb
new file mode 100644
index 0000000000..bcfcee14cd
--- /dev/null
+++ b/packages/prboom/prboom-devconfig.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Device specific configuration for prboom"
+SECTION = "games"
+PRIORITY = "optional"
+MAINTAINER = "coredump@handhelds.org"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "file://prboom.cfg"
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} = "/usr/share/games/doom/prboom.cfg"
+
+do_install() {
+	install -d ${D}/usr/share/games/doom/
+	
+	install -m 644 ${WORKDIR}/prboom.cfg ${D}/usr/share/games/doom/
+}
diff --git a/packages/prboom/prboom-devconfig/.mtn2git_empty b/packages/prboom/prboom-devconfig/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/.mtn2git_empty
diff --git a/packages/prboom/prboom-devconfig/akita/.mtn2git_empty b/packages/prboom/prboom-devconfig/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/akita/.mtn2git_empty
diff --git a/packages/prboom/prboom-devconfig/akita/prboom.cfg b/packages/prboom/prboom-devconfig/akita/prboom.cfg
new file mode 100644
index 0000000000..cd17d0baff
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/akita/prboom.cfg
@@ -0,0 +1,313 @@
+# Doom config file
+# Format:
+# variable   value
+
+# Misc settings
+default_compatibility_level    -1
+realtic_clock_rate          100
+max_player_corpse            32
+flashing_hom                  0
+demo_insurance                2
+endoom_mode               0x5
+level_precache                0
+
+# Files
+wadfile_1                 "prboom.wad"
+wadfile_2                 ""
+dehfile_1                 ""
+dehfile_2                 ""
+
+# Game settings
+default_skill                 2
+weapon_recoil                 0
+doom_weapon_toggles           1
+player_bobbing                1
+monsters_remember             1
+monster_infighting            1
+monster_backing               0
+monster_avoid_hazards         1
+monkeys                       0
+monster_friction              1
+help_friends                  1
+player_helpers                0
+friend_distance             128
+dog_jumping                   1
+sts_always_red                1
+sts_pct_always_gray           0
+sts_traditional_keys          0
+traditional_menu              1
+show_messages                 1
+autorun                       0
+
+# Compatibility settings
+comp_zombie                   0
+comp_infcheat                 0
+comp_stairs                   0
+comp_telefrag                 0
+comp_dropoff                  0
+comp_falloff                  0
+comp_staylift                 0
+comp_doorstuck                0
+comp_pursuit                  0
+comp_vile                     0
+comp_pain                     0
+comp_skull                    0
+comp_blazing                  0
+comp_doorlight                0
+comp_god                      0
+comp_skymap                   0
+comp_floors                   0
+comp_model                    0
+comp_zerotags                 0
+comp_moveblock                0
+comp_sound                    0
+
+# Sound settings
+sound_card                   -1
+music_card                   -1
+pitched_sounds                0
+samplerate                22050
+sfx_volume                    8
+music_volume                  8
+mus_pause_opt                 2
+sounddev                  "/dev/dsp"
+snd_channels                  8
+
+# Video settings
+screen_width                540
+screen_height               380
+fake_contrast                 1
+use_fullscreen                1
+use_doublebuffer              1
+translucency                  1
+tran_filter_pct              66
+screenblocks                 10
+usegamma                      3
+X_options                 0x0
+
+# Mouse settings
+use_mouse                     1
+mouse_sensitivity_horiz      10
+mouse_sensitivity_vert       10
+mouseb_fire                   0
+mouseb_strafe                 1
+mouseb_forward                2
+
+# Key bindings
+key_right                 0xae
+key_left                  0xac
+key_up                    0xad
+key_down                  0xaf
+key_menu_right            0xae
+key_menu_left             0xac
+key_menu_up               0xad
+key_menu_down             0xaf
+key_menu_backspace        0x7f
+key_menu_escape           0x1b
+key_menu_enter            0x10d
+key_strafeleft            0x2c
+key_straferight           0x2e
+key_fire                  0x10d
+key_use                   0x20
+key_strafe                0xb8
+key_speed                 0xb6
+key_savegame              0xbc
+key_loadgame              0xbd
+key_soundvolume           0xbe
+key_hud                   0xbf
+key_quicksave             0xc0
+key_endgame               0xc1
+key_messages              0xc2
+key_quickload             0xc3
+key_quit                  0xc4
+key_gamma                 0xd7
+key_spy                   0xd8
+key_pause                 0xff
+key_autorun               0xba
+key_chat                  0x74
+key_backspace             0x7f
+key_enter                 0xd
+key_map                   0x9
+key_map_right             0xae
+key_map_left              0xac
+key_map_up                0xad
+key_map_down              0xaf
+key_map_zoomin            0x3d
+key_map_zoomout           0x2d
+key_map_gobig             0x30
+key_map_follow            0x66
+key_map_mark              0x6d
+key_map_clear             0x63
+key_map_grid              0x67
+key_map_rotate            0x72
+key_map_overlay           0x6f
+key_reverse               0x2f
+key_zoomin                0x3d
+key_zoomout               0x2d
+key_chatplayer1           0x67
+key_chatplayer2           0x69
+key_chatplayer3           0x62
+key_chatplayer4           0x72
+key_weapontoggle          0x30
+key_weapon1               0x31
+key_weapon2               0x32
+key_weapon3               0x33
+key_weapon4               0x34
+key_weapon5               0x35
+key_weapon6               0x36
+key_weapon7               0x37
+key_weapon8               0x38
+key_weapon9               0x39
+key_screenshot            0x2a
+
+# Joystick settings
+use_joystick                  0
+joy_left                      0
+joy_right                     0
+joy_up                        0
+joy_down                      0
+joyb_fire                     0
+joyb_strafe                   1
+joyb_speed                    2
+joyb_use                      3
+
+# Chat macros
+chatmacro0                "No"
+chatmacro1                "I'm ready to kick butt!"
+chatmacro2                "I'm OK."
+chatmacro3                "I'm not looking too good!"
+chatmacro4                "Help!"
+chatmacro5                "You suck!"
+chatmacro6                "Next time, scumbag..."
+chatmacro7                "Come here!"
+chatmacro8                "I'll take care of it."
+chatmacro9                "Yes"
+
+# Automap settings
+mapcolor_back             0xf7
+mapcolor_grid             0x68
+mapcolor_wall             0x17
+mapcolor_fchg             0x37
+mapcolor_cchg             0xd7
+mapcolor_clsd             0xd0
+mapcolor_rkey             0xaf
+mapcolor_bkey             0xcc
+mapcolor_ykey             0xe7
+mapcolor_rdor             0xaf
+mapcolor_bdor             0xcc
+mapcolor_ydor             0xe7
+mapcolor_tele             0x77
+mapcolor_secr             0xfc
+mapcolor_exit             0x0
+mapcolor_unsn             0x68
+mapcolor_flat             0x58
+mapcolor_sprt             0x70
+mapcolor_item             0xe7
+mapcolor_hair             0xd0
+mapcolor_sngl             0xd0
+mapcolor_me               0x70
+mapcolor_frnd             0x70
+map_secret_after              0
+map_point_coord               0
+automapmode               0x0
+
+# Heads-up display settings
+hudcolor_titl                 5
+hudcolor_xyco                 3
+hudcolor_mesg                 6
+hudcolor_chat                 5
+hudcolor_list                 5
+hud_msg_lines                 1
+hud_list_bgon                 0
+hud_distributed               0
+health_red                   25
+health_yellow                50
+health_green                100
+armor_red                    25
+armor_yellow                 50
+armor_green                 100
+ammo_red                     25
+ammo_yellow                  50
+hud_active                    2
+hud_displayed                 0
+hud_nosecrets                 0
+
+# Weapon preferences
+weapon_choice_1               6
+weapon_choice_2               9
+weapon_choice_3               4
+weapon_choice_4               3
+weapon_choice_5               2
+weapon_choice_6               8
+weapon_choice_7               5
+weapon_choice_8               7
+weapon_choice_9               1
+
+# Music
+mus_e1m1                  "e1m1.mp3"
+mus_e1m2                  "e1m2.mp3"
+mus_e1m3                  "e1m3.mp3"
+mus_e1m4                  "e1m4.mp3"
+mus_e1m5                  "e1m5.mp3"
+mus_e1m6                  "e1m6.mp3"
+mus_e1m7                  "e1m7.mp3"
+mus_e1m8                  "e1m8.mp3"
+mus_e1m9                  "e1m9.mp3"
+mus_e2m1                  "e2m1.mp3"
+mus_e2m2                  "e2m2.mp3"
+mus_e2m3                  "e2m3.mp3"
+mus_e2m4                  "e2m4.mp3"
+mus_e2m5                  "e1m7.mp3"
+mus_e2m6                  "e2m6.mp3"
+mus_e2m7                  "e2m7.mp3"
+mus_e2m8                  "e2m8.mp3"
+mus_e2m9                  "e3m1.mp3"
+mus_e3m1                  "e3m1.mp3"
+mus_e3m2                  "e3m2.mp3"
+mus_e3m3                  "e3m3.mp3"
+mus_e3m4                  "e1m8.mp3"
+mus_e3m5                  "e1m7.mp3"
+mus_e3m6                  "e1m6.mp3"
+mus_e3m7                  "e2m7.mp3"
+mus_e3m8                  "e3m8.mp3"
+mus_e3m9                  "e1m9.mp3"
+mus_inter                 "e2m3.mp3"
+mus_intro                 "intro.mp3"
+mus_bunny                 "bunny.mp3"
+mus_victor                "victor.mp3"
+mus_introa                "intro.mp3"
+mus_runnin                "runnin.mp3"
+mus_stalks                "stalks.mp3"
+mus_countd                "countd.mp3"
+mus_betwee                "betwee.mp3"
+mus_doom                  "doom.mp3"
+mus_the_da                "the_da.mp3"
+mus_shawn                 "shawn.mp3"
+mus_ddtblu                "ddtblu.mp3"
+mus_in_cit                "in_cit.mp3"
+mus_dead                  "dead.mp3"
+mus_stlks2                "stalks.mp3"
+mus_theda2                "the_da.mp3"
+mus_doom2                 "doom.mp3"
+mus_ddtbl2                "ddtblu.mp3"
+mus_runni2                "runnin.mp3"
+mus_dead2                 "dead.mp3"
+mus_stlks3                "stalks.mp3"
+mus_romero                "romero.mp3"
+mus_shawn2                "shawn.mp3"
+mus_messag                "messag.mp3"
+mus_count2                "countd.mp3"
+mus_ddtbl3                "ddtblu.mp3"
+mus_ampie                 "ampie.mp3"
+mus_theda3                "the_da.mp3"
+mus_adrian                "adrian.mp3"
+mus_messg2                "messag.mp3"
+mus_romer2                "romero.mp3"
+mus_tense                 "tense.mp3"
+mus_shawn3                "shawn.mp3"
+mus_openin                "openin.mp3"
+mus_evil                  "evil.mp3"
+mus_ultima                "ultima.mp3"
+mus_read_m                "read_m.mp3"
+mus_dm2ttl                "dm2ttl.mp3"
+mus_dm2int                "dm2int.mp3"
diff --git a/packages/prboom/prboom-devconfig/collie/.mtn2git_empty b/packages/prboom/prboom-devconfig/collie/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/collie/.mtn2git_empty
diff --git a/packages/prboom/prboom-devconfig/collie/prboom.cfg b/packages/prboom/prboom-devconfig/collie/prboom.cfg
new file mode 100644
index 0000000000..67703acf8c
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/collie/prboom.cfg
@@ -0,0 +1,313 @@
+# Doom config file
+# Format:
+# variable   value
+
+# Misc settings
+default_compatibility_level    -1
+realtic_clock_rate          100
+max_player_corpse            32
+flashing_hom                  0
+demo_insurance                2
+endoom_mode               0x5
+level_precache                0
+
+# Files
+wadfile_1                 "prboom.wad"
+wadfile_2                 ""
+dehfile_1                 ""
+dehfile_2                 ""
+
+# Game settings
+default_skill                 3
+weapon_recoil                 1
+doom_weapon_toggles           1
+player_bobbing                1
+monsters_remember             1
+monster_infighting            1
+monster_backing               1
+monster_avoid_hazards         1
+monkeys                       1
+monster_friction              1
+help_friends                  1
+player_helpers                0
+friend_distance             128
+dog_jumping                   1
+sts_always_red                0
+sts_pct_always_gray           1
+sts_traditional_keys          0
+traditional_menu              0
+show_messages                 1
+autorun                       1
+
+# Compatibility settings
+comp_zombie                   0
+comp_infcheat                 0
+comp_stairs                   0
+comp_telefrag                 1
+comp_dropoff                  0
+comp_falloff                  0
+comp_staylift                 0
+comp_doorstuck                0
+comp_pursuit                  0
+comp_vile                     0
+comp_pain                     0
+comp_skull                    0
+comp_blazing                  0
+comp_doorlight                0
+comp_god                      0
+comp_skymap                   0
+comp_floors                   0
+comp_model                    0
+comp_zerotags                 0
+comp_moveblock                0
+comp_sound                    0
+
+# Sound settings
+sound_card                   -1
+music_card                   -1
+pitched_sounds                0
+samplerate                22050
+sfx_volume                    8
+music_volume                  8
+mus_pause_opt                 2
+sounddev                  "/dev/dsp"
+snd_channels                  8
+
+# Video settings
+screen_width                320
+screen_height               240
+fake_contrast                 1
+use_fullscreen                1
+use_doublebuffer              1
+translucency                  1
+tran_filter_pct              66
+screenblocks                 10
+usegamma                      4
+X_options                 0x0
+
+# Mouse settings
+use_mouse                     1
+mouse_sensitivity_horiz      10
+mouse_sensitivity_vert       10
+mouseb_fire                   0
+mouseb_strafe                 1
+mouseb_forward                2
+
+# Key bindings
+key_right                 0xae
+key_left                  0xac
+key_up                    0xad
+key_down                  0xaf
+key_menu_right            0xae
+key_menu_left             0xac
+key_menu_up               0xad
+key_menu_down             0xaf
+key_menu_backspace        0x7f
+key_menu_escape           0x1b
+key_menu_enter            0x20
+key_strafeleft            0x2c
+key_straferight           0x2e
+key_fire                  0x20
+key_use                   0xc3
+key_strafe                0xb8
+key_speed                 0xb6
+key_savegame              0xbc
+key_loadgame              0xbd
+key_soundvolume           0xbe
+key_hud                   0xbf
+key_quicksave             0xc0
+key_endgame               0xc1
+key_messages              0xc2
+key_quickload             0xd
+key_quit                  0xc4
+key_gamma                 0xd7
+key_spy                   0xd8
+key_pause                 0xff
+key_autorun               0xba
+key_chat                  0x74
+key_backspace             0x7f
+key_enter                 0xd
+key_map                   0x126
+key_map_right             0xad
+key_map_left              0xaf
+key_map_up                0xac
+key_map_down              0xae
+key_map_zoomin            0x3d
+key_map_zoomout           0x2d
+key_map_gobig             0x30
+key_map_follow            0x66
+key_map_mark              0x6d
+key_map_clear             0x63
+key_map_grid              0x67
+key_map_rotate            0x72
+key_map_overlay           0x6f
+key_reverse               0x2f
+key_zoomin                0x3d
+key_zoomout               0x2d
+key_chatplayer1           0x67
+key_chatplayer2           0x69
+key_chatplayer3           0x62
+key_chatplayer4           0x72
+key_weapontoggle          0x30
+key_weapon1               0x31
+key_weapon2               0x32
+key_weapon3               0x33
+key_weapon4               0x34
+key_weapon5               0x35
+key_weapon6               0x36
+key_weapon7               0x37
+key_weapon8               0x38
+key_weapon9               0x39
+key_screenshot            0x2a
+
+# Joystick settings
+use_joystick                  0
+joy_left                      0
+joy_right                     0
+joy_up                        0
+joy_down                      0
+joyb_fire                     0
+joyb_strafe                   1
+joyb_speed                    2
+joyb_use                      3
+
+# Chat macros
+chatmacro0                "No"
+chatmacro1                "I'm ready to kick butt!"
+chatmacro2                "I'm OK."
+chatmacro3                "I'm not looking too good!"
+chatmacro4                "Help!"
+chatmacro5                "You suck!"
+chatmacro6                "Next time, scumbag..."
+chatmacro7                "Come here!"
+chatmacro8                "I'll take care of it."
+chatmacro9                "Yes"
+
+# Automap settings
+mapcolor_back             0xf7
+mapcolor_grid             0x68
+mapcolor_wall             0x17
+mapcolor_fchg             0x37
+mapcolor_cchg             0xd7
+mapcolor_clsd             0xd0
+mapcolor_rkey             0xaf
+mapcolor_bkey             0xcc
+mapcolor_ykey             0xe7
+mapcolor_rdor             0xaf
+mapcolor_bdor             0xcc
+mapcolor_ydor             0xe7
+mapcolor_tele             0x77
+mapcolor_secr             0xfc
+mapcolor_exit             0x0
+mapcolor_unsn             0x68
+mapcolor_flat             0x58
+mapcolor_sprt             0x70
+mapcolor_item             0xe7
+mapcolor_hair             0xd0
+mapcolor_sngl             0xd0
+mapcolor_me               0x70
+mapcolor_frnd             0x70
+map_secret_after              0
+map_point_coord               0
+automapmode               0x0
+
+# Heads-up display settings
+hudcolor_titl                 5
+hudcolor_xyco                 3
+hudcolor_mesg                 6
+hudcolor_chat                 5
+hudcolor_list                 5
+hud_msg_lines                 1
+hud_list_bgon                 0
+hud_distributed               0
+health_red                   25
+health_yellow                50
+health_green                100
+armor_red                    25
+armor_yellow                 50
+armor_green                 100
+ammo_red                     25
+ammo_yellow                  50
+hud_active                    2
+hud_displayed                 0
+hud_nosecrets                 0
+
+# Weapon preferences
+weapon_choice_1               6
+weapon_choice_2               9
+weapon_choice_3               4
+weapon_choice_4               3
+weapon_choice_5               2
+weapon_choice_6               8
+weapon_choice_7               5
+weapon_choice_8               7
+weapon_choice_9               1
+
+# Music
+mus_e1m1                  "e1m1.mp3"
+mus_e1m2                  "e1m2.mp3"
+mus_e1m3                  "e1m3.mp3"
+mus_e1m4                  "e1m4.mp3"
+mus_e1m5                  "e1m5.mp3"
+mus_e1m6                  "e1m6.mp3"
+mus_e1m7                  "e1m7.mp3"
+mus_e1m8                  "e1m8.mp3"
+mus_e1m9                  "e1m9.mp3"
+mus_e2m1                  "e2m1.mp3"
+mus_e2m2                  "e2m2.mp3"
+mus_e2m3                  "e2m3.mp3"
+mus_e2m4                  "e2m4.mp3"
+mus_e2m5                  "e1m7.mp3"
+mus_e2m6                  "e2m6.mp3"
+mus_e2m7                  "e2m7.mp3"
+mus_e2m8                  "e2m8.mp3"
+mus_e2m9                  "e3m1.mp3"
+mus_e3m1                  "e3m1.mp3"
+mus_e3m2                  "e3m2.mp3"
+mus_e3m3                  "e3m3.mp3"
+mus_e3m4                  "e1m8.mp3"
+mus_e3m5                  "e1m7.mp3"
+mus_e3m6                  "e1m6.mp3"
+mus_e3m7                  "e2m7.mp3"
+mus_e3m8                  "e3m8.mp3"
+mus_e3m9                  "e1m9.mp3"
+mus_inter                 "e2m3.mp3"
+mus_intro                 "intro.mp3"
+mus_bunny                 "bunny.mp3"
+mus_victor                "victor.mp3"
+mus_introa                "intro.mp3"
+mus_runnin                "runnin.mp3"
+mus_stalks                "stalks.mp3"
+mus_countd                "countd.mp3"
+mus_betwee                "betwee.mp3"
+mus_doom                  "doom.mp3"
+mus_the_da                "the_da.mp3"
+mus_shawn                 "shawn.mp3"
+mus_ddtblu                "ddtblu.mp3"
+mus_in_cit                "in_cit.mp3"
+mus_dead                  "dead.mp3"
+mus_stlks2                "stalks.mp3"
+mus_theda2                "the_da.mp3"
+mus_doom2                 "doom.mp3"
+mus_ddtbl2                "ddtblu.mp3"
+mus_runni2                "runnin.mp3"
+mus_dead2                 "dead.mp3"
+mus_stlks3                "stalks.mp3"
+mus_romero                "romero.mp3"
+mus_shawn2                "shawn.mp3"
+mus_messag                "messag.mp3"
+mus_count2                "countd.mp3"
+mus_ddtbl3                "ddtblu.mp3"
+mus_ampie                 "ampie.mp3"
+mus_theda3                "the_da.mp3"
+mus_adrian                "adrian.mp3"
+mus_messg2                "messag.mp3"
+mus_romer2                "romero.mp3"
+mus_tense                 "tense.mp3"
+mus_shawn3                "shawn.mp3"
+mus_openin                "openin.mp3"
+mus_evil                  "evil.mp3"
+mus_ultima                "ultima.mp3"
+mus_read_m                "read_m.mp3"
+mus_dm2ttl                "dm2ttl.mp3"
+mus_dm2int                "dm2int.mp3"
diff --git a/packages/prboom/prboom-devconfig/prboom.cfg b/packages/prboom/prboom-devconfig/prboom.cfg
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/prboom.cfg
@@ -0,0 +1 @@
+
diff --git a/packages/prboom/prboom-opie_2.2.6.bb b/packages/prboom/prboom-opie_2.2.6.bb
index 1ab4227619..098bd028cb 100644
--- a/packages/prboom/prboom-opie_2.2.6.bb
+++ b/packages/prboom/prboom-opie_2.2.6.bb
@@ -1,6 +1,6 @@
 include prboom_${PV}.bb
 
-PR = "r5"
+PR = "r6"
 
 S = "${WORKDIR}/prboom-${PV}"