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

Barry deFreese bdefreese at alioth.debian.org
Tue May 26 02:32:30 UTC 2009


Author: bdefreese
Date: 2009-05-26 02:32:29 +0000 (Tue, 26 May 2009)
New Revision: 9785

Added:
   packages/trunk/performous/debian/patches/boost_fix.patch
   packages/trunk/performous/debian/patches/gcc_44.patch
Modified:
   packages/trunk/performous/debian/changelog
   packages/trunk/performous/debian/control
   packages/trunk/performous/debian/patches/series
Log:
  * boost_fix.patch - Build with newer boost. (Closes: #530473).
  * gcc_44.patch - Build with gcc-4.4. (Closes: #510848).
    + Thanks to Martin Michlmayr for the patch.
  * Add Section: debug to -dbg package.
  * Fix some symantic errors in package description. (Closes: #517620).
  * Bump Standards Version to 3.8.1.


Modified: packages/trunk/performous/debian/changelog
===================================================================
--- packages/trunk/performous/debian/changelog	2009-05-23 17:27:34 UTC (rev 9784)
+++ packages/trunk/performous/debian/changelog	2009-05-26 02:32:29 UTC (rev 9785)
@@ -1,3 +1,15 @@
+performous (0.3.0-2.1) UNRELEASED; urgency=low
+
+  [ Barry deFreese ]
+  * boost_fix.patch - Build with newer boost. (Closes: #530473).
+  * gcc_44.patch - Build with gcc-4.4. (Closes: #510848).
+    + Thanks to Martin Michlmayr for the patch.
+  * Add Section: debug to -dbg package.
+  * Fix some symantic errors in package description. (Closes: #517620).
+  * Bump Standards Version to 3.8.1.
+
+ -- Barry deFreese <bdefreese at debian.org>  Mon, 25 May 2009 22:27:29 -0400
+
 performous (0.3.0-2) unstable; urgency=low
 
   [ Ansgar Burchardt ]

Modified: packages/trunk/performous/debian/control
===================================================================
--- packages/trunk/performous/debian/control	2009-05-23 17:27:34 UTC (rev 9784)
+++ packages/trunk/performous/debian/control	2009-05-26 02:32:29 UTC (rev 9785)
@@ -11,7 +11,7 @@
  libmagick++9-dev, libsamplerate0-dev, libxml++2.6-dev,
  libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev,
  libgstreamer0.10-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ultrastar-ng/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ultrastar-ng/?op=log
 Homepage: http://performous.org/
@@ -26,16 +26,17 @@
 Description: karaoke game that allows user supplied songs
  Performous is a karaoke program which is based off and looks similar to
  the Singstar game for PS2. Performous is based on UltraStar and allows
- you to add your own songs in the forms of mp3s along with a song text
+ you to add your own songs in MP3 format, along with a song text
  and a music video file. It was previously called UltraStar NG.
 
 Package: performous-dbg
+Section: debug
 Architecture: any
 Depends: performous (= ${binary:Version})
 Description: karaoke game that allows user supplied songs
  Performous is a karaoke program which is based off and looks similar to
  the Singstar game for PS2. Performous is based on UltraStar and allows
- you to add your own songs in the forms of mp3s along with a song text
+ you to add your own songs in MP3 format, along with a song text
  and a music video file. It was previously called UltraStar NG.
  .
  This package includes the debugging symbols.
@@ -46,7 +47,7 @@
 Description: karaoke game - transitional package
  Performous is a karaoke program which is based off and looks similar to
  the Singstar game for PS2. Performous is based on UltraStar and allows
- you to add your own songs in the forms of mp3s along with a song text
+ you to add your own songs in MP3 format, along with a song text
  and a music video file. It was previously called UltraStar NG.
  .
  This is a transitional package to provide a smooth transition

Added: packages/trunk/performous/debian/patches/boost_fix.patch
===================================================================
--- packages/trunk/performous/debian/patches/boost_fix.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/boost_fix.patch	2009-05-26 02:32:29 UTC (rev 9785)
@@ -0,0 +1,28 @@
+Index: performous-0.3.0/libda/plugins/audio_dev_tone.cpp
+===================================================================
+--- performous-0.3.0.orig/libda/plugins/audio_dev_tone.cpp	2009-05-25 21:28:11.000000000 -0400
++++ performous-0.3.0/libda/plugins/audio_dev_tone.cpp	2009-05-25 21:29:34.000000000 -0400
+@@ -2,7 +2,7 @@
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/lambda/lambda.hpp>
+ #include <boost/lambda/bind.hpp>
+-#include <boost/spirit/core.hpp>
++#include <boost/spirit/include/classic_core.hpp>
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/xtime.hpp>
+ #include <algorithm>
+@@ -52,11 +52,12 @@
+ 		boost::xtime time;
+ 		void add(std::string const& tonestr) {
+ 			double freq = 440.0, amplitude = 0.1, phase = 0.0;
+-			using namespace boost::spirit;
++			using namespace boost::spirit::classic;
+ 			using namespace boost::lambda;
++			placeholder1_type arg1;
+ 			if (!parse(tonestr.c_str(),
+ 			  !(limit_d(1.0, s.rate() / 2.0)[real_p][assign_a(freq)]) >> *(!ch_p('.') >> (
+-			  str_p("amplitude(") >> (max_limit_d(0.0)[real_p][var(amplitude) = bind(static_cast<double(*)(double, double)>(std::pow), 10.0, _1 / 20.0)] | real_p[assign_a(amplitude)]) |
++			  str_p("amplitude(") >> (max_limit_d(0.0)[real_p][var(amplitude) = bind(static_cast<double(*)(double, double)>(std::pow), 10.0, arg1 / 20.0)] | real_p[assign_a(amplitude)]) |
+ 			  str_p("phase(") >> limit_d(0.0, 1.0)[real_p][assign_a(phase)]
+ 			  ) >> ')')
+ 			  ).full)

Added: packages/trunk/performous/debian/patches/gcc_44.patch
===================================================================
--- packages/trunk/performous/debian/patches/gcc_44.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/gcc_44.patch	2009-05-26 02:32:29 UTC (rev 9785)
@@ -0,0 +1,22 @@
+Index: performous-0.3.0/game/color.cc
+===================================================================
+--- performous-0.3.0.orig/game/color.cc	2009-05-25 21:31:35.000000000 -0400
++++ performous-0.3.0/game/color.cc	2009-05-25 21:31:53.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include "color.hh"
++#include <cstdio>
+ #include <iostream>
+ 
+ namespace {
+Index: performous-0.3.0/game/ffmpeg.hh
+===================================================================
+--- performous-0.3.0.orig/game/ffmpeg.hh	2009-05-25 21:31:09.000000000 -0400
++++ performous-0.3.0/game/ffmpeg.hh	2009-05-25 21:31:27.000000000 -0400
+@@ -10,6 +10,7 @@
+ #include <iostream>
+ #include <vector>
+ #include <limits>
++#include <stdint.h>
+ 
+ struct AudioFrame {
+ 	double timestamp;

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2009-05-23 17:27:34 UTC (rev 9784)
+++ packages/trunk/performous/debian/patches/series	2009-05-26 02:32:29 UTC (rev 9785)
@@ -1,2 +1,4 @@
 desktop.patch
 directories.patch
+boost_fix.patch
+gcc_44.patch




More information about the Pkg-games-commits mailing list