Author: rdieter Update of /cvs/free/rpms/k9copy/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19714 Modified Files: k9copy.spec Added Files: k9copy-1.2.2-ffmpeg.patch k9copy-1.2.2-gcc43.patch Log Message: fix build k9copy-1.2.2-ffmpeg.patch: --- NEW FILE k9copy-1.2.2-ffmpeg.patch --- diff -up k9copy-1.2.2/k9author/k9avidecode.cpp.ffmpeg k9copy-1.2.2/k9author/k9avidecode.cpp --- k9copy-1.2.2/k9author/k9avidecode.cpp.ffmpeg 2008-10-13 07:37:35.000000000 -0500 +++ k9copy-1.2.2/k9author/k9avidecode.cpp 2008-10-13 07:37:44.000000000 -0500 @@ -10,7 +10,7 @@ // // #include "k9avidecode.h" -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> #include <qimage.h> #include <dlfcn.h> #include <klocale.h> diff -up k9copy-1.2.2/k9author/k9avidecode.h.ffmpeg k9copy-1.2.2/k9author/k9avidecode.h --- k9copy-1.2.2/k9author/k9avidecode.h.ffmpeg 2007-09-29 14:12:56.000000000 -0500 +++ k9copy-1.2.2/k9author/k9avidecode.h 2008-10-13 07:35:52.000000000 -0500 @@ -14,7 +14,7 @@ #include "k9common.h" #include <qobject.h> -#include <ffmpeg/avformat.h> +#include <libavformat/avformat.h> #include <qimage.h> /** k9copy-1.2.2-gcc43.patch: --- NEW FILE k9copy-1.2.2-gcc43.patch --- diff -up k9copy-1.2.2/k9author/k9avidecode.cpp.gcc43 k9copy-1.2.2/k9author/k9avidecode.cpp --- k9copy-1.2.2/k9author/k9avidecode.cpp.gcc43 2008-10-13 07:43:09.000000000 -0500 +++ k9copy-1.2.2/k9author/k9avidecode.cpp 2008-10-13 07:45:22.000000000 -0500 @@ -14,6 +14,7 @@ #include <qimage.h> #include <dlfcn.h> #include <klocale.h> +#include <cstdlib> #include "ac.h" diff -up k9copy-1.2.2/src/k9glwidget.cpp.gcc43 k9copy-1.2.2/src/k9glwidget.cpp --- k9copy-1.2.2/src/k9glwidget.cpp.gcc43 2007-09-09 01:45:21.000000000 -0500 +++ k9copy-1.2.2/src/k9glwidget.cpp 2008-10-13 07:46:34.000000000 -0500 @@ -18,6 +18,7 @@ #include <qdatetime.h> #include "ac.h" #include <X11/Xlib.h> +#include <cstdlib> k9GLWidget::k9GLWidget(QWidget *parent, const char *name):QGLWidget(parent, name) { XMapRaised(x11Display(),winId()); Index: k9copy.spec =================================================================== RCS file: /cvs/free/rpms/k9copy/F-8/k9copy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- k9copy.spec 13 Oct 2008 12:18:20 -0000 1.3 +++ k9copy.spec 13 Oct 2008 12:48:44 -0000 1.4 @@ -18,6 +18,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: k9copy-1.2.2-sprintf-overflow.patch +Patch1: k9copy-1.2.2-ffmpeg.patch +Patch2: k9copy-1.2.2-gcc43.patch BuildRequires: dbus-qt-devel BuildRequires: ffmpeg-devel @@ -45,7 +47,9 @@ %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .sprintf-overflow +%patch1 -p1 -b .ffmpeg +%patch2 -p1 -b .gcc43 # Permission fixes chmod -x */*.h */*.cpp AUTHORS COPYING TODO @@ -59,6 +63,9 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh +CPPFLAGS="$(pkg-config --cflags libavcodec) $(pkg-config --cflags libavformat) $CPPFLAGS" +export CPPFLAGS + %configure \ --disable-rpath \ --enable-new-ldflags \