From 34085b8163276fb0101b108ba030b36d5c2acbfd48239e38e4dd2f7e8ada9485 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 18 Apr 2013 12:07:35 +0000 Subject: [PATCH] prboom-plus-2.5.1.3 OBS-URL: https://build.opensuse.org/package/show/games/prboom-plus?expand=0&rev=9 --- prboom-enable-tessellation.diff | 10 +- prboom-plus-2.5.1.1+.tar.xz | 3 - prboom-plus-2.5.1.3.tar.xz | 3 + prboom-plus.changes | 17 ++++ prboom-plus.spec | 16 +++- prboom-protos.diff | 162 -------------------------------- prboom-types1.diff | 24 +---- prboom-types2.diff | 40 ++++---- 8 files changed, 61 insertions(+), 214 deletions(-) delete mode 100644 prboom-plus-2.5.1.1+.tar.xz create mode 100644 prboom-plus-2.5.1.3.tar.xz delete mode 100644 prboom-protos.diff diff --git a/prboom-enable-tessellation.diff b/prboom-enable-tessellation.diff index 2e4a580..a1fe732 100644 --- a/prboom-enable-tessellation.diff +++ b/prboom-enable-tessellation.diff @@ -10,11 +10,11 @@ be rendered. src/gl_main.c | 3 +++ 1 file changed, 3 insertions(+) -Index: prboom-plus-2.5.1.1/src/gl_main.c +Index: prboom-plus-2.5.1.3/src/gl_main.c =================================================================== ---- prboom-plus-2.5.1.1.orig/src/gl_main.c -+++ prboom-plus-2.5.1.1/src/gl_main.c -@@ -83,6 +83,9 @@ +--- prboom-plus-2.5.1.3.orig/src/gl_main.c ++++ prboom-plus-2.5.1.3/src/gl_main.c +@@ -73,6 +73,9 @@ #ifdef USE_CUSTOM_QSORT #include "qsort.h" #endif @@ -22,5 +22,5 @@ Index: prboom-plus-2.5.1.1/src/gl_main.c +# define USE_GLU_TESS 1 +#endif - int triangulate_subsectors = 0; // All OpenGL extentions will be disabled in gl_compatibility mode + int gl_compatibility = 0; diff --git a/prboom-plus-2.5.1.1+.tar.xz b/prboom-plus-2.5.1.1+.tar.xz deleted file mode 100644 index f291ad7..0000000 --- a/prboom-plus-2.5.1.1+.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:248f0f5f97e36fa23c517cee6eb7960f1a92649c7b95b70e757ba00b6377eb1c -size 986440 diff --git a/prboom-plus-2.5.1.3.tar.xz b/prboom-plus-2.5.1.3.tar.xz new file mode 100644 index 0000000..f17e524 --- /dev/null +++ b/prboom-plus-2.5.1.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a66ea73a119c67b9a93b2b326d6bfa2879cb8e3f7dacc164d656fbd9fbd5f809 +size 1016920 diff --git a/prboom-plus.changes b/prboom-plus.changes index 2501d3d..dc438fa 100644 --- a/prboom-plus.changes +++ b/prboom-plus.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sun Mar 24 13:35:18 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 2.5.1.3 +* Added device selection to portmidi player. Controlled by the + snd_mididev config variable. See stdout.txt for list of + available devices. +* Added a progress bar for demo skipping during re-recording. +* Added key binding options for start/stop and fast-forward when + watching demos. +* Added a key binding option to restart the current map. +* Added a "Default compatibility level" GUI entry. +* Support for 16 sprite rotations. http://zdoom.org/wiki/Sprite#Angles +* New HUDs. HUDs definitions are moved to the + "prboom-plus.wad/-prbhud-" lump. +- Remove prboom-protos.diff, merged upstream + ------------------------------------------------------------------- Fri May 25 20:32:53 UTC 2012 - joop.boonen@opensuse.org diff --git a/prboom-plus.spec b/prboom-plus.spec index 337dd2e..235d595 100644 --- a/prboom-plus.spec +++ b/prboom-plus.spec @@ -1,7 +1,7 @@ # # spec file for package prboom-plus # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: prboom-plus -Version: 2.5.1.1 +Version: 2.5.1.3 Release: 0 Summary: Open source port of the DOOM game engine License: GPL-2.0+ Group: Amusements/Games/3D/Shoot Url: http://prboom-plus.sourceforge.net/ -Source: %name-%{version}+.tar.xz + +#Freecode-URL: http://freecode.com/projects/prboom-plus +#DL-URL: http://downloads.sf.net/prboom-plus/prboom-plus-2.5.1.3.tar.gz +Source: %name-%version.tar.xz Patch1: prboom-nodatetime.diff Patch2: prboom-types1.diff Patch3: prboom-types2.diff -Patch4: prboom-protos.diff Patch5: prboom-enable-tessellation.diff Source2: clean_source.sh BuildRequires: Mesa-devel @@ -64,7 +67,7 @@ never happen in the future since compatibility is as important. %prep %setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +%patch -P 1 -P 2 -P 3 -P 5 -p1 %build ./bootstrap; @@ -83,6 +86,9 @@ mv "$b/%_prefix/games"/* "$b/%_bindir/"; # Convenience symlink ln -s prboom-plus "$b/%_bindir/prboom"; +%post +echo "INFO: %name: The global IWAD directory is %_datadir/doom."; + %files %defattr(-,root,root) %doc NEWS AUTHORS README diff --git a/prboom-protos.diff b/prboom-protos.diff deleted file mode 100644 index cb1a976..0000000 --- a/prboom-protos.diff +++ /dev/null @@ -1,162 +0,0 @@ -From: Jan Engelhardt - -build: fix compiler warnings about prototypes - -p_enemy.c: In function 'A_KeenDie': -p_enemy.c:1023:3: warning: call to function 'A_Fall' without a real prototype -p_enemy.h:59:6: note: 'A_Fall' was declared here -p_enemy.c: In function 'A_Chase': -p_enemy.c:1147:5: warning: call to function 'A_FaceTarget' without a real prototype -p_enemy.h:63:6: note: 'A_FaceTarget' was declared here -p_enemy.c: In function 'A_StartFire': -p_enemy.c:1755:3: warning: call to function 'A_Fire' without a real prototype -p_enemy.h:72:6: note: 'A_Fire' was declared here -p_enemy.c: In function 'A_FireCrackle': -p_enemy.c:1761:3: warning: call to function 'A_Fire' without a real prototype -p_enemy.h:72:6: note: 'A_Fire' was declared here -p_enemy.c: In function 'A_PainDie': -p_enemy.c:2067:3: warning: call to function 'A_Fall' without a real prototype -p_enemy.h:59:6: note: 'A_Fall' was declared here -p_enemy.c: In function 'A_CloseShotgun2': -p_enemy.c:2326:3: warning: call to function 'A_ReFire' without a real prototype -p_pspr.h:100:6: note: 'A_ReFire' was declared here -p_enemy.c: In function 'A_SpawnSound': -p_enemy.c:2457:3: warning: call to function 'A_SpawnFly' without a real prototype -p_enemy.h:105:6: note: 'A_SpawnFly' was declared here - ---- - src/p_enemy.h | 122 +++++++++++++++++++++++++++++----------------------------- - 1 file changed, 61 insertions(+), 61 deletions(-) - -Index: prboom-plus-2.5.1.1/src/p_enemy.h -=================================================================== ---- prboom-plus-2.5.1.1.orig/src/p_enemy.h -+++ prboom-plus-2.5.1.1/src/p_enemy.h -@@ -53,66 +53,66 @@ extern struct brain_s { /* killo - // allows more extensive changes (see d_deh.c) - - // Doesn't work with g++, needs actionf_p1 --void A_Explode(); --void A_Pain(); --void A_PlayerScream(); --void A_Fall(); --void A_XScream(); --void A_Look(); --void A_Chase(); --void A_FaceTarget(); --void A_PosAttack(); --void A_Scream(); --void A_SPosAttack(); --void A_VileChase(); --void A_VileStart(); --void A_VileTarget(); --void A_VileAttack(); --void A_StartFire(); --void A_Fire(); --void A_FireCrackle(); --void A_Tracer(); --void A_SkelWhoosh(); --void A_SkelFist(); --void A_SkelMissile(); --void A_FatRaise(); --void A_FatAttack1(); --void A_FatAttack2(); --void A_FatAttack3(); --void A_BossDeath(); --void A_CPosAttack(); --void A_CPosRefire(); --void A_TroopAttack(); --void A_SargAttack(); --void A_HeadAttack(); --void A_BruisAttack(); --void A_SkullAttack(); --void A_Metal(); --void A_SpidRefire(); --void A_BabyMetal(); --void A_BspiAttack(); --void A_Hoof(); --void A_CyberAttack(); --void A_PainAttack(); --void A_PainDie(); --void A_KeenDie(); --void A_BrainPain(); --void A_BrainScream(); --void A_BrainDie(); --void A_BrainAwake(); --void A_BrainSpit(); --void A_SpawnSound(); --void A_SpawnFly(); --void A_BrainExplode(); --void A_Die(); --void A_Detonate(); /* killough 8/9/98: detonate a bomb or other device */ --void A_Mushroom(); /* killough 10/98: mushroom effect */ --void A_Spawn(); // killough 11/98 --void A_Turn(); // killough 11/98 --void A_Face(); // killough 11/98 --void A_Scratch(); // killough 11/98 --void A_PlaySound(); // killough 11/98 --void A_RandomJump(); // killough 11/98 --void A_LineEffect(); // killough 11/98 -+void A_Explode(mobj_t *); -+void A_Pain(mobj_t *); -+void A_PlayerScream(mobj_t *); -+void A_Fall(mobj_t *); -+void A_XScream(mobj_t *); -+void A_Look(mobj_t *); -+void A_Chase(mobj_t *); -+void A_FaceTarget(mobj_t *); -+void A_PosAttack(mobj_t *); -+void A_Scream(mobj_t *); -+void A_SPosAttack(mobj_t *); -+void A_VileChase(mobj_t *); -+void A_VileStart(mobj_t *); -+void A_VileTarget(mobj_t *); -+void A_VileAttack(mobj_t *); -+void A_StartFire(mobj_t *); -+void A_Fire(mobj_t *); -+void A_FireCrackle(mobj_t *); -+void A_Tracer(mobj_t *); -+void A_SkelWhoosh(mobj_t *); -+void A_SkelFist(mobj_t *); -+void A_SkelMissile(mobj_t *); -+void A_FatRaise(mobj_t *); -+void A_FatAttack1(mobj_t *); -+void A_FatAttack2(mobj_t *); -+void A_FatAttack3(mobj_t *); -+void A_BossDeath(mobj_t *); -+void A_CPosAttack(mobj_t *); -+void A_CPosRefire(mobj_t *); -+void A_TroopAttack(mobj_t *); -+void A_SargAttack(mobj_t *); -+void A_HeadAttack(mobj_t *); -+void A_BruisAttack(mobj_t *); -+void A_SkullAttack(mobj_t *); -+void A_Metal(mobj_t *); -+void A_SpidRefire(mobj_t *); -+void A_BabyMetal(mobj_t *); -+void A_BspiAttack(mobj_t *); -+void A_Hoof(mobj_t *); -+void A_CyberAttack(mobj_t *); -+void A_PainAttack(mobj_t *); -+void A_PainDie(mobj_t *); -+void A_KeenDie(mobj_t *); -+void A_BrainPain(mobj_t *); -+void A_BrainScream(mobj_t *); -+void A_BrainDie(mobj_t *); -+void A_BrainAwake(mobj_t *); -+void A_BrainSpit(mobj_t *); -+void A_SpawnSound(mobj_t *); -+void A_SpawnFly(mobj_t *); -+void A_BrainExplode(mobj_t *); -+void A_Die(mobj_t *); -+void A_Detonate(mobj_t *); /* killough 8/9/98: detonate a bomb or other device */ -+void A_Mushroom(mobj_t *); /* killough 10/98: mushroom effect */ -+void A_Spawn(mobj_t *); // killough 11/98 -+void A_Turn(mobj_t *); // killough 11/98 -+void A_Face(mobj_t *); // killough 11/98 -+void A_Scratch(mobj_t *); // killough 11/98 -+void A_PlaySound(mobj_t *); // killough 11/98 -+void A_RandomJump(mobj_t *); // killough 11/98 -+void A_LineEffect(mobj_t *); // killough 11/98 - - #endif // __P_ENEMY__ diff --git a/prboom-types1.diff b/prboom-types1.diff index ba6a2ed..5e8b7ac 100644 --- a/prboom-types1.diff +++ b/prboom-types1.diff @@ -12,14 +12,13 @@ so %t is required. --- src/MUSIC/oplplayer.c | 2 +- - src/gl_main.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: prboom-plus-2.5.1.1/src/MUSIC/oplplayer.c +Index: prboom-plus-2.5.1.3/src/MUSIC/oplplayer.c =================================================================== ---- prboom-plus-2.5.1.1.orig/src/MUSIC/oplplayer.c -+++ prboom-plus-2.5.1.1/src/MUSIC/oplplayer.c -@@ -1344,7 +1344,7 @@ static const void *I_OPL_RegisterSong(co +--- prboom-plus-2.5.1.3.orig/src/MUSIC/oplplayer.c ++++ prboom-plus-2.5.1.3/src/MUSIC/oplplayer.c +@@ -1356,7 +1356,7 @@ static const void *I_OPL_RegisterSong(co // time numbers we have to traverse the tracks and everything if (mf.len < 100) { @@ -28,16 +27,3 @@ Index: prboom-plus-2.5.1.1/src/MUSIC/oplplayer.c return NULL; } -Index: prboom-plus-2.5.1.1/src/gl_main.c -=================================================================== ---- prboom-plus-2.5.1.1.orig/src/gl_main.c -+++ prboom-plus-2.5.1.1/src/gl_main.c -@@ -1304,7 +1304,7 @@ static void gld_FlatConvexCarver(int ssi - - if(!numedgepoints) - { -- if (levelinfo) fprintf(levelinfo, "All carved away: subsector %i - sector %i\n", ssec-subsectors, ssec->sector->iSectorID); -+ if (levelinfo) fprintf(levelinfo, "All carved away: subsector %td - sector %i\n", ssec-subsectors, ssec->sector->iSectorID); - } - else - { diff --git a/prboom-types2.diff b/prboom-types2.diff index 61b107e..dc66c34 100644 --- a/prboom-types2.diff +++ b/prboom-types2.diff @@ -12,10 +12,10 @@ p_saveg.c:66:9: warning: cast from pointer to integer of different size src/r_drawflush.inl | 4 +++- 3 files changed, 21 insertions(+), 17 deletions(-) -Index: prboom-plus-2.5.1.1/src/g_overflow.c +Index: prboom-plus-2.5.1.3/src/g_overflow.c =================================================================== ---- prboom-plus-2.5.1.1.orig/src/g_overflow.c -+++ prboom-plus-2.5.1.1/src/g_overflow.c +--- prboom-plus-2.5.1.3.orig/src/g_overflow.c ++++ prboom-plus-2.5.1.3/src/g_overflow.c @@ -35,6 +35,7 @@ #include "config.h" #endif @@ -33,10 +33,10 @@ Index: prboom-plus-2.5.1.1/src/g_overflow.c } } } -Index: prboom-plus-2.5.1.1/src/p_saveg.c +Index: prboom-plus-2.5.1.3/src/p_saveg.c =================================================================== ---- prboom-plus-2.5.1.1.orig/src/p_saveg.c -+++ prboom-plus-2.5.1.1/src/p_saveg.c +--- prboom-plus-2.5.1.3.orig/src/p_saveg.c ++++ prboom-plus-2.5.1.3/src/p_saveg.c @@ -31,6 +31,7 @@ * *-----------------------------------------------------------------------------*/ @@ -69,10 +69,10 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c if (th->function == P_MobjThinker) - th->prev = (thinker_t *) ++number_of_thinkers; + th->prev = (thinker_t *)(uintptr_t) ++number_of_thinkers; - } + } // phares 9/13/98: Moved this code outside of P_ArchiveThinkers so the -@@ -497,10 +498,10 @@ void P_UnArchiveThinkers (void) +@@ -500,10 +501,10 @@ void P_UnArchiveThinkers (void) //e6y save_p += 4*sizeof(void*); @@ -85,7 +85,7 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c P_SetThingPosition (mobj); mobj->info = &mobjinfo[mobj->type]; -@@ -811,7 +812,7 @@ void P_UnArchiveSpecials (void) +@@ -814,7 +815,7 @@ void P_UnArchiveSpecials (void) ceiling_t *ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVEL, NULL); memcpy (ceiling, save_p, sizeof(*ceiling)); save_p += sizeof(*ceiling); @@ -94,7 +94,7 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c ceiling->sector->ceilingdata = ceiling; //jff 2/22/98 if (ceiling->thinker.function) -@@ -828,10 +829,10 @@ void P_UnArchiveSpecials (void) +@@ -831,10 +832,10 @@ void P_UnArchiveSpecials (void) vldoor_t *door = Z_Malloc (sizeof(*door), PU_LEVEL, NULL); memcpy (door, save_p, sizeof(*door)); save_p += sizeof(*door); @@ -107,7 +107,7 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c door->sector->ceilingdata = door; //jff 2/22/98 door->thinker.function = T_VerticalDoor; -@@ -845,7 +846,7 @@ void P_UnArchiveSpecials (void) +@@ -848,7 +849,7 @@ void P_UnArchiveSpecials (void) floormove_t *floor = Z_Malloc (sizeof(*floor), PU_LEVEL, NULL); memcpy (floor, save_p, sizeof(*floor)); save_p += sizeof(*floor); @@ -116,7 +116,7 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c floor->sector->floordata = floor; //jff 2/22/98 floor->thinker.function = T_MoveFloor; P_AddThinker (&floor->thinker); -@@ -858,7 +859,7 @@ void P_UnArchiveSpecials (void) +@@ -861,7 +862,7 @@ void P_UnArchiveSpecials (void) plat_t *plat = Z_Malloc (sizeof(*plat), PU_LEVEL, NULL); memcpy (plat, save_p, sizeof(*plat)); save_p += sizeof(*plat); @@ -125,7 +125,7 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c plat->sector->floordata = plat; //jff 2/22/98 if (plat->thinker.function) -@@ -875,7 +876,7 @@ void P_UnArchiveSpecials (void) +@@ -878,7 +879,7 @@ void P_UnArchiveSpecials (void) lightflash_t *flash = Z_Malloc (sizeof(*flash), PU_LEVEL, NULL); memcpy (flash, save_p, sizeof(*flash)); save_p += sizeof(*flash); @@ -134,7 +134,7 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c flash->thinker.function = T_LightFlash; P_AddThinker (&flash->thinker); break; -@@ -887,7 +888,7 @@ void P_UnArchiveSpecials (void) +@@ -890,7 +891,7 @@ void P_UnArchiveSpecials (void) strobe_t *strobe = Z_Malloc (sizeof(*strobe), PU_LEVEL, NULL); memcpy (strobe, save_p, sizeof(*strobe)); save_p += sizeof(*strobe); @@ -143,7 +143,7 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c strobe->thinker.function = T_StrobeFlash; P_AddThinker (&strobe->thinker); break; -@@ -899,7 +900,7 @@ void P_UnArchiveSpecials (void) +@@ -902,7 +903,7 @@ void P_UnArchiveSpecials (void) glow_t *glow = Z_Malloc (sizeof(*glow), PU_LEVEL, NULL); memcpy (glow, save_p, sizeof(*glow)); save_p += sizeof(*glow); @@ -152,7 +152,7 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c glow->thinker.function = T_Glow; P_AddThinker (&glow->thinker); break; -@@ -911,7 +912,7 @@ void P_UnArchiveSpecials (void) +@@ -914,7 +915,7 @@ void P_UnArchiveSpecials (void) fireflicker_t *flicker = Z_Malloc (sizeof(*flicker), PU_LEVEL, NULL); memcpy (flicker, save_p, sizeof(*flicker)); save_p += sizeof(*flicker); @@ -161,7 +161,7 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c flicker->thinker.function = T_FireFlicker; P_AddThinker (&flicker->thinker); break; -@@ -924,7 +925,7 @@ void P_UnArchiveSpecials (void) +@@ -927,7 +928,7 @@ void P_UnArchiveSpecials (void) elevator_t *elevator = Z_Malloc (sizeof(*elevator), PU_LEVEL, NULL); memcpy (elevator, save_p, sizeof(*elevator)); save_p += sizeof(*elevator); @@ -170,10 +170,10 @@ Index: prboom-plus-2.5.1.1/src/p_saveg.c elevator->sector->floordata = elevator; //jff 2/22/98 elevator->sector->ceilingdata = elevator; //jff 2/22/98 elevator->thinker.function = T_MoveElevator; -Index: prboom-plus-2.5.1.1/src/r_drawflush.inl +Index: prboom-plus-2.5.1.3/src/r_drawflush.inl =================================================================== ---- prboom-plus-2.5.1.1.orig/src/r_drawflush.inl -+++ prboom-plus-2.5.1.1/src/r_drawflush.inl +--- prboom-plus-2.5.1.3.orig/src/r_drawflush.inl ++++ prboom-plus-2.5.1.3/src/r_drawflush.inl @@ -28,6 +28,8 @@ * *-----------------------------------------------------------------------------*/