Author: arekm Date: Sun Sep 11 19:22:18 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 10; fix build with new ffmpeg
---- Files affected: packages/performous: performous.spec (1.25 -> 1.26) , performous-ffmpeg.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/performous/performous.spec diff -u packages/performous/performous.spec:1.25 packages/performous/performous.spec:1.26 --- packages/performous/performous.spec:1.25 Fri Sep 9 21:10:07 2011 +++ packages/performous/performous.spec Sun Sep 11 21:22:13 2011 @@ -3,11 +3,12 @@ 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 @@ -73,6 +74,7 @@ %prep %setup -qn Performous-%{version}-Source +%patch0 -p1 %build mkdir build @@ -125,6 +127,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.26 2011/09/11 19:22:13 arekm +- rel 10; fix build with new ffmpeg + Revision 1.25 2011/09/09 19:10:07 arekm - release 9 ================================================================ Index: packages/performous/performous-ffmpeg.patch diff -u /dev/null packages/performous/performous-ffmpeg.patch:1.1 --- /dev/null Sun Sep 11 21:22:18 2011 +++ packages/performous/performous-ffmpeg.patch Sun Sep 11 21:22:13 2011 @@ -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"); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/performous/performous.spec?r1=1.25&r2=1.26&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
