rpms/kdemultimedia-extras-freeworld/F-14 kdemultimedia-4.6.1-ffmpeg.patch, NONE, 1.1 kdemultimedia-extras-freeworld.spec, 1.7, 1.8

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/kdemultimedia-extras-freeworld/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28913

Modified Files:
	kdemultimedia-extras-freeworld.spec 
Added Files:
	kdemultimedia-4.6.1-ffmpeg.patch 
Log Message:
sync w/devel


kdemultimedia-4.6.1-ffmpeg.patch:
 CMakeLists.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdemultimedia-4.6.1-ffmpeg.patch ---
diff -up kdemultimedia-4.6.1/ffmpegthumbs/CMakeLists.txt.ffmpeg kdemultimedia-4.6.1/ffmpegthumbs/CMakeLists.txt
--- kdemultimedia-4.6.1/ffmpegthumbs/CMakeLists.txt.ffmpeg	2011-01-19 16:23:19.000000000 -0600
+++ kdemultimedia-4.6.1/ffmpegthumbs/CMakeLists.txt	2011-04-08 11:31:03.827796748 -0500
@@ -1,6 +1,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${PC_LIBAVCODEC_INCLUDEDIR}
+    ${PC_AVCODEC_INCLUDEDIR}
+    ${PC_AVFORMAT_INCLUDEDIR}
     ${FFMPEG_INCLUDE_DIR}
     )
 


Index: kdemultimedia-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/kdemultimedia-extras-freeworld/F-14/kdemultimedia-extras-freeworld.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdemultimedia-extras-freeworld.spec	8 Apr 2011 15:56:28 -0000	1.7
+++ kdemultimedia-extras-freeworld.spec	8 Apr 2011 16:31:59 -0000	1.8
@@ -9,9 +9,11 @@
 License: GPLv2+
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+Patch50: kdemultimedia-4.6.1-ffmpeg.patch
+
 BuildRequires:  ffmpeg-devel
 BuildRequires:  glib2-devel
 BuildRequires:  kdelibs4-devel >= %{version}
@@ -34,6 +36,8 @@
 %prep
 %setup -q -n kdemultimedia-%{version}
 
+%patch50 -p1 -b .ffmpeg
+
 
 %build