Author: rdieter Update of /cvs/free/rpms/k9copy/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv1059 Modified Files: .cvsignore k9copy.spec sources Added Files: k9copy-2.3.4-ffmpeg.patch Removed Files: k9copy-2.3.1-ffmpeg.patch Log Message: * Wed Dec 23 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.3.4-1 - k9copy-2.3.4 k9copy-2.3.4-ffmpeg.patch: k9avidecode.cpp | 4 ++-- k9avidecode.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE k9copy-2.3.4-ffmpeg.patch --- diff -up k9copy-2.3.4-Source/src/import/k9avidecode.cpp.ffmpeg k9copy-2.3.4-Source/src/import/k9avidecode.cpp --- k9copy-2.3.4-Source/src/import/k9avidecode.cpp.ffmpeg 2009-12-06 04:13:36.000000000 -0600 +++ k9copy-2.3.4-Source/src/import/k9avidecode.cpp 2009-12-23 12:57:34.186559784 -0600 @@ -10,14 +10,14 @@ // // #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.4-Source/src/import/k9avidecode.h.ffmpeg k9copy-2.3.4-Source/src/import/k9avidecode.h --- k9copy-2.3.4-Source/src/import/k9avidecode.h.ffmpeg 2009-12-06 04:13:36.000000000 -0600 +++ k9copy-2.3.4-Source/src/import/k9avidecode.h 2009-12-23 12:56:18.225559575 -0600 @@ -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&gt; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/k9copy/F-12/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 29 Aug 2009 18:23:04 -0000 1.9 +++ .cvsignore 23 Dec 2009 19:38:27 -0000 1.10 @@ -1 +1 @@ -k9copy-2.3.3-Source.tar.gz +k9copy-2.3.4-Source.tar.gz Index: k9copy.spec =================================================================== RCS file: /cvs/free/rpms/k9copy/F-12/k9copy.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- k9copy.spec 29 Aug 2009 18:45:35 -0000 1.16 +++ k9copy.spec 23 Dec 2009 19:38:27 -0000 1.17 @@ -1,6 +1,6 @@ Name: k9copy -Version: 2.3.3 +Version: 2.3.4 Release: 1%{?dist} Summary: Video DVD backup and creation program Group: Applications/Multimedia @@ -9,7 +9,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: k9copy-2.3.1-ffmpeg.patch +Patch1: k9copy-2.3.4-ffmpeg.patch Patch2: k9copy-2.1.0-mimetype.patch BuildRequires: cmake @@ -104,6 +104,9 @@ %changelog +* Wed Dec 23 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.3.4-1 +- k9copy-2.3.4 + * Sat Aug 29 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.3.3-1 - k9copy-2.3.3 Index: sources =================================================================== RCS file: /cvs/free/rpms/k9copy/F-12/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 29 Aug 2009 18:23:04 -0000 1.9 +++ sources 23 Dec 2009 19:38:27 -0000 1.10 @@ -1 +1 @@ -8c3f3dc82949f9629cf619cd8aeb8160 k9copy-2.3.3-Source.tar.gz +7b266bb548c4c649f3a691490ccae81c k9copy-2.3.4-Source.tar.gz --- k9copy-2.3.1-ffmpeg.patch DELETED ---