rpms/k3b-extras-freeworld/devel k3b-1.91.0-ffmpeg06.patch, NONE, 1.1 k3b-1.91.0-qt47.patch, NONE, 1.1 k3b-extras-freeworld.spec, 1.16, 1.17

[Kevin Kofler]

Author: kkofler

Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16545/devel

Modified Files:
	k3b-extras-freeworld.spec 
Added Files:
	k3b-1.91.0-ffmpeg06.patch k3b-1.91.0-qt47.patch 
Log Message:
- fix build with Qt 4.7 (upstream patch by cfeck)
- fix build with FFmpeg 0.6 snapshots (define __STDC_CONSTANT_MACROS)

k3b-1.91.0-ffmpeg06.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE k3b-1.91.0-ffmpeg06.patch ---
diff -ur k3b-1.91.0/plugins/decoder/ffmpeg/CMakeLists.txt k3b-1.91.0-ffmpeg06/plugins/decoder/ffmpeg/CMakeLists.txt
--- k3b-1.91.0/plugins/decoder/ffmpeg/CMakeLists.txt	2010-03-09 07:46:18.000000000 +0100
+++ k3b-1.91.0-ffmpeg06/plugins/decoder/ffmpeg/CMakeLists.txt	2010-05-16 01:03:49.000000000 +0200
@@ -12,6 +12,8 @@
     include_directories (${FFMPEG_INCLUDE_DIR})
 endif(FFMPEG_INCLUDE_DIR_OLD_STYLE)
 
+add_definitions(-D__STDC_CONSTANT_MACROS)
+
 set(k3bffmpegdecoder_PART_SRCS k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp )
 
 kde4_add_plugin(k3bffmpegdecoder ${k3bffmpegdecoder_PART_SRCS})

k3b-1.91.0-qt47.patch:
 k3bbinimagewritingjob.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE k3b-1.91.0-qt47.patch ---
Index: libk3b/jobs/k3bbinimagewritingjob.cpp
===================================================================
--- libk3b/jobs/k3bbinimagewritingjob.cpp	(revision 1102481)
+++ libk3b/jobs/k3bbinimagewritingjob.cpp	(revision 1102482)
@@ -37,7 +37,7 @@
       m_device(0),
       m_simulate(false),
       m_noFix(false),
-      m_tocFile(0),
+      m_tocFile(),
       m_speed(2),
       m_copies(1),
       m_writer(0)


Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- k3b-extras-freeworld.spec	15 May 2010 21:15:06 -0000	1.16
+++ k3b-extras-freeworld.spec	15 May 2010 23:07:41 -0000	1.17
@@ -5,12 +5,16 @@
 Summary: Additional codec plugins for the k3b CD/DVD burning application
 Epoch:   1
 Version: 1.91.0
-Release: 1%{?dist}
+Release: 2%{?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 Qt 4.7: http://websvn.kde.org/?view=revision&revision=1102482
+Patch0:  k3b-1.91.0-qt47.patch
+# fix build with FFmpeg 0.6 snapshots (define __STDC_CONSTANT_MACROS)
+Patch1:  k3b-1.91.0-ffmpeg06.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # TODO: bugzilla/document
 ExcludeArch: s390 s390x
@@ -48,6 +52,8 @@
 
 %prep
 %setup -q -n k3b-%{version}
+%patch0 -p0 -b .qt47
+%patch1 -p1 -b .ffmpeg06
 
 
 %build
@@ -93,6 +99,8 @@
 %changelog
 * Sat May 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:1.91.0-1
 - k3b-1.91.0 (rc2)
+- fix build with Qt 4.7 (upstream patch by cfeck)
+- fix build with FFmpeg 0.6 snapshots (define __STDC_CONSTANT_MACROS)
 
 * Fri Mar 05 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:1.90.0-1
 - k3b-1.90.0 (rc1)