rpms/kdemultimedia/F-10 kdemultimedia-4.2.0-dragon-second-sound.patch, NONE, 1.1 kdemultimedia.spec, 1.127, 1.128

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10190/F-10

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-4.2.0-dragon-second-sound.patch 
Log Message:
Sync from devel:

* Sun Feb 22 2009 Tejas Dinkar <tejas at gja.in> - 4.2.0-3
- fix kde#165249 No sound after second video file in Dragon Player (from 4.2.1)

* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- unowned dirs (#483516)

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/F-10/kdemultimedia.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- kdemultimedia.spec	24 Jan 2009 14:45:28 -0000	1.127
+++ kdemultimedia.spec	24 Feb 2009 04:11:29 -0000	1.128
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.2.0
-Release: 1%{?dist}.1
+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:
@@ -17,13 +20,11 @@
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: flac-devel
-BuildRequires: giflib-devel
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: libtheora-devel
 ## needed to build Kscd, keep for now -- Kevin
 BuildRequires: libtunepimp-devel libmusicbrainz-devel
 BuildRequires: libvorbis-devel
-BuildRequires: pcre-devel
 BuildRequires: taglib-devel
 BuildRequires: xine-lib-devel libxcb-devel
 
@@ -68,6 +69,7 @@
 
 %prep
 %setup -q -n kdemultimedia-%{version}
+%patch100 -p3 -b .dragon-second-sound
 
 
 %build
@@ -77,7 +79,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -112,8 +114,8 @@
 %{_kde4_appsdir}/kmix/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/konqsidebartng/
-%{_kde4_appsdir}/profiles/*
-%{_kde4_appsdir}/kscd/skin/
+%{_kde4_appsdir}/profiles/
+%{_kde4_appsdir}/kscd/
 %{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
@@ -146,6 +148,12 @@
 
 
 %changelog
+* Sun Feb 22 2009 Tejas Dinkar <tejas at gja.in> - 4.2.0-3
+- fix kde#165249 No sound after second video file in Dragon Player (from 4.2.1)
+
+* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- unowned dirs (#483516)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0