[SCM] hydrogen/master: Drop 10_portmidi_v2.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Oct 22 18:29:35 UTC 2010


The following commit has been merged in the master branch:
commit 3df2ef3f2f3c97d6b11b517df7173038bbe62653
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 22 19:42:51 2010 +0200

    Drop 10_portmidi_v2.patch, applied upstream.

diff --git a/debian/patches/10_portmidi_v2.patch b/debian/patches/10_portmidi_v2.patch
deleted file mode 100644
index e6e6135..0000000
--- a/debian/patches/10_portmidi_v2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libs/hydrogen/src/IO/portmidi_driver.cpp
-+++ b/libs/hydrogen/src/IO/portmidi_driver.cpp
-@@ -31,7 +31,7 @@
- #ifdef PORTMIDI_SUPPORT
- 
- #include <porttime.h>
--#define TIME_PROC ((long (*)(void *)) Pt_Time)
-+#define TIME_PROC ((PmTimestamp (*)(void *)) Pt_Time)
- #define TIME_START Pt_Start(1, 0, 0) /* timer started w/millisecond accuracy */
- 
- #include <pthread.h>
-@@ -47,7 +47,7 @@
- 	_INFOLOG( "PortMidiDriver_thread starting" );
- 
- 	PmError status;
--	PmError length;
-+	int length;
- 	PmEvent buffer[1];
- 	while ( instance->m_bRunning ) {
- 		status = Pm_Poll( instance->m_pMidiIn );
diff --git a/debian/patches/series b/debian/patches/series
index 38d1d9a..64dab98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@
 #07_gcc44.patch
 #08_550303_kbsd.patch
 09_portaudio_v2.patch
-10_portmidi_v2.patch
 #1001_use_system_tinyxml.patch
 1002_relax_SCons_linux2_resolving.patch
 1003_ambiguous_qstring_constructor.patch

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list