rpms/k9copy/devel k9copy-2.3.0-gcc44.patch, NONE, 1.1 k9copy-2.3.1-ffmpeg.patch, NONE, 1.1 k9copy-2.1.0-ffmpeg.patch, 1.1, NONE
Author: rdieter
Update of /cvs/free/rpms/k9copy/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21198
Added Files:
k9copy-2.3.0-gcc44.patch k9copy-2.3.1-ffmpeg.patch
Removed Files:
k9copy-2.1.0-ffmpeg.patch
Log Message:
new patches
k9copy-2.3.0-gcc44.patch:
--- NEW FILE k9copy-2.3.0-gcc44.patch ---
diff -up k9copy-2.3.0-Source/src/core/k9tools.cpp.gcc44
k9copy-2.3.0-Source/src/core/k9tools.cpp
--- k9copy-2.3.0-Source/src/core/k9tools.cpp.gcc44 2009-03-12 08:32:29.000000000 -0500
+++ k9copy-2.3.0-Source/src/core/k9tools.cpp 2009-04-03 15:37:05.000000000 -0500
@@ -26,6 +26,12 @@
#include <KUser>
#include <QDebug>
+#if defined(HAVE_INTTYPES_H)
+ #include <inttypes.h>
+#elif defined( HAVE_STDINT_H)
+ #include <stdint.h>
+#endif
+
QStringList m_temporaryDirs;
QString g_password="";
k9copy-2.3.1-ffmpeg.patch:
--- NEW FILE k9copy-2.3.1-ffmpeg.patch ---
diff -up k9copy-2.3.1-Source/src/import/k9avidecode.cpp.ffmpeg
k9copy-2.3.1-Source/src/import/k9avidecode.cpp
--- k9copy-2.3.1-Source/src/import/k9avidecode.cpp.ffmpeg 2009-04-04 03:32:21.000000000
-0500
+++ k9copy-2.3.1-Source/src/import/k9avidecode.cpp 2009-04-06 10:31:37.000000000 -0500
@@ -10,13 +10,13 @@
//
//
#include "k9avidecode.h"
-#include <avcodec.h>
+#include <libavcodec/avcodec.h>
#include <qimage.h>
#include <dlfcn.h>
#include <klocale.h>
#ifdef HAVE_SWSCALE
-#include "swscale.h"
+#include <libswscale/swscale.h>
static int sws_flags = SWS_BICUBIC;
diff -up k9copy-2.3.1-Source/src/import/k9avidecode.h.ffmpeg
k9copy-2.3.1-Source/src/import/k9avidecode.h
--- k9copy-2.3.1-Source/src/import/k9avidecode.h.ffmpeg 2009-04-04 03:32:21.000000000
-0500
+++ k9copy-2.3.1-Source/src/import/k9avidecode.h 2009-04-06 10:30:10.000000000 -0500
@@ -14,12 +14,12 @@
#include "k9common.h"
#include <qobject.h>
-#include <avformat.h>
+#include <libavformat/avformat.h>
#include <qimage.h>
#include <cstdlib>
#include <QObject>
#ifdef HAVE_SWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
#endif
/**
@author Jean-Michel PETIT <k9copy(a)free.fr>
--- k9copy-2.1.0-ffmpeg.patch DELETED ---