r14174 - in packages/trunk/transcend/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2013-05-28 02:08:24 +0000 (Tue, 28 May 2013)
New Revision: 14174

Added:
   packages/trunk/transcend/debian/patches/03_portaudio.patch
Modified:
   packages/trunk/transcend/debian/changelog
   packages/trunk/transcend/debian/control
   packages/trunk/transcend/debian/patches/series
   packages/trunk/transcend/debian/rules
Log:
Add patch to build with pulseaudio19.

Modified: packages/trunk/transcend/debian/changelog
===================================================================
--- packages/trunk/transcend/debian/changelog	2013-05-27 21:22:29 UTC (rev 14173)
+++ packages/trunk/transcend/debian/changelog	2013-05-28 02:08:24 UTC (rev 14174)
@@ -1,3 +1,11 @@
+transcend (0.3.dfsg2-3) UNRELEASED; urgency=low
+
+  * Add patch to build with portaduio19. (Closes: #594014).
+    - PROBABLY NNEDS WORK, not very clean.
+  * Add hardening flags. (Lintian still not happy).
+
+ -- Barry deFreese <bdefreese at debian.org>  Mon, 27 May 2013 13:44:03 -0400
+
 transcend (0.3.dfsg2-2) unstable; urgency=low
 
   * Use a different icon on platforms where icns2png fails (Closes: #613928)

Modified: packages/trunk/transcend/debian/control
===================================================================
--- packages/trunk/transcend/debian/control	2013-05-27 21:22:29 UTC (rev 14173)
+++ packages/trunk/transcend/debian/control	2013-05-28 02:08:24 UTC (rev 14174)
@@ -6,14 +6,14 @@
  Sam Hocevar <sho at debian.org>,
  Barry deFreese <bdefreese at debian.org>,
  Paul Wise <pabs at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~),
  imagemagick,
  icnsutils,
  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/transcend/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/transcend/?op=log
 Homepage: http://transcend.sourceforge.net/

Added: packages/trunk/transcend/debian/patches/03_portaudio.patch
===================================================================
--- packages/trunk/transcend/debian/patches/03_portaudio.patch	                        (rev 0)
+++ packages/trunk/transcend/debian/patches/03_portaudio.patch	2013-05-28 02:08:24 UTC (rev 14174)
@@ -0,0 +1,76 @@
+Author: Barry deFreese <bdefreese at debian.org>
+Description: Build with portaudio19.
+Index: transcend-0.3.dfsg2/Transcend/game/SoundPlayer.h
+===================================================================
+--- transcend-0.3.dfsg2.orig/Transcend/game/SoundPlayer.h	2013-05-27 13:40:20.000000000 -0400
++++ transcend-0.3.dfsg2/Transcend/game/SoundPlayer.h	2013-05-27 15:46:19.000000000 -0400
+@@ -204,7 +204,7 @@
+         double mMusicLoudness;
+         
+         
+-        PortAudioStream *mAudioStream;
++        PaStream *mAudioStream;
+ 
+         // realtime sounds that should be mixed into the next to-speaker call
+         SimpleVector<PlayableSound *> *mRealtimeSounds;
+Index: transcend-0.3.dfsg2/Transcend/game/SoundPlayer.cpp
+===================================================================
+--- transcend-0.3.dfsg2.orig/Transcend/game/SoundPlayer.cpp	2004-09-01 02:32:14.000000000 -0400
++++ transcend-0.3.dfsg2/Transcend/game/SoundPlayer.cpp	2013-05-27 17:32:48.000000000 -0400
+@@ -47,9 +47,11 @@
+ 
+ 
+ // callback passed into portaudio
+-static int portaudioCallback( void *inputBuffer, void *outputBuffer,
++int portaudioCallback( const void *inputBuffer, void *outputBuffer,
+                               unsigned long framesPerBuffer,
+-                              PaTimestamp outTime, void *userData ) {
++                              const PaStreamCallbackTimeInfo *outTime,
++                              PaStreamCallbackFlags statusFlags,
++                              void *userData ) {
+ 
+ 
+     SoundPlayer *player = (SoundPlayer *)userData;
+@@ -147,19 +149,38 @@
+ 
+     if( error == paNoError ) {
+     
+-        error = Pa_OpenStream(
+-            &mAudioStream,
++/* FIXME!! */
++        PaStreamParameters inParams, outParams;
++
++        bzero( &inParams, sizeof( inParams) );
++        inParams.device = paNoDevice;
++        inParams.hostApiSpecificStreamInfo = NULL;
++        inParams.sampleFormat = paFloat32;
++
++        bzero( &outParams, sizeof( outParams) );
++        outParams.device = Pa_GetDefaultOutputDevice();
++        outParams.hostApiSpecificStreamInfo = NULL;
++        outParams.sampleFormat = paFloat32;
++
++/*
++
+             paNoDevice,// default input device 
+             0,              // no input 
+             paFloat32,  // 32 bit floating point input 
+             NULL,
+-            Pa_GetDefaultOutputDeviceID(),
++            Pa_GetDefaultOutputDevice(),
+             2,          // stereo output 
+             paFloat32,      // 32 bit floating point output 
+             NULL,
++            0,    // number of buffers, if zero then use default minimum 
++
++*/
++        error = Pa_OpenStream(
++            &mAudioStream,
++            &inParams,
++            &outParams,
+             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 
+             portaudioCallback,

Modified: packages/trunk/transcend/debian/patches/series
===================================================================
--- packages/trunk/transcend/debian/patches/series	2013-05-27 21:22:29 UTC (rev 14173)
+++ packages/trunk/transcend/debian/patches/series	2013-05-28 02:08:24 UTC (rev 14174)
@@ -1,2 +1,3 @@
 00_portaudio.patch
 02_levels_dir.patch
+03_portaudio.patch

Modified: packages/trunk/transcend/debian/rules
===================================================================
--- packages/trunk/transcend/debian/rules	2013-05-27 21:22:29 UTC (rev 14173)
+++ packages/trunk/transcend/debian/rules	2013-05-28 02:08:24 UTC (rev 14174)
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 %:
 	dh --parallel $@