rpms/kmediafactory/devel kmediafactory-0.8.1-ffmpeg.patch, NONE, 1.1 kmediafactory.spec, 1.16, 1.17

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/kmediafactory/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11012

Modified Files:
	kmediafactory.spec 
Added Files:
	kmediafactory-0.8.1-ffmpeg.patch 
Log Message:
* Mon Oct 22 2012 Rex Dieter <rdieter at fedoraproject.org> 0.8.1-2
- fix for newer ffmpeg
- BR: libkexiv2-devel


kmediafactory-0.8.1-ffmpeg.patch:
 videofile.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kmediafactory-0.8.1-ffmpeg.patch ---
diff -up kmediafactory-0.8.1/lib/videofile.cpp.ffmpeg kmediafactory-0.8.1/lib/videofile.cpp
--- kmediafactory-0.8.1/lib/videofile.cpp.ffmpeg	2011-08-01 02:47:08.000000000 -0500
+++ kmediafactory-0.8.1/lib/videofile.cpp	2012-10-22 06:29:32.797016215 -0500
@@ -58,7 +58,7 @@ bool VideoFile::open(const QString& file
     static bool init=false;
     if(!init) {
         av_register_all();
-        avcodec_init();
+        // avcodec_init();  // avodec_init has been deprecated since at least ffmpeg-0.10.x
         avcodec_register_all();
         av_log_set_level(0);
         init=true;
@@ -66,7 +66,11 @@ bool VideoFile::open(const QString& file
 
     close();
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0)
+    if ( avformat_open_input(&avFromatContext, QFile::encodeName(filename).constData(), 0L, 0) != 0 ||
+#else
     if ( av_open_input_file(&avFromatContext, QFile::encodeName(filename).constData(), 0L, 0, 0L) != 0 ||
+#endif
          av_find_stream_info(avFromatContext) < 0) {
         close();
     }


Index: kmediafactory.spec
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/devel/kmediafactory.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kmediafactory.spec	26 Jun 2012 09:08:00 -0000	1.16
+++ kmediafactory.spec	22 Oct 2012 11:47:13 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           kmediafactory
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A template based DVD authoring tool
 
 Group:          User Interface/Desktops
@@ -17,6 +17,8 @@
 Patch50: kmediafactory-0.8.1-gcc47.patch
 # http://code.google.com/p/kmediafactory/issues/detail?id=18
 Patch51: kmediafactory-0.8.0-dso.patch
+# fix for newer ffmpeg
+Patch52: kmediafactory-0.8.1-ffmpeg.patch
 
 BuildRequires:  kdelibs4-devel
 BuildRequires:  dvdauthor
@@ -29,6 +31,7 @@
 BuildRequires:  mlt
 BuildRequires:  mjpegtools 
 BuildRequires:  pcre-devel
+BuildRequires:  pkgconfig(libkexiv2)
 BuildRequires:  zip 
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -70,6 +73,7 @@
 %patch1 -p1 -b .mlt-melt
 %patch50 -p1 -b .gcc47
 %patch51 -p1 -b .dso
+%patch52 -p1 -b .ffmpeg
 
 
 %build
@@ -157,6 +161,10 @@
 
 
 %changelog
+* Mon Oct 22 2012 Rex Dieter <rdieter at fedoraproject.org> 0.8.1-2
+- fix for newer ffmpeg
+- BR: libkexiv2-devel
+
 * Tue Jun 26 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.8.1-2
 - Rebuilt for FFmpeg