rpms/drumstick/F-12 drumstick-0.3.1-fix-implicit-linking.patch, NONE, 1.1 drumstick-0.3.1-sysinfo-#597354.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 drumstick.spec, 1.2, 1.3 sources, 1.2, 1.3 drumstick-0.2.99-20100208svn.patch, 1.1, NONE

Sun May 30 17:40:05 UTC 2010

Author: kkofler

Update of /cvs/pkgs/rpms/drumstick/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1236/F-12

Modified Files:
	.cvsignore drumstick.spec sources 
Added Files:
	drumstick-0.3.1-fix-implicit-linking.patch 
	drumstick-0.3.1-sysinfo-#597354.patch 
Removed Files:
	drumstick-0.2.99-20100208svn.patch 
Log Message:
Sync from devel:

* Fri May 28 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.1-2
- sysinfo: don't crash when no timer module available (#597354, upstream patch)

* Fri May 28 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.1-1
- update to 0.3.1
- fix FTBFS due to the strict ld in Fedora >= 13

* Mon Mar 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.0-1
- update to 0.3.0 release

drumstick-0.3.1-fix-implicit-linking.patch:
 CMakeLists.txt |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE drumstick-0.3.1-fix-implicit-linking.patch ---
diff -ur drumstick-0.3.1/tests/vpiano/CMakeLists.txt drumstick-0.3.1-fix-implicit-linking/tests/vpiano/CMakeLists.txt
--- drumstick-0.3.1/tests/vpiano/CMakeLists.txt	2010-04-19 16:35:34.000000000 +0200
+++ drumstick-0.3.1-fix-implicit-linking/tests/vpiano/CMakeLists.txt	2010-05-28 23:44:10.000000000 +0200
@@ -59,6 +59,10 @@
     drumstick-alsa
 )
 
+IF(UNIX)
+TARGET_LINK_LIBRARIES(drumstick-vpiano X11)
+ENDIF(UNIX)
+
 INSTALL(TARGETS drumstick-vpiano
         RUNTIME DESTINATION bin)
 

drumstick-0.3.1-sysinfo-#597354.patch:
 sysinfo.cpp |   72 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 31 deletions(-)

--- NEW FILE drumstick-0.3.1-sysinfo-#597354.patch ---
Index: tests/sysinfo/sysinfo.cpp
===================================================================
--- tests/sysinfo/sysinfo.cpp	(revision 174)
+++ tests/sysinfo/sysinfo.cpp	(revision 175)
@@ -40,22 +40,26 @@
     for( it = lst.constBegin(); it != lst.constEnd(); ++it )
     {
         TimerId id = *it;
-        Timer* timer = new Timer(id, SND_TIMER_OPEN_NONBLOCK);
-        TimerInfo info = timer->getTimerInfo();
-        cout << qSetFieldWidth(7) << left << info.getId() 
-             << qSetFieldWidth(20) << left << info.getName().left(20)
-             << qSetFieldWidth(0) << " " 
-             << id.getClass() << "/" << id.getSlaveClass() << "/"
-             << id.getCard() << "/" << id.getDevice() << "/" 
-             << id.getSubdevice() << " ";
-        if( info.isSlave() ) {
-            cout << "SLAVE";
-        } else {
-            long freq = info.getFrequency();
-            cout << freq << " Hz";
+        try {
+			Timer* timer = new Timer(id, SND_TIMER_OPEN_NONBLOCK);
+			TimerInfo info = timer->getTimerInfo();
+			cout << qSetFieldWidth(7) << left << info.getId()
+				 << qSetFieldWidth(20) << left << info.getName().left(20)
+				 << qSetFieldWidth(0) << " "
+				 << id.getClass() << "/" << id.getSlaveClass() << "/"
+				 << id.getCard() << "/" << id.getDevice() << "/"
+				 << id.getSubdevice() << " ";
+			if( info.isSlave() ) {
+				cout << "SLAVE";
+			} else {
+				long freq = info.getFrequency();
+				cout << freq << " Hz";
+			}
+			cout << endl;
+			delete timer;
+        } catch (SequencerError& err) {
+        	cout << "Error opening timer:"  << err.qstrError();
         }
-        cout << endl;
-        delete timer;
     }
     delete query;
 }
@@ -74,22 +78,28 @@
             QueueTempo qtmp = queue->getTempo();
             QueueTimer qtmr = queue->getTimer();
             TimerId tid(qtmr.getId());
-            Timer* timer = new Timer(tid, SND_TIMER_OPEN_NONBLOCK);
-            TimerInfo tinfo = timer->getTimerInfo();
-            cout << qSetFieldWidth(3)  << left << qinfo.getId()
-                 << qSetFieldWidth(20) << qinfo.getName().left(20)
-                 << qSetFieldWidth(0)  << " "
-                 << qSetFieldWidth(20) << tinfo.getName().left(20)
-                 << qSetFieldWidth(6)  << right << qinfo.getOwner()
-                 << qSetFieldWidth(7)  << (qinfo.isLocked() ? "locked" : "free")
-                 << qSetFieldWidth(8)  << (qsts.isRunning() ? "running" : "stopped")
-                 << qSetFieldWidth(4)  << qtmp.getPPQ()
-                 << qSetFieldWidth(7)  << qtmp.getRealBPM()
-                 << qSetFieldWidth(4)  << qtmp.getNominalBPM()
-                 << qSetFieldWidth(8)  << qsts.getTickTime()
-                 << qSetFieldWidth(0)  << " " << qsts.getClockTime()
-                 << endl;
-            delete timer;
+            QString tname;
+            try {
+				Timer* timer = new Timer(tid, SND_TIMER_OPEN_NONBLOCK);
+				TimerInfo tinfo = timer->getTimerInfo();
+				tname = tinfo.getName();
+				delete timer;
+            } catch (SequencerError& err) {
+            	tname = "inaccessible";
+            }
+			cout << qSetFieldWidth(3)  << left << qinfo.getId()
+				 << qSetFieldWidth(20) << qinfo.getName().left(20)
+				 << qSetFieldWidth(0)  << " "
+				 << qSetFieldWidth(20) << tname.left(20)
+				 << qSetFieldWidth(6)  << right << qinfo.getOwner()
+				 << qSetFieldWidth(7)  << (qinfo.isLocked() ? "locked" : "free")
+				 << qSetFieldWidth(8)  << (qsts.isRunning() ? "running" : "stopped")
+				 << qSetFieldWidth(4)  << qtmp.getPPQ()
+				 << qSetFieldWidth(7)  << qtmp.getRealBPM()
+				 << qSetFieldWidth(4)  << qtmp.getNominalBPM()
+				 << qSetFieldWidth(8)  << qsts.getTickTime()
+				 << qSetFieldWidth(0)  << " " << qsts.getClockTime()
+				 << endl;
             delete queue;
         }
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drumstick/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Jan 2010 23:30:05 -0000	1.2
+++ .cvsignore	30 May 2010 17:40:05 -0000	1.3
@@ -1 +1 @@
-drumstick-0.2.99svn.tar.bz2
+drumstick-0.3.1.tar.bz2


Index: drumstick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drumstick/F-12/drumstick.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- drumstick.spec	9 Feb 2010 17:00:40 -0000	1.2
+++ drumstick.spec	30 May 2010 17:40:05 -0000	1.3
@@ -1,15 +1,17 @@
 Summary: C++/Qt4 wrapper around the ALSA library sequencer interface
 Name:    drumstick
-Version: 0.2.99
-Release: 0.3.20100208svn%{?dist}
-%define svn svn
+Version: 0.3.1
+Release: 2%{?dist}
+#define svn svn
 
 Group:   System Environment/Libraries
 License: GPLv2+
 URL:     http://drumstick.sourceforge.net/
 Source0: http://downloads.sourceforge.net/project/drumstick/%{version}%{?svn}/drumstick-%{version}%{?svn}.tar.bz2
-# svn diff -r 137:141 https://drumstick.svn.sourceforge.net/svnroot/drumstick/trunk
-Patch0:  drumstick-0.2.99-20100208svn.patch
+# fix FTBFS due to the strict ld in Fedora >= 13
+Patch0:  drumstick-0.3.1-fix-implicit-linking.patch
+# sysinfo: don't crash when no timer module available (#597354, upstream patch)
+Patch1:  drumstick-0.3.1-sysinfo-#597354.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake qt4-devel alsa-lib-devel desktop-file-utils
@@ -17,6 +19,9 @@ BuildRequires: cmake qt4-devel alsa-lib-
 Obsoletes: aseqmm < %{version}-%{release}
 Provides: aseqmm = %{version}-%{release}
 
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 %description
 The drumstick library is a C++ wrapper around the ALSA library sequencer
 interface, using Qt4 objects, idioms and style. The ALSA sequencer interface
@@ -43,9 +48,8 @@ This package contains the test/example p
 
 %prep
 %setup -q -n %{name}-%{version}%{?svn}
-%patch0 -p0
-# don't create .la file
-sed -i -e 's/CREATE_LIBTOOL_FILE/#CREATE_LIBTOOL_FILE/g' library/CMakeLists.txt
+%patch0 -p1 -b .implicit-linking
+%patch1 -p0 -b .sysinfo-#597354
 
 
 %build
@@ -69,9 +73,13 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun
+/sbin/ldconfig
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %post examples
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -91,12 +99,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
-%{_libdir}/libdrumstick.so.*
+%{_libdir}/libdrumstick-file.so.*
+%{_libdir}/libdrumstick-alsa.so.*
+%{_datadir}/mime/packages/drumstick.xml
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libdrumstick.so
-%{_libdir}/pkgconfig/drumstick.pc
+%{_libdir}/libdrumstick-file.so
+%{_libdir}/libdrumstick-alsa.so
+%{_libdir}/pkgconfig/drumstick-file.pc
+%{_libdir}/pkgconfig/drumstick-alsa.pc
 %{_includedir}/drumstick/
 %{_includedir}/drumstick.h
 
@@ -108,6 +120,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri May 28 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.1-2
+- sysinfo: don't crash when no timer module available (#597354, upstream patch)
+
+* Fri May 28 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.1-1
+- update to 0.3.1
+- fix FTBFS due to the strict ld in Fedora >= 13
+
+* Mon Mar 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.0-1
+- update to 0.3.0 release
+
 * Tue Feb 08 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.99-0.3.svn20100208
 - update from SVN for KMid2 0.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drumstick/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Jan 2010 23:30:05 -0000	1.2
+++ sources	30 May 2010 17:40:05 -0000	1.3
@@ -1 +1 @@
-b8852fa0eafd6a771f8a036224bcba4f  drumstick-0.2.99svn.tar.bz2
+63b00e7f376020f7be5651ac215d4cbd  drumstick-0.3.1.tar.bz2


--- drumstick-0.2.99-20100208svn.patch DELETED ---

