Added patch to fix noise on amd64. Closes bug #54340.

5 files changed, 129 insertions, 2 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index 934965f6cc00..d3b1f506dd1b 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.12 2004/06/18 19:57:01 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.13 2004/06/18 22:44:06 fvdpol Exp $
+
+*hydrogen-0.8.2-r2 (19 Jun 2004)
+
+  19 Jun 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/hydrogen-0.8.2-64bit.patch, +hydrogen-0.8.2-r2.ebuild:
+  Added patch to fix noise on amd64. Closes bug #54340
 
 *hydrogen-0.8.2-r1 (18 Jun 2004)
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 77a3acb079a4..ad96336c0976 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,11 +1,14 @@
-MD5 1593c7986904f18252764c395523fb44 ChangeLog 2029
+MD5 05aa85cfe1ec9144dc0ec3cf8949031b ChangeLog 2235
 MD5 d87e7ca09ed94f1e4b4d3d58206e511a hydrogen-0.8.1-r1.ebuild 2046
 MD5 6e9b7153d399f7aceb9ddfd689d96e84 hydrogen-0.8.1.ebuild 758
 MD5 07c4a21203670df7884ded6432488fe1 hydrogen-0.8.2.ebuild 2042
 MD5 7265452ab5b8fc5e97614d42b3d7e053 metadata.xml 220
 MD5 4ef17465390670abadfe7e9e743957bb hydrogen-0.8.2-r1.ebuild 2100
+MD5 6b3253d465bc0eb8491d84b742b7e4e9 hydrogen-0.8.2-r2.ebuild 2037
 MD5 799a80da707ff5ef9c2fe1b48ae0a6df files/digest-hydrogen-0.8.1 67
 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
diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r2 b/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r2
new file mode 100644
index 000000000000..6fbdcf9ee351
--- /dev/null
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r2
@@ -0,0 +1,5 @@
+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
diff --git a/media-sound/hydrogen/files/hydrogen-0.8.2-64bit.patch b/media-sound/hydrogen/files/hydrogen-0.8.2-64bit.patch
new file mode 100644
index 000000000000..2db2ea928f59
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.8.2-64bit.patch
@@ -0,0 +1,32 @@
+diff -ru hydrogen-0.8.2-orig/lib/DiskWriterDriver.cpp hydrogen-0.8.2/lib/DiskWriterDriver.cpp
+--- hydrogen-0.8.2-orig/lib/DiskWriterDriver.cpp	2004-06-18 20:19:14.803571648 +0200
++++ hydrogen-0.8.2/lib/DiskWriterDriver.cpp	2004-06-18 20:21:58.474689856 +0200
+@@ -75,9 +75,9 @@
+ 
+ 	afFreeFileSetup(outputSetup);
+ 
+-#if defined(i386) || defined(alpha)
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+ 	afSetVirtualByteOrder(outputFile, AF_DEFAULT_TRACK, AF_BYTEORDER_LITTLEENDIAN);
+-#else
++#elif __BYTE_ORDER == __BIG_ENDIAN
+ 	afSetVirtualByteOrder(outputFile, AF_DEFAULT_TRACK, AF_BYTEORDER_BIGENDIAN);
+ #endif
+ 
+Only in hydrogen-0.8.2/lib: DiskWriterDriver.cpp~
+diff -ru hydrogen-0.8.2-orig/lib/Sample.cpp hydrogen-0.8.2/lib/Sample.cpp
+--- hydrogen-0.8.2-orig/lib/Sample.cpp	2004-06-18 20:19:14.806571192 +0200
++++ hydrogen-0.8.2/lib/Sample.cpp	2004-06-18 20:22:58.517561952 +0200
+@@ -143,9 +143,9 @@
+ 	int samplewidth;
+ 	afGetSampleFormat(samplefile, AF_DEFAULT_TRACK, &sampleformat, &samplewidth);
+ 
+-#if defined(i386) || defined(alpha)
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+ 	afSetVirtualByteOrder(samplefile, AF_DEFAULT_TRACK, AF_BYTEORDER_LITTLEENDIAN);
+-#else
++#elif __BYTE_ORDER == __BIG_ENDIAN
+ 	afSetVirtualByteOrder(samplefile, AF_DEFAULT_TRACK, AF_BYTEORDER_BIGENDIAN);
+ #endif
+ 
+Only in hydrogen-0.8.2/lib: Sample.cpp~
diff --git a/media-sound/hydrogen/hydrogen-0.8.2-r2.ebuild b/media-sound/hydrogen/hydrogen-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..7c3d28c3136d
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.8.2-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.8.2-r2.ebuild,v 1.1 2004/06/18 22:44:06 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+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
+
+	# Drum kits to install
+	local KITS
+	KITS="3355606kit EasternHop-1 HipHop-1 HipHop-2 Synthie-1 TR808909 Techno-1"
+
+	# Grab our drumkits
+	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
+
+	# Recurse into drumkit directories
+	sed -ie "s:GMkit:GMkit ${KITS}:" Makefile.am
+
+	# Set up drumkit Makefiles, model after GMkit
+
+	for kit in ${KITS}
+	do
+		cd ${kit}
+		cp ../GMkit/Makefile.* .
+		sed -ie "s:GMkit:${kit}:" Makefile.am
+		sed -i "/AC_CONFIG_FILES(\[ data\\/drumkits\\/GMkit/i\\AC_CONFIG_FILES([ data/drumkits/${kit}/Makefile ])\\" ${S}/configure.in
+		cd ..
+	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() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS ChangeLog FAQ README TODO
+}