rpms/qmmp-plugins-freeworld/EL-6 qmmp-ffmpeg-0.4.9-0.52.20080908.patch, NONE, 1.1 qmmp-plugins-freeworld.spec, 1.17, 1.18

[Karel Volný]

Author: kvolny

Update of /cvs/free/rpms/qmmp-plugins-freeworld/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17458

Modified Files:
	qmmp-plugins-freeworld.spec 
Added Files:
	qmmp-ffmpeg-0.4.9-0.52.20080908.patch 
Log Message:
* Tue Aug 30 2011 Karel Volný <kvolny at redhat.com> 0.5.1-1
- version bump
- patch to compile with latest ffmpeg available in EL-6


qmmp-ffmpeg-0.4.9-0.52.20080908.patch:
 CMakeLists.txt           |    2 +-
 decoderffmpegfactory.cpp |   41 +++++++----------------------------------
 2 files changed, 8 insertions(+), 35 deletions(-)

--- NEW FILE qmmp-ffmpeg-0.4.9-0.52.20080908.patch ---
--- src/plugins/Input/ffmpeg/CMakeLists.txt~	2011-04-25 08:09:08.000000000 +0200
+++ src/plugins/Input/ffmpeg/CMakeLists.txt	2011-08-30 17:50:09.848727339 +0200
@@ -28,7 +28,7 @@
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # libffmpeg
-pkg_check_modules(FFMPEG libavcodec>=52.20.0 libavformat>=52.31.0 libavutil>=49.15.0)
+pkg_check_modules(FFMPEG libavcodec>=51.71.0 libavformat>=52.22.1 libavutil>=49.10.0)
 
 include_directories(${FFMPEG_INCLUDE_DIRS})
 link_directories(${FFMPEG_LIBRARY_DIRS})
--- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp    2011-05-16 10:12:34.000000000 +0200
+++ src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp~   2010-05-11 20:20:28.000000000 +0200
@@ -130,40 +162,13 @@
 
     if (useMetaData)
     {
-        AVMetadataTag *album = av_metadata_get(in->metadata,"album",0,0);
-        if(!album)
-            album = av_metadata_get(in->metadata,"WM/AlbumTitle",0,0);
-        AVMetadataTag *artist = av_metadata_get(in->metadata,"artist",0,0);
-        if(!artist)
-            artist = av_metadata_get(in->metadata,"author",0,0);
-        AVMetadataTag *comment = av_metadata_get(in->metadata,"comment",0,0);
-        AVMetadataTag *genre = av_metadata_get(in->metadata,"genre",0,0);
-        AVMetadataTag *title = av_metadata_get(in->metadata,"title",0,0);
-        AVMetadataTag *year = av_metadata_get(in->metadata,"WM/Year",0,0);
-        if(!year)
-            year = av_metadata_get(in->metadata,"year",0,0);
-        if(!year)
-            year = av_metadata_get(in->metadata,"date",0,0);
-        AVMetadataTag *track = av_metadata_get(in->metadata,"track",0,0);
-        if(!track)
-            track = av_metadata_get(in->metadata,"WM/Track",0,0);
-        if(!track)
-            track = av_metadata_get(in->metadata,"WM/TrackNumber",0,0);
-
-        if(album)
-            info->setMetaData(Qmmp::ALBUM, QString::fromUtf8(album->value).trimmed());
-        if(artist)
-            info->setMetaData(Qmmp::ARTIST, QString::fromUtf8(artist->value).trimmed());
-        if(comment)
-            info->setMetaData(Qmmp::COMMENT, QString::fromUtf8(comment->value).trimmed());
-        if(genre)
-            info->setMetaData(Qmmp::GENRE, QString::fromUtf8(genre->value).trimmed());
-        if(title)
-            info->setMetaData(Qmmp::TITLE, QString::fromUtf8(title->value).trimmed());
-        if(year)
-            info->setMetaData(Qmmp::YEAR, year->value);
-        if(track)
-            info->setMetaData(Qmmp::TRACK, track->value);
+        info->setMetaData(Qmmp::ALBUM, QString::fromUtf8(in->album).trimmed());
+        info->setMetaData(Qmmp::ARTIST, QString::fromUtf8(in->author).trimmed());
+        info->setMetaData(Qmmp::COMMENT, QString::fromUtf8(in->comment).trimmed());
+        info->setMetaData(Qmmp::GENRE, QString::fromUtf8(in->genre).trimmed());
+        info->setMetaData(Qmmp::TITLE, QString::fromUtf8(in->title).trimmed());
+        info->setMetaData(Qmmp::YEAR, in->year);
+        info->setMetaData(Qmmp::TRACK, in->track);
     }
     info->setLength(in->duration/AV_TIME_BASE);
     av_close_input_file(in);


Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/EL-6/qmmp-plugins-freeworld.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qmmp-plugins-freeworld.spec	24 Jun 2011 16:15:56 -0000	1.17
+++ qmmp-plugins-freeworld.spec	30 Aug 2011 16:28:06 -0000	1.18
@@ -10,6 +10,7 @@
 Source2:	qmmp-filter-provides.sh
 %define		_use_internal_dependency_generator 0
 %define		__find_provides %{_builddir}/%{buildsubdir}/qmmp-filter-provides.sh
+Patch0:		qmmp-ffmpeg-0.4.9-0.52.20080908.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -19,7 +20,7 @@
 BuildRequires:	libmad-devel qt-devel >= 4.3
 BuildRequires:	libmms-devel
 BuildRequires:	taglib-devel libcurl-devel
-BuildRequires:	qmmp%{?_isa} = %{version}
+#BuildRequires:	qmmp%{?_isa} = %{version}
 Requires:	qmmp%{?_isa} = %{version}
 
 %description
@@ -32,14 +33,7 @@
 %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
+%patch0
 
 
 %build
@@ -130,8 +124,9 @@
 
 
 %changelog
-* Fri Jun 24 2011 Karel Volný <kvolny at redhat.com> 0.5.1-1
+* Tue Aug 30 2011 Karel Volný <kvolny at redhat.com> 0.5.1-1
 - version bump
+- patch to compile with latest ffmpeg available in EL-6
 
 * Wed Dec 15 2010 Karel Volný <kvolny at redhat.com> 0.4.3-1
 - version bump