rpms/hydrogen/devel hydrogen-portmidi-200.patch, NONE, 1.1 hydrogen.spec, 1.15, 1.16

[Orcan Ogetbil]

Author: oget

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

Modified Files:
	hydrogen.spec 
Added Files:
	hydrogen-portmidi-200.patch 
Log Message:
* Sat Jan 30 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-2
- Add patch against portmidi-200 on F13+. Fixes RHBZ#555488


hydrogen-portmidi-200.patch:
 Sconstruct                               |    1 -
 libs/hydrogen/src/IO/portmidi_driver.cpp |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE hydrogen-portmidi-200.patch ---
diff -rupN hydrogen-0.9.4.old/libs/hydrogen/src/IO/portmidi_driver.cpp hydrogen-0.9.4.new/libs/hydrogen/src/IO/portmidi_driver.cpp
--- hydrogen-0.9.4.old/libs/hydrogen/src/IO/portmidi_driver.cpp	2009-07-14 21:10:17.000000000 -0400
+++ hydrogen-0.9.4.new/libs/hydrogen/src/IO/portmidi_driver.cpp	2010-01-30 01:47:50.000000000 -0500
@@ -31,7 +31,7 @@
 #ifdef PORTMIDI_SUPPORT
 
 #include <porttime.h>
-#define TIME_PROC ((long (*)(void *)) Pt_Time)
+#define TIME_PROC ((int32_t (*)(void *)) Pt_Time)
 #define TIME_START Pt_Start(1, 0, 0) /* timer started w/millisecond accuracy */
 
 #include <pthread.h>
@@ -47,7 +47,7 @@ void* PortMidiDriver_thread( void* param
 	_INFOLOG( "PortMidiDriver_thread starting" );
 
 	PmError status;
-	PmError length;
+	int length;
 	PmEvent buffer[1];
 	while ( instance->m_bRunning ) {
 		status = Pm_Poll( instance->m_pMidiIn );
diff -rupN hydrogen-0.9.4.old/Sconstruct hydrogen-0.9.4.new/Sconstruct
--- hydrogen-0.9.4.old/Sconstruct	2009-09-07 17:31:13.000000000 -0400
+++ hydrogen-0.9.4.new/Sconstruct	2010-01-30 01:48:01.000000000 -0500
@@ -265,7 +265,6 @@ def get_hydrogen_gui( lib_hydrogen , opt
 	if str(env['portaudio']) == "1": env.Append( LIBS = [ "portaudio" ] )
 	if str(env['portmidi']) == "1":
 		env.Append( LIBS = [ "portmidi" ] )
-		env.Append( LIBS = [ "porttime" ] )
 	if str(env['lash']) == "1":
 	        env.ParseConfig('pkg-config --cflags --libs lash-1.0')
 


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/hydrogen.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- hydrogen.spec	15 Sep 2009 06:52:42 -0000	1.15
+++ hydrogen.spec	30 Jan 2010 07:43:59 -0000	1.16
@@ -1,11 +1,13 @@
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      1%{?dist}
+Release:      2%{?dist}
 URL:          http://www.hydrogen-music.org/
 Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # For convenience, to take the svn snapshot:
 Source9:      hydrogen-snapshot.sh
+# portmidi-200 needs a new patch. Causes RHBZ#555488
+Patch0:       hydrogen-portmidi-200.patch
 License:      GPLv2+
 Group:        Applications/Multimedia
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +32,11 @@ professional yet simple and intuitive pa
 %prep
 %setup -q -n %{name}-%{version}
 patch -p0 < patches/portaudio.patch
+%if 0%{fedora} < 12
 patch -p0 < patches/portmidi.patch
+%else
+%patch0 -p1 -b .200
+%endif
 
 %build
 export QTDIR=%{_qt4_prefix}
@@ -89,6 +95,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Sat Jan 30 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-2
+- Add patch against portmidi-200 on F13+. Fixes RHBZ#555488
+
 * Tue Sep 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-1
 - Update to 0.9.4