r2892 - packages/trunk/cultivation/debian/patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-06-08 23:36:19 +0000 (Fri, 08 Jun 2007)
New Revision: 2892

Added:
   packages/trunk/cultivation/debian/patches/portaudio.patch
Modified:
   packages/trunk/cultivation/debian/patches/series
Log:
added patch to remove portaudio


Added: packages/trunk/cultivation/debian/patches/portaudio.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/portaudio.patch	                        (rev 0)
+++ packages/trunk/cultivation/debian/patches/portaudio.patch	2007-06-08 23:36:19 UTC (rev 2892)
@@ -0,0 +1,53 @@
+--- cultivation-7.20061227.dfsg1.orig/game2/gameSource/sound/SoundPlayer.h
++++ cultivation-7.20061227.dfsg1/game2/gameSource/sound/SoundPlayer.h
+@@ -52,8 +52,7 @@
+ #include "SoundFilter.h"
+ #include "PlayableSound.h"
+ 
+-#include "minorGems/sound/portaudio/pa_common/portaudio.h"
+-#include "minorGems/sound/portaudio/pablio/pablio.h"
++#include <portaudio.h>
+ 
+ 
+ #include "minorGems/util/SimpleVector.h"
+--- cultivation-7.20061227.dfsg1.orig/game2/Makefile.common
++++ cultivation-7.20061227.dfsg1/game2/Makefile.common
+@@ -42,7 +42,6 @@
+ OPTIMIZE_FLAG = ${OPTIMIZE_ON_FLAG}
+ 
+ 
+-PORT_AUDIO_PATH = ${ROOT_PATH}/minorGems/sound/portaudio
+ 
+ 
+ # common to all platforms
+@@ -51,7 +50,7 @@
+ 
+ 
+ 
+-COMPILE_FLAGS = -Wall ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH} -I${PORT_AUDIO_PATH}/pa_common
++COMPILE_FLAGS = -Wall ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH}
+ 
+ 
+ COMPILE = ${GXX} ${COMPILE_FLAGS} -c
+--- cultivation-7.20061227.dfsg1.orig/runToBuild
++++ cultivation-7.20061227.dfsg1/runToBuild
+@@ -16,13 +16,13 @@
+ ./configure
+ 
+ 
+-echo "Building portaudio..."
++#echo "Building portaudio..."
+ 
+-cd ../minorGems/sound/portaudio
+-chmod u+x ./configure
+-./configure
+-make
+-cd ../../../game2
++#cd ../minorGems/sound/portaudio
++#chmod u+x ./configure
++#./configure
++#make
++#cd ../../../game2
+ 
+ 
+ echo "Building Cultivation..."

Modified: packages/trunk/cultivation/debian/patches/series
===================================================================
--- packages/trunk/cultivation/debian/patches/series	2007-06-08 23:34:33 UTC (rev 2891)
+++ packages/trunk/cultivation/debian/patches/series	2007-06-08 23:36:19 UTC (rev 2892)
@@ -1,2 +1,3 @@
 build.patch
 abs_paths.patch
+portaudio.patch