Attachment 84433 Details for Bug 120427 – stormbaancoureur.patch

[patch] stormbaancoureur.patch

stormbaancoureur.patch (text/plain), 15.76 KB, created by Dmitry Marakasov on 2008-02-08 22:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2008-02-08 22:20:00 UTC

Size: 15.76 KB

patch

obsolete

>Files stormbaancoureur.orig/.Makefile.swp and stormbaancoureur/.Makefile.swp differ
>diff -ruN stormbaancoureur.orig/Makefile stormbaancoureur/Makefile
>--- stormbaancoureur.orig/Makefile	2008-02-01 04:34:14.000000000 +0300
>+++ stormbaancoureur/Makefile	2008-02-09 00:50:11.000000000 +0300
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	stormbaancoureur
>-PORTVERSION=	2.0.0
>+PORTVERSION=	2.1.0
> CATEGORIES=	games
> MASTER_SITES=	http://bram.creative4vision.nl/sturmbahnfahrer/download/ \
> 		http://www.amdmi3.ru/distfiles/
>diff -ruN stormbaancoureur.orig/distinfo stormbaancoureur/distinfo
>--- stormbaancoureur.orig/distinfo	2008-02-01 04:34:14.000000000 +0300
>+++ stormbaancoureur/distinfo	2008-02-09 00:50:41.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (stormbaancoureur-2.0.0.tar.gz) = 2d20b536c7616c74376b277132bd09c9
>-SHA256 (stormbaancoureur-2.0.0.tar.gz) = f725eec8b3c8865e1cd3c91b751566d7576f2ae529906cb2af63f5a04fe7baa8
>-SIZE (stormbaancoureur-2.0.0.tar.gz) = 4022711
>+MD5 (stormbaancoureur-2.1.0.tar.gz) = 5350d869c354de9660797a9bc0625b61
>+SHA256 (stormbaancoureur-2.1.0.tar.gz) = d922cb4ce2aa88de385a8a5f437c5bbe004e13a694b6afdbd950034b4558a712
>+SIZE (stormbaancoureur-2.1.0.tar.gz) = 4318690
>diff -ruN stormbaancoureur.orig/files/patch-src-common-soundenginealsa.cxx stormbaancoureur/files/patch-src-common-soundenginealsa.cxx
>--- stormbaancoureur.orig/files/patch-src-common-soundenginealsa.cxx	2008-02-01 04:34:14.000000000 +0300
>+++ stormbaancoureur/files/patch-src-common-soundenginealsa.cxx	2008-02-09 00:54:50.000000000 +0300
>@@ -1,6 +1,6 @@
>---- src-common/soundenginealsa.cxx.orig	Thu May 17 20:02:03 2007
>-+++ src-common/soundenginealsa.cxx	Thu Aug  9 02:19:21 2007
>-@@ -38,93 +38,20 @@
>+--- src-common/soundenginealsa.cxx.orig	2008-01-06 23:27:11.000000000 +0300
>++++ src-common/soundenginealsa.cxx	2008-02-09 00:54:41.000000000 +0300
>+@@ -38,219 +38,46 @@
>    complexfeed(0),
>    enginefeed(0),
>    activefeed(0),
>@@ -54,8 +54,11 @@
> -    );
> -  }
> -
>--  snd_pcm_uframes_t frames = framelag;
>--  snd_pcm_hw_params_set_period_size_near(handle, params, &frames, &dir);
>+-  snd_pcm_uframes_t frames_in_buffer = framelag;
>+-  snd_pcm_uframes_t frames_in_period = framelag/8;
>+-
>+-  snd_pcm_hw_params_set_buffer_size_near(handle, params, &frames_in_buffer);
>+-  snd_pcm_hw_params_set_period_size_near(handle, params, &frames_in_period, &dir);
> -
> -  /* Write the parameters to the driver */
> -  rc = snd_pcm_hw_params(handle, params);
>@@ -65,8 +68,13 @@
> -    return;
> -  }
> -  snd_pcm_hw_params_get_period_size(params, &periodsz, &dir);
>--  batchsize = (int) ceilf(framelag / (float) periodsz);
>--  fprintf(stderr,"soundenginealsa.cxx: requested period %d, got period %d, use batchsize %d\n", framelag, (int) periodsz, batchsize);
>+-  snd_pcm_hw_params_get_buffer_size(params, &buffersz);
>+-
>+-  fprintf(stderr,"soundenginealsa.cxx: period size SOLL-WERT %d, IST-WERT %d\n", framelag/8, (int) periodsz);
>+-  fprintf(stderr,"soundenginealsa.cxx: buffer size SOLL-WERT %d, IST-WERT %d\n", framelag,   (int) buffersz);
>+-
>+-  if (buffersz % periodsz)
>+-    fprintf(stderr,"soundenginealsa.cxx: WARNING - buffersz is not a multiple of periodsz\n");
> -
> -  simplefeed  = new SoundFeedSimple(periodsz);
> -  complexfeed = new SoundFeedComplex(periodsz);
>@@ -94,7 +102,11 @@
>  }
>  
>  
>-@@ -136,40 +63,11 @@
>+ void SoundEngineAlsa::StopPlay(void)
>+ {
>+-  puts("NOT YET IMPLEMENTED");
>+ }
>+ 
>  
>  void SoundEngineAlsa::SetMode(const std::string &modename)
>  {
>@@ -135,7 +147,12 @@
>  }
>  
>  
>-@@ -182,58 +80,6 @@
>+ void SoundEngineAlsa::SetLowPass(float f)
>+ {
>+-  lpfilter = f;
>+ }
>+ 
>+ 
>  
>  float SoundEngineAlsa::Sustain(void)
>  {
>@@ -171,7 +188,12 @@
> -
> -  if (delay < framelag)
> -  {
>--    int cnt = batchsize;
>+-    int todo = framelag - delay;
>+-#if 0
>+-    int cnt  = (todo + periodsz-1) / periodsz; // Use this with pulse audio (fedora)
>+-#else
>+-    int cnt  = todo / periodsz; // Use this with all other alsa implementations
>+-#endif
> -    short *data = activefeed->Get(cnt);
> -    if (cnt)
> -    {
>@@ -188,6 +210,10 @@
> -      else
> -        if (rc != (int) (cnt*periodsz))
> -          fprintf(stderr, "short write, wrote %d frames instead of %d\n", rc, (int) periodsz);
>+-#if 0
>+-        else
>+-          fprintf(stderr, "wrote %d sound frames\n", rc);
>+-#endif
> -    }
> -  }
> -  return fractiondone;
>diff -ruN stormbaancoureur.orig/files/patch-src-common-soundenginealsa.h stormbaancoureur/files/patch-src-common-soundenginealsa.h
>--- stormbaancoureur.orig/files/patch-src-common-soundenginealsa.h	2008-02-01 04:34:14.000000000 +0300
>+++ stormbaancoureur/files/patch-src-common-soundenginealsa.h	2008-02-09 00:52:53.000000000 +0300
>@@ -1,5 +1,5 @@
>---- src-common/soundenginealsa.h.orig	Thu May 17 20:02:03 2007
>-+++ src-common/soundenginealsa.h	Thu Aug  9 02:17:07 2007
>+--- src-common/soundenginealsa.h.orig	2008-01-03 07:29:23.000000000 +0300
>++++ src-common/soundenginealsa.h	2008-02-09 00:52:09.000000000 +0300
> @@ -2,8 +2,6 @@
>  #ifndef SOUNDENGINE_ALSA_H
>  #define SOUNDENGINE_ALSA_H
>@@ -9,12 +9,13 @@
>  class SoundClip;
>  class SoundFeed;
>  class SoundFeedSimple;
>-@@ -29,8 +27,6 @@
>+@@ -29,9 +27,6 @@
>      SoundFeedModulated *modulatedfeed;
>      SoundFeedEngine    *enginefeed;
>      SoundFeed          *activefeed;
> -    snd_pcm_t *handle;
> -    snd_pcm_uframes_t periodsz; // in frames
>+-    snd_pcm_uframes_t buffersz; // in frames
>      int batchsize; // in periods
>      int framelag; // in frames
>      float lpfilter;
>diff -ruN stormbaancoureur.orig/files/patch-src-stormbaancoureur-Makefile stormbaancoureur/files/patch-src-stormbaancoureur-Makefile
>--- stormbaancoureur.orig/files/patch-src-stormbaancoureur-Makefile	2008-02-01 04:34:14.000000000 +0300
>+++ stormbaancoureur/files/patch-src-stormbaancoureur-Makefile	2008-02-09 01:02:20.000000000 +0300
>@@ -1,5 +1,5 @@
>---- src-stormbaancoureur/Makefile.orig	2007-12-29 00:55:42.000000000 +0300
>-+++ src-stormbaancoureur/Makefile	2007-12-31 16:51:58.000000000 +0300
>+--- src-stormbaancoureur/Makefile.orig	2008-02-08 21:00:29.000000000 +0300
>++++ src-stormbaancoureur/Makefile	2008-02-09 01:02:10.000000000 +0300
> @@ -5,7 +5,7 @@
>  GLPREFIX=/usr
>  PLIBPREFIX=/usr
>@@ -50,7 +50,7 @@
>  	$(CXX) -o stormbaancoureur $(OBJS) $(LFLAGS) $(LIBS)
>  
>  staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h
>-@@ -102,62 +99,61 @@
>+@@ -102,64 +99,63 @@
>  GAMEDIR=$(DESTDIR)/usr/share/games/stormbaancoureur
>  install: stormbaancoureur
>  	# Directories
>@@ -67,28 +67,26 @@
> -	install stormbaancoureur $(DESTDIR)/usr/games/stormbaancoureur
> +	${BSD_INSTALL_PROGRAM} stormbaancoureur $(PREFIX)/bin/stormbaancoureur
>  	# Images
>--	install -m 644 images/engine.tga $(GAMEDIR)/images/engine.tga
> -	install -m 644 images/info_carpet_smooth.rgb $(GAMEDIR)/images/info_carpet_smooth.rgb
> -	install -m 644 images/info_door_smooth.rgb $(GAMEDIR)/images/info_door_smooth.rgb
> -	install -m 644 images/info_jump_smooth.rgb $(GAMEDIR)/images/info_jump_smooth.rgb
> -	install -m 644 images/spot.tga $(GAMEDIR)/images/spot.tga
>-+	${BSD_INSTALL_DATA} -m 644 images/engine.tga $(DATADIR)/images/engine.tga
>-+	${BSD_INSTALL_DATA} -m 644 images/info_carpet_smooth.rgb $(DATADIR)/images/info_carpet_smooth.rgb
>-+	${BSD_INSTALL_DATA} -m 644 images/info_door_smooth.rgb $(DATADIR)/images/info_door_smooth.rgb
>-+	${BSD_INSTALL_DATA} -m 644 images/info_jump_smooth.rgb $(DATADIR)/images/info_jump_smooth.rgb
>-+	${BSD_INSTALL_DATA} -m 644 images/spot.tga $(DATADIR)/images/spot.tga
>++	${BSD_INSTALL_DATA} images/info_carpet_smooth.rgb $(DATADIR)/images/info_carpet_smooth.rgb
>++	${BSD_INSTALL_DATA} images/info_door_smooth.rgb $(DATADIR)/images/info_door_smooth.rgb
>++	${BSD_INSTALL_DATA} images/info_jump_smooth.rgb $(DATADIR)/images/info_jump_smooth.rgb
>++	${BSD_INSTALL_DATA} images/spot.tga $(DATADIR)/images/spot.tga
>  	# Sounds
> -	install -m 644 sounds/rpm_graph.txt $(GAMEDIR)/sounds/rpm_graph.txt
> -	install -m 644 sounds/camaro_s16_le.wav $(GAMEDIR)/sounds/camaro_s16_le.wav
> -	install -m 644 sounds/detonationnorm_s16_le.wav $(GAMEDIR)/sounds/detonationnorm_s16_le.wav
>-+	${BSD_INSTALL_DATA} -m 644 sounds/rpm_graph.txt $(DATADIR)/sounds/rpm_graph.txt
>-+	${BSD_INSTALL_DATA} -m 644 sounds/camaro_s16_le.wav $(DATADIR)/sounds/camaro_s16_le.wav
>-+	${BSD_INSTALL_DATA} -m 644 sounds/detonationnorm_s16_le.wav $(DATADIR)/sounds/detonationnorm_s16_le.wav
>++	${BSD_INSTALL_DATA} sounds/rpm_graph.txt $(DATADIR)/sounds/rpm_graph.txt
>++	${BSD_INSTALL_DATA} sounds/camaro_s16_le.wav $(DATADIR)/sounds/camaro_s16_le.wav
>++	${BSD_INSTALL_DATA} sounds/detonationnorm_s16_le.wav $(DATADIR)/sounds/detonationnorm_s16_le.wav
>          # Shaders
> -	install -m 644 shaders/bramlight.fp $(GAMEDIR)/shaders/bramlight.fp
> -	install -m 644 shaders/bramlight.vp $(GAMEDIR)/shaders/bramlight.vp
>-+	${BSD_INSTALL_DATA} -m 644 shaders/bramlight.fp $(DATADIR)/shaders/bramlight.fp
>-+	${BSD_INSTALL_DATA} -m 644 shaders/bramlight.vp $(DATADIR)/shaders/bramlight.vp
>++	${BSD_INSTALL_DATA} shaders/bramlight.fp $(DATADIR)/shaders/bramlight.fp
>++	${BSD_INSTALL_DATA} shaders/bramlight.vp $(DATADIR)/shaders/bramlight.vp
>  	# Models (car parts)
> -	install -m 644 models/coilspring.3ds $(GAMEDIR)/models/coilspring.3ds
> -	install -m 644 models/fivespoke.3ds $(GAMEDIR)/models/fivespoke.3ds
>@@ -97,13 +95,13 @@
> -	install -m 644 models/rearaxle.3ds $(GAMEDIR)/models/rearaxle.3ds
> -	install -m 644 models/spindle.3ds $(GAMEDIR)/models/spindle.3ds
> -	install -m 644 models/wishbone.3ds $(GAMEDIR)/models/wishbone.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/coilspring.3ds $(DATADIR)/models/coilspring.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/fivespoke.3ds $(DATADIR)/models/fivespoke.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/frame.3ds $(DATADIR)/models/frame.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/leafspring.3ds $(DATADIR)/models/leafspring.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/rearaxle.3ds $(DATADIR)/models/rearaxle.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/spindle.3ds $(DATADIR)/models/spindle.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/wishbone.3ds $(DATADIR)/models/wishbone.3ds
>++	${BSD_INSTALL_DATA} models/coilspring.3ds $(DATADIR)/models/coilspring.3ds
>++	${BSD_INSTALL_DATA} models/fivespoke.3ds $(DATADIR)/models/fivespoke.3ds
>++	${BSD_INSTALL_DATA} models/frame.3ds $(DATADIR)/models/frame.3ds
>++	${BSD_INSTALL_DATA} models/leafspring.3ds $(DATADIR)/models/leafspring.3ds
>++	${BSD_INSTALL_DATA} models/rearaxle.3ds $(DATADIR)/models/rearaxle.3ds
>++	${BSD_INSTALL_DATA} models/spindle.3ds $(DATADIR)/models/spindle.3ds
>++	${BSD_INSTALL_DATA} models/wishbone.3ds $(DATADIR)/models/wishbone.3ds
>  	#install -m 644 models/car.3ds $(GAMEDIR)/models/car.3ds
>  	#install -m 644 models/wheel.3ds $(GAMEDIR)/models/wheel.3ds
>  	#install -m 644 models/licplate.ac $(GAMEDIR)/models/licplate.ac
>@@ -126,34 +124,40 @@
> -	install -m 644 models/grid.3ds $(GAMEDIR)/models/grid.3ds
> -	install -m 644 models/highjump.3ds $(GAMEDIR)/models/highjump.3ds
> -	install -m 644 models/jumpboard.3ds $(GAMEDIR)/models/jumpboard.3ds
>+-	install -m 644 models/monoramp.3ds $(GAMEDIR)/models/monoramp.3ds
>+-	install -m 644 models/piston.3ds $(GAMEDIR)/models/piston.3ds
> -	install -m 644 models/ramp.3ds $(GAMEDIR)/models/ramp.3ds
>+-	install -m 644 models/rod.3ds $(GAMEDIR)/models/rod.3ds
> -	install -m 644 models/spikegate.3ds $(GAMEDIR)/models/spikegate.3ds
> -	install -m 644 models/terrain3.3ds $(GAMEDIR)/models/terrain3.3ds
> -	install -m 644 models/track.3ds $(GAMEDIR)/models/track.3ds
> -	install -m 644 models/turntable_ramp.3ds $(GAMEDIR)/models/turntable_ramp.3ds
> -	install -m 644 models/turntable_wheel.3ds $(GAMEDIR)/models/turntable_wheel.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/baseplate.3ds $(DATADIR)/models/baseplate.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/carpet.3ds $(DATADIR)/models/carpet.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/crate.3ds $(DATADIR)/models/crate.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/cratejump.3ds $(DATADIR)/models/cratejump.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/crate_low.3ds $(DATADIR)/models/crate_low.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/door.3ds $(DATADIR)/models/door.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/doorstand.3ds $(DATADIR)/models/doorstand.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/ferriswheelcart.3ds $(DATADIR)/models/ferriswheelcart.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/ferriswheelstand.3ds $(DATADIR)/models/ferriswheelstand.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/ferriswheelwheel.3ds $(DATADIR)/models/ferriswheelwheel.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/finishdoor.3ds $(DATADIR)/models/finishdoor.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/finishplank.3ds $(DATADIR)/models/finishplank.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/floppy.3ds $(DATADIR)/models/floppy.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/grid.3ds $(DATADIR)/models/grid.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/highjump.3ds $(DATADIR)/models/highjump.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/jumpboard.3ds $(DATADIR)/models/jumpboard.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/ramp.3ds $(DATADIR)/models/ramp.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/spikegate.3ds $(DATADIR)/models/spikegate.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/terrain3.3ds $(DATADIR)/models/terrain3.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/track.3ds $(DATADIR)/models/track.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/turntable_ramp.3ds $(DATADIR)/models/turntable_ramp.3ds
>-+	${BSD_INSTALL_DATA} -m 644 models/turntable_wheel.3ds $(DATADIR)/models/turntable_wheel.3ds
>++	${BSD_INSTALL_DATA} models/baseplate.3ds $(DATADIR)/models/baseplate.3ds
>++	${BSD_INSTALL_DATA} models/carpet.3ds $(DATADIR)/models/carpet.3ds
>++	${BSD_INSTALL_DATA} models/crate.3ds $(DATADIR)/models/crate.3ds
>++	${BSD_INSTALL_DATA} models/cratejump.3ds $(DATADIR)/models/cratejump.3ds
>++	${BSD_INSTALL_DATA} models/crate_low.3ds $(DATADIR)/models/crate_low.3ds
>++	${BSD_INSTALL_DATA} models/door.3ds $(DATADIR)/models/door.3ds
>++	${BSD_INSTALL_DATA} models/doorstand.3ds $(DATADIR)/models/doorstand.3ds
>++	${BSD_INSTALL_DATA} models/ferriswheelcart.3ds $(DATADIR)/models/ferriswheelcart.3ds
>++	${BSD_INSTALL_DATA} models/ferriswheelstand.3ds $(DATADIR)/models/ferriswheelstand.3ds
>++	${BSD_INSTALL_DATA} models/ferriswheelwheel.3ds $(DATADIR)/models/ferriswheelwheel.3ds
>++	${BSD_INSTALL_DATA} models/finishdoor.3ds $(DATADIR)/models/finishdoor.3ds
>++	${BSD_INSTALL_DATA} models/finishplank.3ds $(DATADIR)/models/finishplank.3ds
>++	${BSD_INSTALL_DATA} models/floppy.3ds $(DATADIR)/models/floppy.3ds
>++	${BSD_INSTALL_DATA} models/grid.3ds $(DATADIR)/models/grid.3ds
>++	${BSD_INSTALL_DATA} models/highjump.3ds $(DATADIR)/models/highjump.3ds
>++	${BSD_INSTALL_DATA} models/jumpboard.3ds $(DATADIR)/models/jumpboard.3ds
>++	${BSD_INSTALL_DATA} models/monoramp.3ds $(DATADIR)/models/monoramp.3ds
>++	${BSD_INSTALL_DATA} models/piston.3ds $(DATADIR)/models/piston.3ds
>++	${BSD_INSTALL_DATA} models/ramp.3ds $(DATADIR)/models/ramp.3ds
>++	${BSD_INSTALL_DATA} models/rod.3ds $(DATADIR)/models/rod.3ds
>++	${BSD_INSTALL_DATA} models/spikegate.3ds $(DATADIR)/models/spikegate.3ds
>++	${BSD_INSTALL_DATA} models/terrain3.3ds $(DATADIR)/models/terrain3.3ds
>++	${BSD_INSTALL_DATA} models/track.3ds $(DATADIR)/models/track.3ds
>++	${BSD_INSTALL_DATA} models/turntable_ramp.3ds $(DATADIR)/models/turntable_ramp.3ds
>++	${BSD_INSTALL_DATA} models/turntable_wheel.3ds $(DATADIR)/models/turntable_wheel.3ds
>  
>  deb:
>  	strip stormbaancoureur
>diff -ruN stormbaancoureur.orig/pkg-plist stormbaancoureur/pkg-plist
>--- stormbaancoureur.orig/pkg-plist	2008-02-01 04:34:14.000000000 +0300
>+++ stormbaancoureur/pkg-plist	2008-02-09 01:03:40.000000000 +0300
>@@ -1,5 +1,4 @@
> bin/stormbaancoureur
>-%%DATADIR%%/images/engine.tga
> %%DATADIR%%/images/info_carpet_smooth.rgb
> %%DATADIR%%/images/info_door_smooth.rgb
> %%DATADIR%%/images/info_jump_smooth.rgb
>@@ -24,8 +23,11 @@
> %%DATADIR%%/models/highjump.3ds
> %%DATADIR%%/models/jumpboard.3ds
> %%DATADIR%%/models/leafspring.3ds
>+%%DATADIR%%/models/monoramp.3ds
>+%%DATADIR%%/models/piston.3ds
> %%DATADIR%%/models/ramp.3ds
> %%DATADIR%%/models/rearaxle.3ds
>+%%DATADIR%%/models/rod.3ds
> %%DATADIR%%/models/spikegate.3ds
> %%DATADIR%%/models/spindle.3ds
> %%DATADIR%%/models/terrain3.3ds

Actions: View | Diff

Attachments on bug 120427: 84433