Author: bdefreese Date: 2013-06-02 01:25:12 +0000 (Sun, 02 Jun 2013) New Revision: 14197
Modified: packages/trunk/cultivation/debian/changelog packages/trunk/cultivation/debian/control packages/trunk/cultivation/debian/patches/portaudio19.patch packages/trunk/cultivation/debian/patches/series Log: Patch to use portaudio19 Modified: packages/trunk/cultivation/debian/changelog =================================================================== --- packages/trunk/cultivation/debian/changelog 2013-06-01 19:59:59 UTC (rev 14196) +++ packages/trunk/cultivation/debian/changelog 2013-06-02 01:25:12 UTC (rev 14197) @@ -1,8 +1,13 @@ cultivation (9+dfsg1-2) UNRELEASED; urgency=low - * Add initial port to portaudio19 + [ Barry deFreese ] + * Patch for portaudio19. (Closes: #594015). + * Add hardening flags: + + Clean up rules file to pass options not sed the makefiles. + + Add dpkg-dev build dep for buildflags. + * Bump Standards Version to 3.9.4. - -- Paul Wise <p...@debian.org> Tue, 03 Jan 2012 19:40:14 +0800 + -- Barry deFreese <bdefre...@debian.org> Sat, 01 Jun 2013 16:54:56 -0400 cultivation (9+dfsg1-1) unstable; urgency=low Modified: packages/trunk/cultivation/debian/control =================================================================== --- packages/trunk/cultivation/debian/control 2013-06-01 19:59:59 UTC (rev 14196) +++ packages/trunk/cultivation/debian/control 2013-06-02 01:25:12 UTC (rev 14197) @@ -5,14 +5,14 @@ Uploaders: Miriam Ruiz <little_m...@yahoo.es>, Peter De Wachter <pdewa...@gmail.com>, Paul Wise <p...@debian.org> -Build-Depends: debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), imagemagick, libpng-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, - libportaudio-dev -Standards-Version: 3.9.1 + portaudio19-dev +Standards-Version: 3.9.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/cultivation/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/cultivation/?op=log Homepage: http://cultivation.sourceforge.net/ @@ -30,4 +30,3 @@ also an evolution simulation. Within the world of Cultivation, you can explore a virtually infinite spectrum of different plant and gardener varieties. - Modified: packages/trunk/cultivation/debian/patches/portaudio19.patch =================================================================== --- packages/trunk/cultivation/debian/patches/portaudio19.patch 2013-06-01 19:59:59 UTC (rev 14196) +++ packages/trunk/cultivation/debian/patches/portaudio19.patch 2013-06-02 01:25:12 UTC (rev 14197) @@ -1,70 +1,65 @@ -Description: port to PortAudio 19 -Author: Paul Wise <p...@debian.org> ---- a/game2/gameSource/sound/SoundPlayer.cpp -+++ b/game2/gameSource/sound/SoundPlayer.cpp -@@ -54,7 +54,7 @@ +Author: Barry deFreese <bdefre...@debian.org> +Description: Patch system to utilize portaudio v19. Debian Bug: #594015. +Index: cultivation-9+dfsg1/game2/gameSource/sound/SoundPlayer.h +=================================================================== +--- cultivation-9+dfsg1.orig/game2/gameSource/sound/SoundPlayer.h 2013-06-01 16:54:16.000000000 -0400 ++++ cultivation-9+dfsg1/game2/gameSource/sound/SoundPlayer.h 2013-06-01 17:11:19.000000000 -0400 +@@ -239,7 +239,7 @@ + char mFadingIn; + int mNumFadeFramesRemaining; + +- PortAudioStream *mAudioStream; ++ PaStream *mAudioStream; + + // realtime sounds that should be mixed into the next to-speaker call + SimpleVector<PlayableSound *> *mRealtimeSounds; +Index: cultivation-9+dfsg1/game2/gameSource/sound/SoundPlayer.cpp +=================================================================== +--- cultivation-9+dfsg1.orig/game2/gameSource/sound/SoundPlayer.cpp 2006-10-02 18:29:43.000000000 -0400 ++++ cultivation-9+dfsg1/game2/gameSource/sound/SoundPlayer.cpp 2013-06-01 17:16:30.000000000 -0400 +@@ -52,9 +52,11 @@ + + // callback passed into portaudio - static int portaudioCallback( void *inputBuffer, void *outputBuffer, +-static int portaudioCallback( void *inputBuffer, void *outputBuffer, ++int portaudioCallback( const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, - PaTimestamp outTime, void *userData ) { -+ PaTime outTime, void *userData ) { ++ const PaStreamCallbackTimeInfo *outTime, ++ PaStreamCallbackFlags statusFlags, ++ void *userData ) { SoundPlayer *player = (SoundPlayer *)userData; -@@ -156,20 +156,27 @@ - PaError error = Pa_Initialize(); +@@ -157,28 +159,20 @@ if( error == paNoError ) { -- + - error = Pa_OpenStream( -- &mAudioStream, -+ PaStreamParameters input_params = { - paNoDevice,// default input device ++ error = Pa_OpenDefaultStream( + &mAudioStream, +- paNoDevice,// default input device 0, // no input - paFloat32, // 32 bit floating point input +- paFloat32, // 32 bit floating point input - NULL, - Pa_GetDefaultOutputDeviceID(), -+ NULL -+ }; -+ -+ PaStreamParameters output_params = { -+ Pa_GetDefaultOutputDevice(), 2, // stereo output paFloat32, // 32 bit floating point output - NULL, -+ NULL -+ }; -+ -+ -+ error = Pa_OpenStream( -+ &mAudioStream, -+ &input_params, -+ &output_params, mSampleRate, 1024, // frames per buffer - 0, // number of buffers, if zero then use default minimum - paClipOff, // we won't output out of range samples so - // don't bother clipping them +- paClipOff, // we won't output out of range samples so +- // don't bother clipping them portaudioCallback, ---- a/game2/gameSource/sound/SoundPlayer.h -+++ b/game2/gameSource/sound/SoundPlayer.h -@@ -239,7 +239,7 @@ - char mFadingIn; - int mNumFadeFramesRemaining; - -- PortAudioStream *mAudioStream; -+ PaStream *mAudioStream; + (void *)this ); // pass self-pointer to callback function +- ++ + if( error == paNoError ) { - // realtime sounds that should be mixed into the next to-speaker call - SimpleVector<PlayableSound *> *mRealtimeSounds; ---- a/minorGems/sound/SoundPlayer.h -+++ b/minorGems/sound/SoundPlayer.h -@@ -121,7 +121,7 @@ - - char mAudioInitialized; - -- PortAudioStream *mAudioStream; -+ PaStream *mAudioStream; - - }; - + error = Pa_StartStream( mAudioStream ); +- ++ + if( error == paNoError ) { + mAudioInitialized = true; + } Modified: packages/trunk/cultivation/debian/patches/series =================================================================== --- packages/trunk/cultivation/debian/patches/series 2013-06-01 19:59:59 UTC (rev 14196) +++ packages/trunk/cultivation/debian/patches/series 2013-06-02 01:25:12 UTC (rev 14197) @@ -2,3 +2,4 @@ abs_paths.patch math_h.patch fix_crash.patch +portaudio19.patch _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits