rpms/kmid2/F-11 kmid2-0.2.0-timidity-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kmid2.spec, 1.4, 1.5 sources, 1.2, 1.3

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kmid2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31690/F-11

Modified Files:
	.cvsignore kmid2.spec sources 
Added Files:
	kmid2-0.2.0-timidity-pulseaudio.patch 
Log Message:
Sync from devel:

* Sun Jan 31 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-2
- Support PulseAudio when autospawning TiMidity++ (-OO -opulse switches)

* Sun Jan 31 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-1
- Update to 0.2.0
- The examples with copyright issues have been dropped by upstream
- BR drumstick-devel instead of aseqmm-devel

kmid2-0.2.0-timidity-pulseaudio.patch:
 externalsoftsynth.cpp |   21 +++++++++++++--------
 prefs_progs.ui        |    5 +++++
 2 files changed, 18 insertions(+), 8 deletions(-)

--- NEW FILE kmid2-0.2.0-timidity-pulseaudio.patch ---
diff -ur kmid2-0.2.0/src/externalsoftsynth.cpp kmid2-0.2.0-timidity-pulseaudio/src/externalsoftsynth.cpp
--- kmid2-0.2.0/src/externalsoftsynth.cpp	2010-01-12 00:18:33.000000000 +0100
+++ kmid2-0.2.0-timidity-pulseaudio/src/externalsoftsynth.cpp	2010-01-31 23:28:16.000000000 +0100
@@ -249,14 +249,19 @@
     //kDebug() << "waiting=" << waiting;
     if ( m_process.state() == KProcess::NotRunning && m_Ok ) {
         args += "-iA";
-        if (Settings::audio_timidity() == "alsa")
-            args += "-Os";
-        else if (Settings::audio_timidity() == "jack")
-            args += "-Oj";
-        else
-            args += "-Od";
-        if (!Settings::audiodev_timidity().isEmpty())
-            args += ("-o" + Settings::audiodev_timidity());
+        if (Settings::audio_timidity() == "pulseaudio") {
+          args += "-OO"; // libao
+          args += "-opulse"; // use libao's "pulse" device
+        } else {
+          if (Settings::audio_timidity() == "alsa")
+              args += "-Os";
+          else if (Settings::audio_timidity() == "jack")
+              args += "-Oj";
+          else
+              args += "-Od";
+          if (!Settings::audiodev_timidity().isEmpty())
+              args += ("-o" + Settings::audiodev_timidity());
+        }
         if (!Settings::rate_timidity().isEmpty())
             args += ("-s" + Settings::rate_timidity());
         if (!Settings::args_timidity().isEmpty())
diff -ur kmid2-0.2.0/src/prefs_progs.ui kmid2-0.2.0-timidity-pulseaudio/src/prefs_progs.ui
--- kmid2-0.2.0/src/prefs_progs.ui	2010-01-08 13:57:53.000000000 +0100
+++ kmid2-0.2.0-timidity-pulseaudio/src/prefs_progs.ui	2010-01-31 23:25:44.000000000 +0100
@@ -247,6 +247,11 @@
          </item>
          <item>
           <property name="text">
+           <string>pulseaudio</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
            <string>oss</string>
           </property>
          </item>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jan 2010 09:40:36 -0000	1.2
+++ .cvsignore	1 Feb 2010 05:07:36 -0000	1.3
@@ -1 +1 @@
-kmid2-0.1.1-patched.tar.bz2
+kmid2-0.2.0.tar.bz2


Index: kmid2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/F-11/kmid2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kmid2.spec	27 Jan 2010 14:31:51 -0000	1.4
+++ kmid2.spec	1 Feb 2010 05:07:36 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kmid2
-Version:        0.1.1
-Release:        4%{?dist}
+Version:        0.2.0
+Release:        2%{?dist}
 Summary:        A MIDI/karaoke player for KDE
 
 Group:          Applications/Multimedia
@@ -8,29 +8,10 @@ Group:          Applications/Multimedia
 License:        GPLv2+ and CC-BY
 URL:            http://userbase.kde.org/KMid2
 
-# remove content with unknown copyright status
-#
-# KMid2 is shipping some non-code content with unknown copyright status,
-# inherited from the original KMid. The README claims the files are GPL, however
-# it is unknown whether the authors of the sequenced versions approved of this
-# and there are also (non-expired) copyrights on the original music in 3 out of
-# 4 cases. Upstream has been notified of this issue.
-# These files are removed here and the CMakeLists.txt is patched for this:
-#
-# VERSION=0.1.1
-# rm -rf kmid2-${VERSION}
-# tar xjf kmid2-${VERSION}.tar.bz2
-# rm -f kmid2-${VERSION}/examples/*.kar
-# sed -i -e '/\.kar/d' kmid2-${VERSION}/examples/CMakeLists.txt
-# sed -i -e '3,+6d' -e 's/There are also/There are/g' kmid2-${VERSION}/examples/README
-# tar cjf kmid2-${VERSION}-patched.tar.bz2 kmid2-${VERSION}
-#
-# The 2 new examples are fine as the original music is out of copyright and
-# the MIDI files were sequenced by the KMid2 maintainer.
-
-# original tarball:
-# Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Source0:        %{name}-%{version}-patched.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
+# support PulseAudio when autospawning TiMidity++ (-OO -opulse switches)
+# submitted upstream, awaiting response
+Patch0:         kmid2-0.2.0-timidity-pulseaudio.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +19,7 @@ BuildRequires:  kdelibs4-devel
 BuildRequires:  kde-filesystem
 BuildRequires:  cmake
 BuildRequires:  alsa-lib-devel
-BuildRequires:  aseqmm-devel
+BuildRequires:  drumstick-devel
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 
@@ -63,8 +44,9 @@ It also has a keyboard view to see the n
 
 %prep
 %setup -q
-# zap bundled copy of aseqmm to guarantee it's never used
-rm -rf aseqmm
+# zap bundled copy of drumstick to guarantee it's never used
+rm -rf drumstick
+%patch0 -p1 -b .timidity-pulseaudio
 
 
 %build
@@ -111,11 +93,19 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_iconsdir}/hicolor/*/apps/kmid2.png
+%{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_libdir}/kde4/*
 
 
 %changelog
+* Sun Jan 31 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-2
+- Support PulseAudio when autospawning TiMidity++ (-OO -opulse switches)
+
+* Sun Jan 31 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-1
+- Update to 0.2.0
+- The examples with copyright issues have been dropped by upstream
+- BR drumstick-devel instead of aseqmm-devel
+
 * Wed Jan 27 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.1.1-4
 - Fix the kde4-config output parsing for 4.4 ("KDE Development Platform:")
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jan 2010 09:40:36 -0000	1.2
+++ sources	1 Feb 2010 05:07:36 -0000	1.3
@@ -1 +1 @@
-e7832d75c0db1fc68bddb85a558123a2  kmid2-0.1.1-patched.tar.bz2
+6d445739481991437210bd92b85c0ca9  kmid2-0.2.0.tar.bz2