From ae4b1bd4cb6c0f03340b8ac261062dde9662967f Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget@fedoraproject.org>
Date: Jan 30 2010 07:43:59 +0000
Subject: - Add patch against portmidi-200 on F13+. Fixes RHBZ#555488


---

diff --git a/hydrogen-portmidi-200.patch b/hydrogen-portmidi-200.patch
new file mode 100644
index 0000000..4b64f77
--- /dev/null
+++ b/hydrogen-portmidi-200.patch
@@ -0,0 +1,32 @@
+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')
+ 
diff --git a/hydrogen.spec b/hydrogen.spec
index e501463..b8eb6c2 100644
--- a/hydrogen.spec
+++ b/hydrogen.spec
@@ -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 pattern-based drum programming.
 %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/hicolor &>/dev/null || :
 %{_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