Author: lisu Date: Thu Jun 30 09:00:39 2011 GMT Module: packages Tag: HEAD ---- Log message: - fixed build with ffmpeg 0.8
---- Files affected: packages/k3b: k3b.spec (1.194 -> 1.195) , k3b-ffmpeg-0.8.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/k3b/k3b.spec diff -u packages/k3b/k3b.spec:1.194 packages/k3b/k3b.spec:1.195 --- packages/k3b/k3b.spec:1.194 Mon Jun 27 21:23:01 2011 +++ packages/k3b/k3b.spec Thu Jun 30 11:00:34 2011 @@ -21,6 +21,7 @@ Group: X11/Libraries Source0: http://downloads.sourceforge.net/k3b/%{name}-%{version}.tar.bz2 # Source0-md5: c86113af31a2032e57fd2f302b5f637a +Patch0: %{name}-ffmpeg-0.8.patch URL: http://k3b.plainblack.com/ BuildRequires: Qt3Support-devel >= %{qtver} BuildRequires: QtNetwork-devel >= %{qtver} @@ -34,7 +35,7 @@ BuildRequires: automoc4 >= 0.9.88 BuildRequires: cmake >= 2.8.0 BuildRequires: docbook-dtd42-xml -BuildRequires: ffmpeg-devel +BuildRequires: ffmpeg-devel >= 0.8 BuildRequires: flac-c++-devel BuildRequires: kde4-kdebase-workspace-devel >= %{kdever} BuildRequires: kde4-kdelibs-devel >= %{kdever} @@ -140,6 +141,7 @@ %prep %setup -q +%patch0 -p1 %build install -d build @@ -255,6 +257,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.195 2011/06/30 09:00:34 lisu +- fixed build with ffmpeg 0.8 + Revision 1.194 2011/06/27 19:23:01 arekm - release 2 ================================================================ Index: packages/k3b/k3b-ffmpeg-0.8.patch diff -u /dev/null packages/k3b/k3b-ffmpeg-0.8.patch:1.1 --- /dev/null Thu Jun 30 11:00:39 2011 +++ packages/k3b/k3b-ffmpeg-0.8.patch Thu Jun 30 11:00:34 2011 @@ -0,0 +1,11 @@ +--- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp~ 2011-01-15 21:47:29.000000000 +0100 ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2011-06-30 10:57:03.437376120 +0200 +@@ -109,7 +109,7 @@ + #else + ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; + #endif +- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { ++ if( codecContext->codec_type != AVMEDIA_TYPE_AUDIO ) { + kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; + return false; + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/k3b/k3b.spec?r1=1.194&r2=1.195&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
