Version bump, fixing also bug 135469. Thanks to Jouni Rinne for reporting and Dominique Michel for ebuild ideas and patches.

Package-Manager: portage-2.1.3

5 files changed, 159 insertions, 15 deletions

diff --git a/media-sound/horgand/ChangeLog b/media-sound/horgand/ChangeLog
index 5b04a922daa2..6f2266dba5f3 100644
--- a/media-sound/horgand/ChangeLog
+++ b/media-sound/horgand/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/horgand
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/ChangeLog,v 1.11 2007/02/03 19:09:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/ChangeLog,v 1.12 2007/07/29 10:43:08 drac Exp $
+
+*horgand-1.07 (29 Jul 2007)
+
+  29 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/horgand-1.07-debug.patch, +horgand-1.07.ebuild:
+  Version bump, fixing also bug 135469. Thanks to Jouni Rinne for reporting
+  and Dominique Michel for ebuild ideas and patches.
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-sound/horgand/Manifest b/media-sound/horgand/Manifest
index bb0648b513fe..fd93f93d3a7d 100644
--- a/media-sound/horgand/Manifest
+++ b/media-sound/horgand/Manifest
@@ -1,8 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX horgand-1.07-debug.patch 1993 RMD160 83de22c14c26834be2b88e5adce05b27ad66cb49 SHA1 a81d3c929e556960ca3d936761fd67025d1682b3 SHA256 a4b7b5951c0b9a6b506e1f2b67cc65573eb6dfccebb4f2e597bd897d7d3eb26e
+MD5 a8d9ca47e96b8d5b9c06a9d24817c66c files/horgand-1.07-debug.patch 1993
+RMD160 83de22c14c26834be2b88e5adce05b27ad66cb49 files/horgand-1.07-debug.patch 1993
+SHA256 a4b7b5951c0b9a6b506e1f2b67cc65573eb6dfccebb4f2e597bd897d7d3eb26e files/horgand-1.07-debug.patch 1993
 DIST horgand-0.91.tar.gz 27318 RMD160 9f09f28b2b6a293cecf3f04cdd68ed16214c45ff SHA1 23f6cca4744e46cdf70a1f72124ee4157a52436c SHA256 bdb7f7f641f3b573a26aabe6a2fbb6cf1a621c6fd95f96c55b66b0b0b94f82db
 DIST horgand-1.06.tar.gz 2459463 RMD160 0bbc8c8bd2bf714d195e1411dc1ed2599d4f2e19 SHA1 8a5b273feba838777483d302cb033fe37950b8cc SHA256 afa502fcb36c3abb149f63b4a8e00d46e8649609a7404662733ba7832e996a6e
+DIST horgand-1.07.tar.gz 2457076 RMD160 28dc9bbc180005429b5ad242b7adcedd04f831e2 SHA1 b6098470cf6665e56275bb20484120eeb92e59d5 SHA256 78e2463854ab0782a7bbc05a7fa4c4bdb494b83992ca3df24b01677b6fcb44ae
+DIST horgand_1.07-1.diff.gz 16947 RMD160 41fedffb483f111319340f6b51674e4d7d1acee7 SHA1 895a117c886701de21dd54c3e8846172aab03476 SHA256 7e1e9766d7da29d32c62df0828faee15ed39dc42d216e6ff2a144ec3e5bf6f98
 EBUILD horgand-0.91.ebuild 757 RMD160 7e8d8abcc64610a95a1f68f4de09656bd2013597 SHA1 66136c3ad86bd845a8090b06413e2c8f1b1a6c41 SHA256 9e1ec734323852d40eca967bdfe1be2322116ef9e695df8fa9ae42cbc8006596
 MD5 27751442fc730c76fe0a4f3bd4224635 horgand-0.91.ebuild 757
 RMD160 7e8d8abcc64610a95a1f68f4de09656bd2013597 horgand-0.91.ebuild 757
@@ -11,10 +14,14 @@ EBUILD horgand-1.06.ebuild 673 RMD160 e159a546bf2c5ec9df654c8811b5e51aa0432a0c S
 MD5 8e4b455101da5a97a99d83e8455ad511 horgand-1.06.ebuild 673
 RMD160 e159a546bf2c5ec9df654c8811b5e51aa0432a0c horgand-1.06.ebuild 673
 SHA256 6a844ee6b39e2b722ad0b21f15cda4b8043faf953acc52182d06f37945278142 horgand-1.06.ebuild 673
-MISC ChangeLog 1358 RMD160 c9693032cc9be9688820ae60f0b58bf5564d2707 SHA1 3cdf4229c1a22d242037b5951e7039f18074a289 SHA256 04e8841632b36c7547a408b7e2a53e146a9b8cc96df60357483cd5fd5ec68f14
-MD5 af7418275683c79c014d4f834b60a633 ChangeLog 1358
-RMD160 c9693032cc9be9688820ae60f0b58bf5564d2707 ChangeLog 1358
-SHA256 04e8841632b36c7547a408b7e2a53e146a9b8cc96df60357483cd5fd5ec68f14 ChangeLog 1358
+EBUILD horgand-1.07.ebuild 1308 RMD160 dd2ce2fee3afb7248b3b1bf525b453e26ccfbf3c SHA1 605a4f367aec445d7b7a10d105d5f0147066277f SHA256 fa8a2b6a513672c8d5a5ebcbdde13e7606bdca3035d652171062cffda1f1b4b2
+MD5 08ff4c6c9049a72e900dfb9777a6c850 horgand-1.07.ebuild 1308
+RMD160 dd2ce2fee3afb7248b3b1bf525b453e26ccfbf3c horgand-1.07.ebuild 1308
+SHA256 fa8a2b6a513672c8d5a5ebcbdde13e7606bdca3035d652171062cffda1f1b4b2 horgand-1.07.ebuild 1308
+MISC ChangeLog 1618 RMD160 75ee4de6c07c95d99e69e9a73850623b1be29b32 SHA1 a5eebc0bf632c25ea663f3a541e9a49e1a8e3639 SHA256 e1ef806aab6d3ddee4a551d83d36237e05d5cf30007e275186fbe9e40e548c27
+MD5 0d16c33d8f506242d8ed19ebc82a2c95 ChangeLog 1618
+RMD160 75ee4de6c07c95d99e69e9a73850623b1be29b32 ChangeLog 1618
+SHA256 e1ef806aab6d3ddee4a551d83d36237e05d5cf30007e275186fbe9e40e548c27 ChangeLog 1618
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -25,10 +32,6 @@ SHA256 86cfd8cd808e3e836697496ff51f0bc8b4bc6352dc841c2a1a722e7ea737caae files/di
 MD5 285a3c9c03fe6a908ca3acd4282bde4b files/digest-horgand-1.06 241
 RMD160 a7de2a929c9e2e19431d8d745800a8e74241a620 files/digest-horgand-1.06 241
 SHA256 00977873cc0e793c40c59ff5a241779a0a745adb77d32ca2236a18a5c595dc3e files/digest-horgand-1.06 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxN39AiZjviIA2XgRAmmhAKCQlfCoCg2W0tZBrb8SloW54c5tMgCg9LOu
-50aOCo4JKalBHQiumRFtlW8=
-=oCbn
------END PGP SIGNATURE-----
+MD5 5cdf2bb6c1ce729c0f2a52809368108d files/digest-horgand-1.07 485
+RMD160 7f50d896f995deccf97f68a1c56b1089abea3190 files/digest-horgand-1.07 485
+SHA256 0f82c2183993f43aab8eb7730dff15c855a37422bd4cb8466cbedff55fd4b774 files/digest-horgand-1.07 485
diff --git a/media-sound/horgand/files/digest-horgand-1.07 b/media-sound/horgand/files/digest-horgand-1.07
new file mode 100644
index 000000000000..92d1205937bc
--- /dev/null
+++ b/media-sound/horgand/files/digest-horgand-1.07
@@ -0,0 +1,6 @@
+MD5 320a4696e4289f367eaa32484f791ff9 horgand-1.07.tar.gz 2457076
+RMD160 28dc9bbc180005429b5ad242b7adcedd04f831e2 horgand-1.07.tar.gz 2457076
+SHA256 78e2463854ab0782a7bbc05a7fa4c4bdb494b83992ca3df24b01677b6fcb44ae horgand-1.07.tar.gz 2457076
+MD5 2274141696d8cb163853b92c831fcff1 horgand_1.07-1.diff.gz 16947
+RMD160 41fedffb483f111319340f6b51674e4d7d1acee7 horgand_1.07-1.diff.gz 16947
+SHA256 7e1e9766d7da29d32c62df0828faee15ed39dc42d216e6ff2a144ec3e5bf6f98 horgand_1.07-1.diff.gz 16947
diff --git a/media-sound/horgand/files/horgand-1.07-debug.patch b/media-sound/horgand/files/horgand-1.07-debug.patch
new file mode 100644
index 000000000000..9792e7388329
--- /dev/null
+++ b/media-sound/horgand/files/horgand-1.07-debug.patch
@@ -0,0 +1,84 @@
+--- src/organMIDIIn.C	2004-06-23 17:34:05.000000000 +0200
++++ src/organMIDIIn.C	2006-09-22 22:38:53.000000000 +0200
+@@ -30,22 +30,26 @@
+ {
+ 
+   int l1;
++  printf("DEBUG: IN 1\n");
+   snd_seq_event_t *midievent;
+-
++  printf("DEBUG: IN 2\n");
+   midievent = NULL;
++  printf("DEBUG: IN 3\n");
+   snd_seq_event_input (MidiInPuerto[keIN].midi_in, &midievent);
++  printf("DEBUG: IN 4\n");
+   if (midievent == NULL)
+     return;
+-
++  printf("DEBUG: IN noreturn_5\n");
+ 
+   switch (midievent->type)
+     {
+     case SND_SEQ_EVENT_PITCHBEND:
++      printf("DEBUG: IN switch_1\n");
+       pitch = (float) midievent->data.control.value / 8192.0;
+       break;
+ 
+     case SND_SEQ_EVENT_PGMCHANGE:
+-
++	printf("DEBUG: IN switch_2\n");
+ 
+       if ((midievent->data.control.value > 0)
+ 	  && (midievent->data.control.value < 33))
+@@ -57,6 +61,7 @@
+ 
+     case SND_SEQ_EVENT_CONTROLLER:
+ 
++	printf("DEBUG: IN switch_3\n");
+       if (midievent->data.control.param == 1)
+ 	modulation = (float) midievent->data.control.value / 12.7;
+  
+@@ -85,7 +90,8 @@
+ 
+ 
+     case SND_SEQ_EVENT_NOTEON:
+-
++	
++	printf("DEBUG: IN switch_4\n");
+       if (midievent->data.note.velocity != 0)
+ 	{
+ 	  for (l1 = 0; l1 < POLY; l1++)
+@@ -135,6 +141,7 @@
+ 
+     case SND_SEQ_EVENT_NOTEOFF:
+ 
++	printf("DEBUG: IN switch_5\n");
+       vumvum = vum;
+       vum = 0;
+       for (l1 = 0; l1 < POLY; l1++)
+--- src/main.C.orig	2006-09-22 22:41:42.000000000 +0200
++++ src/main.C	2006-09-22 22:43:40.000000000 +0200
+@@ -52,17 +52,22 @@
+ void *
+ thread1 (void *arg)
+ {
++   printf("DEBUG: thread_1\n");
+    pon_realtime();
++   printf("DEBUG: thread_1 realtime_on\n");
+   while (Pexitprogram ==0)  hor.midievents(1);
++  printf("DEBUG: thread_1 while ends\n");
+   return (0);
+ };
+ 
+ void *
+ thread2 (void *arg)
+ {
+-    
++    printf("DEBUG: thread_2\n");
+     pon_realtime();
++    printf("DEBUG: thread_2 realtime_on\n");
+     while (Pexitprogram ==0)  hor.Alg1s(hor.PERIOD,0);
++    printf("DEBUG: thread_2 while ends\n");
+     return(0);
+ 
+ };
diff --git a/media-sound/horgand/horgand-1.07.ebuild b/media-sound/horgand/horgand-1.07.ebuild
new file mode 100644
index 000000000000..868a59fa700b
--- /dev/null
+++ b/media-sound/horgand/horgand-1.07.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/horgand-1.07.ebuild,v 1.1 2007/07/29 10:43:08 drac Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="horgand is an opensource software organ."
+HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
+SRC_URI="http://download.berlios.de/horgand/${P}.tar.gz
+	mirror://debian/pool/main/h/${PN}/${PN}_${PV}-1.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/fltk-1.1.2
+	media-libs/libsndfile
+	media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${PN}_${PV}-1.diff
+	epatch "${FILESDIR}"/${P}-debug.patch
+}
+
+src_compile() {
+	econf
+	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \
+		$(pkg-config --cflags jack) $(pkg-config --cflags sndfile)" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README
+	dodir /usr/$(get_libdir)/${PN}
+	mv "${D}"/usr/bin/${PN} "${D}"/usr/$(get_libdir)/${PN}/${PN}
+	newbin debian/${PN}.wrapper ${PN}
+	doman man/${PN}.1
+	make_desktop_entry ${PN} Horgand
+}