rpms/k3b-extras-freeworld/F-16 k3b-2.0.2-FFMPEG_INCLUDE_DIRS.patch, NONE, 1.1 k3b-extras-freeworld.spec, 1.26, 1.27

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/k3b-extras-freeworld/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23820

Modified Files:
	k3b-extras-freeworld.spec 
Added Files:
	k3b-2.0.2-FFMPEG_INCLUDE_DIRS.patch 
Log Message:
* Fri Feb 10 2012 Rex Dieter <rdieter at fedoraproject.org> 1:2.0.2-4
- fix for newer FindFFMPEG.cmake


k3b-2.0.2-FFMPEG_INCLUDE_DIRS.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE k3b-2.0.2-FFMPEG_INCLUDE_DIRS.patch ---
diff -up k3b-2.0.2/plugins/decoder/ffmpeg/CMakeLists.txt.ffmpeg k3b-2.0.2/plugins/decoder/ffmpeg/CMakeLists.txt
--- k3b-2.0.2/plugins/decoder/ffmpeg/CMakeLists.txt.ffmpeg	2011-01-15 14:47:29.000000000 -0600
+++ k3b-2.0.2/plugins/decoder/ffmpeg/CMakeLists.txt	2012-02-10 10:26:17.938144608 -0600
@@ -9,7 +9,7 @@ if(FFMPEG_INCLUDE_DIR_OLD_STYLE)
 else(FFMPEG_INCLUDE_DIR_OLD_STYLE)
     message(STATUS "found new ffmpegcodecpath")
     add_definitions(-DNEWFFMPEGAVCODECPATH)
-    include_directories (${FFMPEG_INCLUDE_DIR})
+    include_directories (${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS})
 endif(FFMPEG_INCLUDE_DIR_OLD_STYLE)
 
 set(k3bffmpegdecoder_PART_SRCS k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp )


Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-16/k3b-extras-freeworld.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- k3b-extras-freeworld.spec	29 Sep 2011 22:13:08 -0000	1.26
+++ k3b-extras-freeworld.spec	10 Feb 2012 17:24:16 -0000	1.27
@@ -3,19 +3,21 @@
 Summary: Additional codec plugins for the k3b CD/DVD burning application
 Epoch:   1
 Version: 2.0.2
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
 URL:     http://www.k3b.org/
 Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{?pre}.tar.bz2
-# fix build with FFmpeg 0.8 (#1960)
-Patch1:  k3b-2.0.2-ffmpeg08.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # TODO: bugzilla/document
 ExcludeArch: s390 s390x
 
 ## upstreamable patches
+# fix build with FFmpeg 0.8 (#1960)
+Patch50: k3b-2.0.2-ffmpeg08.patch
+# kde-4.7+ FindFFMPEG.cmake uses FFMPEG_INCLUDE_DIRS (instead of FFMPEG_INCLUDE_DIR)
+Patch51: k3b-2.0.2-FFMPEG_INCLUDE_DIRS.patch
 
 BuildRequires: cmake
 BuildRequires: flac-devel
@@ -48,7 +50,9 @@
 
 %prep
 %setup -q -n k3b-%{version}
-%patch1 -p1 -b .ffmpeg08
+
+%patch50 -p1 -b .ffmpeg08
+%patch51 -p1 -b .FFMPEG_INCLUDE_DIRS
 
 
 %build
@@ -92,6 +96,12 @@
 
 
 %changelog
+* Fri Feb 10 2012 Rex Dieter <rdieter at fedoraproject.org> 1:2.0.2-4
+- fix for newer FindFFMPEG.cmake
+
+* Wed Feb 08 2012 Nicolas Chauvet <kwizart at gmail.com> - 1:2.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Thu Sep 29 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.0.2-2
 - fix build with FFmpeg 0.8 (#1960)