Author: lisu Date: Fri Jul 1 18:35:41 2011 GMT Module: packages Tag: HEAD ---- Log message: - attempt to fix build with ffmpeg 0.8
---- Files affected: packages/kde4-kdemultimedia: kde4-kdemultimedia.spec (1.99 -> 1.100) , kde4-kdemultimedia-ffmpeg.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kde4-kdemultimedia/kde4-kdemultimedia.spec diff -u packages/kde4-kdemultimedia/kde4-kdemultimedia.spec:1.99 packages/kde4-kdemultimedia/kde4-kdemultimedia.spec:1.100 --- packages/kde4-kdemultimedia/kde4-kdemultimedia.spec:1.99 Fri Jul 1 14:50:27 2011 +++ packages/kde4-kdemultimedia/kde4-kdemultimedia.spec Fri Jul 1 20:35:36 2011 @@ -13,13 +13,14 @@ Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 # Source0-md5: 7198fc277b1b98920c0e970a23559e53 +Patch0: %{name}-ffmpeg.patch BuildRequires: Qt3Support-devel >= %{qtver} BuildRequires: QtSvg-devel >= %{qtver} BuildRequires: QtTest-devel >= %{qtver} BuildRequires: automoc4 >= 0.9.88 BuildRequires: cdparanoia-III-devel BuildRequires: cmake >= 2.8.0 -BuildRequires: ffmpeg-devel +BuildRequires: ffmpeg-devel >= 0.8 BuildRequires: flac-devel >= 1.1.2 BuildRequires: kde4-kdebase-workspace-devel >= %{version} BuildRequires: kde4-kdelibs-devel >= %{version} @@ -198,7 +199,7 @@ Summary(pl.UTF-8): Generator podglądów video dla KDE Group: X11/Applications Requires: kde4-kdebase >= %{version} -Requires: ffmpeg +Requires: ffmpeg >= 0.8 %description ffmpegthumbs FFMpegThumbs is a video thumbnail generator for KDE file managers @@ -206,6 +207,7 @@ %prep %setup -q -n %{orgname}-%{version} +%patch0 -p1 %build install -d build @@ -352,6 +354,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.100 2011/07/01 18:35:36 lisu +- attempt to fix build with ffmpeg 0.8 + Revision 1.99 2011/07/01 12:50:27 arekm - up to 4.6.5 ================================================================ Index: packages/kde4-kdemultimedia/kde4-kdemultimedia-ffmpeg.patch diff -u /dev/null packages/kde4-kdemultimedia/kde4-kdemultimedia-ffmpeg.patch:1.1 --- /dev/null Fri Jul 1 20:35:41 2011 +++ packages/kde4-kdemultimedia/kde4-kdemultimedia-ffmpeg.patch Fri Jul 1 20:35:36 2011 @@ -0,0 +1,11 @@ +--- kdemultimedia-4.6.5/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp~ 2011-01-19 23:23:19.000000000 +0100 ++++ kdemultimedia-4.6.5/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp 2011-07-01 20:32:00.304827068 +0200 +@@ -122,7 +122,7 @@ + void MovieDecoder::initializeVideo() + { + for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) { +- if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) { ++ if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { + m_pVideoStream = m_pFormatContext->streams[i]; + m_VideoStream = i; + break; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdemultimedia/kde4-kdemultimedia.spec?r1=1.99&r2=1.100&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
