rpms/qmmp-plugins-freeworld/F-8 qmmp-plugins-freeworld.spec, 1.3, 1.4

Author: kvolny Update of /cvs/free/rpms/qmmp-plugins-freeworld/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv6649 Modified Files: qmmp-plugins-freeworld.spec Log Message: corrected the build issue with ffmpeg from rpmfusion (finally ...) Index: qmmp-plugins-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-8/qmmp-plugins-freeworld.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qmmp-plugins-freeworld.spec 20 Aug 2008 15:09:13 -0000 1.3 +++ qmmp-plugins-freeworld.spec 5 Sep 2008 12:12:55 -0000 1.4 @@ -1,6 +1,6 @@ Name: qmmp-plugins-freeworld Version: 0.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Plugins for qmmp (Qt-based multimedia player) Group: Applications/Multimedia @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: cmake ffmpeg-devel < 0.4.9-0.8 libmad-devel qt4-devel >= 4.2 +BuildRequires: cmake ffmpeg-devel >= 0.4.9-0.47.20080614 libmad-devel qt4-devel >= 4.2 BuildRequires: taglib-devel curl-devel BuildRequires: qmmp = %{version} Requires: qmmp = %{version} @@ -28,6 +28,15 @@ %setup -q -n qmmp-%{version} cp %{SOURCE2} . chmod +x qmmp-filter-provides.sh +# adjust includes for the header move in latest ffmpeg +sed -i \ + -e 's|<avcodec.h|<libavcodec/avcodec.h|g' \ + -e 's|g/avcodec.h|g/libavcodec/avcodec.h|g' \ + -e 's|<avformat.h|<libavformat/avformat.h|g' \ + -e 's|g/avformat.h|g/libavformat/avformat.h|g' \ + src/plugins/Input/ffmpeg/decoder_ffmpeg.h \ + src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp \ + src/plugins/Input/ffmpeg/detailsdialog.cpp %build @@ -78,6 +87,9 @@ %changelog +* Fri Sep 05 2008 Karel Volny <kvolny(a)redhat.com&gt; 0.2.0-7 +- corrected the ffmpeg headers issue + * Wed Aug 20 2008 Karel Volny <kvolny(a)redhat.com&gt; 0.2.0-6 - reverted previous change, the new ffmpeg is not released in this branch