rpms/kino/devel kino-ffmpeg.patch,NONE,1.1 kino.spec,1.1,1.2

[Dan Horák]

Author: sharkcz

Update of /cvs/free/rpms/kino/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3601

Modified Files:
	kino.spec 
Added Files:
	kino-ffmpeg.patch 
Log Message:
* Mon Aug 11 2008 Dan Horák <dan at danny.cz> - 1.3.0-2
- fix build with new ffmpeg


kino-ffmpeg.patch:

--- NEW FILE kino-ffmpeg.patch ---
diff -Nru kino-1.3.0.orig/src/frame.h kino-1.3.0/src/frame.h
--- kino-1.3.0.orig/src/frame.h	2007-11-08 05:34:06.000000000 +0100
+++ kino-1.3.0/src/frame.h	2008-08-11 08:48:35.000000000 +0200
@@ -48,10 +48,10 @@
 #if defined(HAVE_LIBAVCODEC)
 extern "C"
 {
-#   include <avcodec.h>
-#   include <avformat.h>
+#   include <libavcodec/avcodec.h>
+#   include <libavformat/avformat.h>
 #ifdef HAVE_SWSCALE
-#   include <swscale.h>
+#   include <libswscale/swscale.h>
 #endif
 }
 #endif


Index: kino.spec
===================================================================
RCS file: /cvs/free/rpms/kino/devel/kino.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kino.spec	23 Jul 2008 05:45:54 -0000	1.1
+++ kino.spec	11 Aug 2008 09:51:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           kino
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kino is a non-linear DV editor for GNU/Linux
 
 Group:          Applications/Multimedia
@@ -9,6 +9,7 @@
 Source0:        http://dl.sf.net/kino/kino-%{version}.tar.gz
 Patch0:         %{name}-udev.patch
 Patch3:         %{name}-gcc43.patch
+Patch4:         %{name}-ffmpeg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel
@@ -50,6 +51,7 @@
 %setup -q
 %patch0 -p1 -b .udev
 %patch3 -p1 -b .gcc43
+%patch4 -p1 -b .ffmpeg
 
 
 %build
@@ -102,6 +104,9 @@
 %{_includedir}/kino
 
 %changelog
+* Mon Aug 11 2008 Dan Horák <dan at danny.cz> - 1.3.0-2
+- fix build with new ffmpeg
+
 * Mon Mar 03 2008 Dan Horák <dan at danny.cz> - 1.3.0-1
 1.3.0
 - dropped upstream'd patches