New revision to fix a gcc-3.4 compilation error. Closes bug #52185.

5 files changed, 142 insertions, 9 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index 4366cce3042d..8a92a5d5677a 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.16 2004/06/25 00:05:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.17 2004/07/01 19:32:55 fvdpol Exp $
+
+*hydrogen-0.8.2-r4 (01 Jul 2004)
+
+  01 Jul 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/hydrogen-0.8.2-gcc34.patch, +hydrogen-0.8.2-r4.ebuild:
+  New revision to fix a gcc-3.4 compilation error. Closes bug #52185
 
 *hydrogen-0.8.2-r3 (23 Jun 2004)
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 72b266cf1442..4b8b8abe0c81 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,16 +1,19 @@
-MD5 7cb9559dca012df14bc78894162a6596 hydrogen-0.8.2-r1.ebuild 2094
-MD5 28d4fd260a0e21490ace9375ec1f0e2d hydrogen-0.8.2-r3.ebuild 2985
+MD5 da2231dcb0f1338f171cb256cee93376 ChangeLog 2543
 MD5 7f7cb43efce676543149273d8b9ddc6c hydrogen-0.8.1-r1.ebuild 2036
+MD5 759f4774e29964c003d91f8ad983ddc8 hydrogen-0.8.1.ebuild 748
 MD5 fe09c65964167850a9e330d16ec64aa5 hydrogen-0.8.2.ebuild 2032
-MD5 f15b9e01294831da0b6590d83835ae48 hydrogen-0.8.2-r2.ebuild 2143
-MD5 da2231dcb0f1338f171cb256cee93376 ChangeLog 2543
 MD5 7265452ab5b8fc5e97614d42b3d7e053 metadata.xml 220
-MD5 759f4774e29964c003d91f8ad983ddc8 hydrogen-0.8.1.ebuild 748
+MD5 7cb9559dca012df14bc78894162a6596 hydrogen-0.8.2-r1.ebuild 2094
+MD5 f15b9e01294831da0b6590d83835ae48 hydrogen-0.8.2-r2.ebuild 2143
+MD5 28d4fd260a0e21490ace9375ec1f0e2d hydrogen-0.8.2-r3.ebuild 2985
+MD5 fcbdf151a4fef3c18395380d3bc55678 hydrogen-0.8.2-r4.ebuild 3022
 MD5 799a80da707ff5ef9c2fe1b48ae0a6df files/digest-hydrogen-0.8.1 67
-MD5 09d97690a9335d98d3bdbb5625b65efa files/digest-hydrogen-0.8.2 319
 MD5 dd475b26d81eb9e7275870a121454e24 files/digest-hydrogen-0.8.1-r1 319
+MD5 09d97690a9335d98d3bdbb5625b65efa files/digest-hydrogen-0.8.2 319
+MD5 7d42c8a8bb26e478ec8e9e835ea733b5 files/hydrogen-0.8.2-ui-spacer.patch 1902
 MD5 09d97690a9335d98d3bdbb5625b65efa files/digest-hydrogen-0.8.2-r1 319
+MD5 a3d08a6bb459e313c2c59a5ad086eaea files/hydrogen-0.8.2-64bit.patch 1319
 MD5 09d97690a9335d98d3bdbb5625b65efa files/digest-hydrogen-0.8.2-r2 319
 MD5 0aeb17f8b89b3d73dde268e756c16a2c files/digest-hydrogen-0.8.2-r3 575
-MD5 a3d08a6bb459e313c2c59a5ad086eaea files/hydrogen-0.8.2-64bit.patch 1319
-MD5 7d42c8a8bb26e478ec8e9e835ea733b5 files/hydrogen-0.8.2-ui-spacer.patch 1902
+MD5 edc486e93c7644938917e65e83e56e71 files/hydrogen-0.8.2-gcc34.patch 495
+MD5 0aeb17f8b89b3d73dde268e756c16a2c files/digest-hydrogen-0.8.2-r4 575
diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r4 b/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r4
new file mode 100644
index 000000000000..ee05cff65158
--- /dev/null
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r4
@@ -0,0 +1,9 @@
+MD5 65e16cabfaa414dabdd0039cad5eee94 hydrogen-0.8.2.tar.gz 2066644
+MD5 1980647fa79029fa1dd1eb4f5ad14d65 3355606.tar.gz 408406
+MD5 8ddc8e3f5d02f5e2f12533db45e77c55 DrumkitPack1.tar.gz 968204
+MD5 535b873aead13de2105cc2a5609ec977 DrumkitPack2.tar.gz 1282298
+MD5 def807440c5a5e01e22f2b7a52a872df EasternHop-1.tar.gz 417396
+MD5 2ccaed2a392a97143f31f52488fdde74 TD-7.tar.gz 873711
+MD5 ee0974b404d34a2c5cf3d8f3952a80e9 UltraAcousticKit.tar.gz 1874932
+MD5 8a573ea8040aa8ee3dacfcb3d3fc4ab8 Millo-Drums_v1.tar.gz 2650633
+MD5 bc2bcc16d404441ef3a5b1b86c6c4a25 HardElectro1.tar.gz 390222
diff --git a/media-sound/hydrogen/files/hydrogen-0.8.2-gcc34.patch b/media-sound/hydrogen/files/hydrogen-0.8.2-gcc34.patch
new file mode 100644
index 000000000000..abe84bda90c2
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.8.2-gcc34.patch
@@ -0,0 +1,12 @@
+diff -ru hydrogen-0.8.2-orig/lib/Hydrogen.cpp hydrogen-0.8.2/lib/Hydrogen.cpp
+--- hydrogen-0.8.2-orig/lib/Hydrogen.cpp	2004-07-01 10:11:27.644571768 +0200
++++ hydrogen-0.8.2/lib/Hydrogen.cpp	2004-07-01 10:13:53.642376728 +0200
+@@ -2502,7 +2502,7 @@
+ 
+ 	float fBPM = 60000.0 / fInterval;
+ 
+-	if ( abs(fOldBpm1 - fBPM) > 20 ) {	// troppa differenza, niente media
++	if ( fabsf(fOldBpm1 - fBPM) > 20 ) {	// troppa differenza, niente media
+ 		fOldBpm1 = fBPM;
+ 		fOldBpm2 = fBPM;
+ 		fOldBpm3 = fBPM;
diff --git a/media-sound/hydrogen/hydrogen-0.8.2-r4.ebuild b/media-sound/hydrogen/hydrogen-0.8.2-r4.ebuild
new file mode 100644
index 000000000000..0aadc188237d
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.8.2-r4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.8.2-r4.ebuild,v 1.1 2004/07/01 19:32:55 fvdpol Exp $
+
+inherit eutils
+
+DESCRIPTION="Linux Drum Machine"
+HOMEPAGE="http://hydrogen.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hydrogen/${P}.tar.gz \
+	mirror://sourceforge/hydrogen/3355606.tar.gz \
+	mirror://sourceforge/hydrogen/DrumkitPack1.tar.gz \
+	mirror://sourceforge/hydrogen/DrumkitPack2.tar.gz \
+	mirror://sourceforge/hydrogen/EasternHop-1.tar.gz \
+	mirror://sourceforge/hydrogen/TD-7.tar.gz \
+	mirror://sourceforge/hydrogen/UltraAcousticKit.tar.gz \
+	mirror://sourceforge/hydrogen/Millo-Drums_v1.tar.gz \
+	mirror://sourceforge/hydrogen/HardElectro1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+
+IUSE="alsa jack"
+
+
+RDEPEND="virtual/x11
+	>=media-libs/audiofile-0.2.3 \
+	alsa? ( media-libs/alsa-lib ) \
+	jack? ( media-sound/jack-audio-connection-kit ) \
+	>=x11-libs/qt-3"
+
+DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-ui-spacer.patch
+	epatch ${FILESDIR}/${P}-64bit.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
+	# unpack drum kits
+	cd ${P}/data/drumkits
+	tar zxf ${WORKDIR}/3355606/3355606kit.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack1/HipHop-1.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack1/HipHop-2.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack2/Synthie-1.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack2/TR808909.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack2/Techno-1.h2drumkit
+	tar zxf ${WORKDIR}/EasternHop-1/EasternHop-1.h2drumkit
+	tar zxf ${WORKDIR}/EasternHop-1/EasternHop-1.h2drumkit
+	tar zxf ${WORKDIR}/TD-7/TD-7kit.h2drumkit
+	tar zxf ${WORKDIR}/UltraAcousticKit/UltraAcousticKit.h2drumkit
+	tar zxf ${WORKDIR}/Millo-Drums_v1/Millo-Drums_v.1.h2drumkit
+	tar zxf ${WORKDIR}/HardElectro1/HardElectro1.h2drumkit
+
+	# unpack demo songs
+	# (note that some songs are disabled due to incompatibility with this (newer?) version of hydrogen...)
+	cd ../demo_songs
+	#cp ${WORKDIR}/3355606/*.h2song .
+	#cp ${WORKDIR}/DrumkitPack1/*.h2song .
+	#cp ${WORKDIR}/DrumkitPack2/*.h2song .
+	#cp ${WORKDIR}/EasternHop-1/*.h2song .
+	#cp ${WORKDIR}/TD-7/*.h2song .
+	cp ${WORKDIR}/UltraAcousticKit/*.h2song .
+	cp ${WORKDIR}/Millo-Drums_v1/demo\ songs/*.h2song .
+	cp ${WORKDIR}/HardElectro1/*.h2song .
+
+	# fix file paths
+	for SONG in `ls *.h2song`; do
+		sed -i -e "s:/usr/local/share:/usr/share:" ${SONG}
+	done
+}
+
+src_compile() {
+	addwrite ${QTDIR}/etc/settings
+
+	einfo "Reconfiguring..."
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.6
+
+	./autogen.sh
+
+	econf || die
+	emake || die
+}
+
+src_install() {
+	local SUPPORTDIR=/usr/share/hydrogen
+
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog README TODO
+
+	# install demo songs
+	insinto ${SUPPORTDIR}/data/demo_songs
+	doins data/demo_songs/*
+
+	# install drum kits
+	for KIT in `find data/drumkits -type d`; do
+		insinto ${SUPPORTDIR}/${KIT}
+		doins ${KIT}/*.xml
+		doins ${KIT}/*.wav
+	done
+}