Revision
99293
Author
nicos@macports.org
Date
2012-10-31 05:08:40 -0700 (Wed, 31 Oct 2012)

Log Message

kdemultimedia4: fixing build after upgrade of ffmpeg

Modified Paths

Added Paths

Diff

Modified: trunk/dports/kde/kdemultimedia4/Portfile (99292 => 99293)


--- trunk/dports/kde/kdemultimedia4/Portfile	2012-10-31 10:01:47 UTC (rev 99292)
+++ trunk/dports/kde/kdemultimedia4/Portfile	2012-10-31 12:08:40 UTC (rev 99293)
@@ -28,6 +28,9 @@
                     path:lib/libavcodec.dylib:ffmpeg \
                     port:taglib
 
+#Patch from version 4.9.0 which supports higher versions of ffmpeg
+patchfiles          patch-moviedecoder.diff
+
 configure.args-append   -DBUILD_dragonplayer=ON \
                         -DBUILD_juk=ON \
                         -DBUILD_kmix=OFF \

Added: trunk/dports/kde/kdemultimedia4/files/patch-moviedecoder.diff (0 => 99293)


--- trunk/dports/kde/kdemultimedia4/files/patch-moviedecoder.diff	                        (rev 0)
+++ trunk/dports/kde/kdemultimedia4/files/patch-moviedecoder.diff	2012-10-31 12:08:40 UTC (rev 99293)
@@ -0,0 +1,16 @@
+--- ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp.orig	2012-08-01 01:25:06.000000000 +0900
++++ ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp	2012-05-31 01:49:24.000000000 +0900
+@@ -52,12 +52,11 @@
+ void MovieDecoder::initialize(const QString& filename)
+ {
+     av_register_all();
+-    avcodec_init();
+     avcodec_register_all();
+ 
+     QFileInfo fileInfo(filename);
+ 
+-    if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
++    if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
+         kDebug() <<  "Could not open input file: " << fileInfo.absoluteFilePath();
+         return;
+     }