rpms/kdemultimedia/devel kdemultimedia-4.2.0-dragon-second-sound.patch, NONE, 1.1 kdemultimedia.spec, 1.134, 1.135

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8887/devel

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-4.2.0-dragon-second-sound.patch 
Log Message:
* Sun Feb 22 2009 Tejas Dinkar <tejas at gja.in> - 4.2.0-3
- Added a patch for dragon player to fix kde#165249 (from 4.2.1)

kdemultimedia-4.2.0-dragon-second-sound.patch:

--- NEW FILE kdemultimedia-4.2.0-dragon-second-sound.patch ---
--- trunk/KDE/kdemultimedia/dragonplayer/src/app/videoWindow.cpp	2009/01/21 21:22:50	914835
+++ trunk/KDE/kdemultimedia/dragonplayer/src/app/videoWindow.cpp	2009/01/21 21:24:33	914836
@@ -610,7 +610,8 @@
     DEBUG_BLOCK
     Phonon::SubtitleDescription desc = Phonon::SubtitleDescription::fromIndex( channel );
     debug() << "using index: " << channel << " returned desc has index: " << desc.index();
-    m_controller->setCurrentSubtitle( desc );
+    if(desc.isValid())  
+      m_controller->setCurrentSubtitle( desc );
 }
 
 void
@@ -627,7 +628,8 @@
     DEBUG_BLOCK
     Phonon::AudioChannelDescription desc = Phonon::AudioChannelDescription::fromIndex( channel );
     debug() << "using index: " << channel << " returned desc has index: " << desc.index();
-    m_controller->setCurrentAudioChannel( desc );
+    if(desc.isValid())
+      m_controller->setCurrentAudioChannel( desc );
 }
 
 void


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- kdemultimedia.spec	31 Jan 2009 17:29:08 -0000	1.134
+++ kdemultimedia.spec	24 Feb 2009 04:06:02 -0000	1.135
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -9,6 +9,9 @@
 License:   GPLv2+
 URL:       http://www.kde.org/
 Source0:   ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+# upstream patches
+# from 4.2.1
+Patch100:  kdemultimedia-4.2.0-dragon-second-sound.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -66,6 +69,7 @@
 
 %prep
 %setup -q -n kdemultimedia-%{version}
+%patch100 -p3 -b .dragon-second-sound
 
 
 %build
@@ -144,6 +148,9 @@
 
 
 %changelog
+* Sun Feb 22 2009 Tejas Dinkar <tejas at gja.in> - 4.2.0-3
+- Added a patch for dragon player to fix kde#165249 (from 4.2.1)
+
 * Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
 - unowned dirs (#483516)