r10014 - in packages/trunk/performous/debian: . patches

[Miriam Ruiz]

Author: miriam
Date: 2009-07-11 18:02:27 +0000 (Sat, 11 Jul 2009)
New Revision: 10014

Modified:
   packages/trunk/performous/debian/control
   packages/trunk/performous/debian/patches/boost_fix.patch
Log:
Fix boost stuff



Modified: packages/trunk/performous/debian/control
===================================================================
--- packages/trunk/performous/debian/control	2009-07-11 16:43:57 UTC (rev 10013)
+++ packages/trunk/performous/debian/control	2009-07-11 18:02:27 UTC (rev 10014)
@@ -5,8 +5,9 @@
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>
 Build-Depends: debhelper (>= 5.0.51), cmake (>= 2.6), quilt, help2man, 
  libgl1-mesa-dev, libsdl1.2-dev, libcairo2-dev, librsvg2-dev,
- libboost-thread-dev, libboost-serialization-dev, libboost-program-options-dev,
- libboost-regex-dev, libboost-filesystem-dev,
+ libboost-thread-dev (>= 1.38), libboost-serialization-dev (>= 1.38),
+ libboost-program-options-dev (>= 1.38), libboost-regex-dev (>= 1.38),
+ libboost-filesystem-dev (>= 1.38),
  libavcodec-dev, libavformat-dev, libswscale-dev,
  libmagick++9-dev, libsamplerate0-dev, libxml++2.6-dev,
  libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev,

Modified: packages/trunk/performous/debian/patches/boost_fix.patch
===================================================================
--- packages/trunk/performous/debian/patches/boost_fix.patch	2009-07-11 16:43:57 UTC (rev 10013)
+++ packages/trunk/performous/debian/patches/boost_fix.patch	2009-07-11 18:02:27 UTC (rev 10014)
@@ -18,3 +18,23 @@
  			using namespace boost::lambda;
  			placeholder1_type arg1;
  			if (!parse(tonestr.c_str(),
+--- Performous-0.3.1-Source.orig/game/main.cc
++++ Performous-0.3.1-Source/game/main.cc
+@@ -11,7 +11,7 @@
+ #include <boost/format.hpp>
+ #include <boost/program_options.hpp>
+ // Needs at least Boost 1.36 and many systems don't have that: #include <boost/spirit/include/classic_core.hpp>
+-#include <boost/spirit/core.hpp>
++#include <boost/spirit/include/classic_core.hpp>
+ #include <boost/thread.hpp>
+ #include <libda/audio.hpp>
+ #include <csignal>
+@@ -77,7 +77,7 @@
+ 
+ void audioSetup(Capture& capture, Audio& audio) {
+ 	// initialize audio argument parser
+-	using namespace boost::spirit; //::classic;
++	using namespace boost::spirit::classic;
+ 	unsigned channels, rate, frames;
+ 	std::string devstr;
+ 	// channel       ::= "channel=" integer