- rel 10; fix build with new ffmpeg

Changed files:
    performous-ffmpeg.patch -> 1.1
    performous.spec -> 1.26

diff --git a/performous-ffmpeg.patch b/performous-ffmpeg.patch
new file mode 100644 (file)
index 0000000..5058fca
--- /dev/null
+++ b/performous-ffmpeg.patch
@@ -0,0 +1,14 @@
+diff -ur Performous-0.6.1-Source.org/game/ffmpeg.cc Performous-0.6.1-Source/game/ffmpeg.cc
+--- Performous-0.6.1-Source.org/game/ffmpeg.cc 2010-10-31 17:05:43.000000000 +0100
++++ Performous-0.6.1-Source/game/ffmpeg.cc     2011-09-11 21:20:47.661140779 +0200
+@@ -60,8 +60,8 @@
+       for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) {
+               AVCodecContext* cc = pFormatCtx->streams[i]->codec;
+               cc->workaround_bugs = FF_BUG_AUTODETECT;
+-              if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i;
+-              if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i;
++              if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i;
++              if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i;
+       }
+       if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found");
+       if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found");

diff --git a/performous.spec b/performous.spec
index 2c4a3ce314c58e08a89dad395e6ee23afbaa8767..35c824214bec925207909b4946bf437b79d3e037 100644 (file)
--- a/performous.spec
+++ b/performous.spec
@@ -2,11 +2,12 @@ Summary:      Performous - a free cross-platform singing game
 Summary(pl.UTF-8):     Performous - wieloplatformowa, wolnodostępna gra w śpiewanie
 Name:          performous
 Version:       0.6.1
-Release:       9
+Release:       10
 License:       GPL v2+
 Group:         Applications
 Source0:       http://downloads.sourceforge.net/performous/Performous-%{version}-Source.tar.bz2
 # Source0-md5: 451a759de77984b5a699e91107fe52e2
+Patch0:                %{name}-ffmpeg.patch
 URL:           http://performous.org/
 BuildRequires: ImageMagick-c++-devel
 BuildRequires: SDL-devel
@@ -72,6 +73,7 @@ Zestaw narzędzi do konwersji danych dla programu Performous.
 
 %prep
 %setup -qn Performous-%{version}-Source
+%patch0 -p1
 
 %build
 mkdir build