patch for sound problems on amd64

4 files changed, 42 insertions, 7 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index e7837cd1ece9..3dc4a44e4506 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.83 2004/03/16 01:32:59 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.84 2004/03/24 19:34:12 jhuebel Exp $
+
+  24 Mar 2004; Jason Huebel <jhuebel@gentoo.org> files/arts-1.2.1-buffer.patch,
+  arts-1.2.1.ebuild
+  Patch to fix sound problems with arts on amd64. Contributed by coolo at SUSE.
 
   15 Mar 2004; Jason Wever <weeve@gentoo.org> arts-1.2.1.ebuild:
   Marked stable on sparc.
diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index 4bfd37658ba1..c52c6d898bff 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,12 +1,13 @@
-MD5 7e2943962ed353cd3250c70ae74ad147 ChangeLog 11318
+MD5 2096fc7007d3cbbbb36ab6a49559f814 ChangeLog 11501
 MD5 aa00d9e9efb96fa67989fbc0ed22e57f arts-1.0.5b.ebuild 1436
-MD5 b48cbfc645e8adc23154b832ab0fc9ef arts-1.2.0.ebuild 2834
-MD5 29271ef860de2270b5344be05c1731c8 arts-1.2.1.ebuild 2836
 MD5 4bc0ce424987a3a804aeba9e634544e1 arts-1.1.5.ebuild 2764
+MD5 b48cbfc645e8adc23154b832ab0fc9ef arts-1.2.0.ebuild 2834
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 31e77598f97a91673f69ed4c44bd1f57 files/digest-arts-1.2.0 63
+MD5 e43816bdd6a9764c72cc3a5a50225d4e arts-1.2.1.ebuild 2905
+MD5 e78db892e7b447f86fab2ea9503a3a3d files/arts-1.2.1-buffer.patch 745
 MD5 783f52e41abb732466bec517c6ff1ae1 files/digest-arts-1.0.5b 200
 MD5 2d584d662a2b0b0e7a278bde6cd42e8f files/digest-arts-1.1.5 63
-MD5 4adfa9a4a83af1e64f93a0b430bf7532 files/digest-arts-1.2.1 64
+MD5 31e77598f97a91673f69ed4c44bd1f57 files/digest-arts-1.2.0 63
 MD5 9ffc978b18c6e1ad49a0c7eec49074f6 files/optional-deps.diff 3154
 MD5 226c503848cbc85a5daacb28eef4a0a6 files/tmp-mcop-user-fix.patch 1045
+MD5 4adfa9a4a83af1e64f93a0b430bf7532 files/digest-arts-1.2.1 64
diff --git a/kde-base/arts/arts-1.2.1.ebuild b/kde-base/arts/arts-1.2.1.ebuild
index cba5bf142503..5b6ce6336ae9 100644
--- a/kde-base/arts/arts-1.2.1.ebuild
+++ b/kde-base/arts/arts-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.2.1.ebuild,v 1.6 2004/03/16 01:32:59 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.2.1.ebuild,v 1.7 2004/03/24 19:34:12 jhuebel Exp $
 
 inherit kde flag-o-matic
 set-kdedir 3.2
@@ -33,6 +33,9 @@ src_unpack() {
 	kde_sandbox_patch ${S}/soundserver
 	# for the configure.in.in patch, for some reason it's not automatically picked up
 	# rm -f $S/configure
+
+	cd ${S}
+	use amd64 && epatch ${FILESDIR}/arts-${PV}-buffer.patch
 }
 
 src_compile() {
diff --git a/kde-base/arts/files/arts-1.2.1-buffer.patch b/kde-base/arts/files/arts-1.2.1-buffer.patch
new file mode 100644
index 000000000000..b8bb4a94ec9f
--- /dev/null
+++ b/kde-base/arts/files/arts-1.2.1-buffer.patch
@@ -0,0 +1,27 @@
+--- mcop/buffer.cc.orig	2004-03-24 14:51:23.586055192 +0100
++++ mcop/buffer.cc	2004-03-24 14:56:14.054897216 +0100
+@@ -87,9 +87,8 @@
+ void Buffer::writeFloat(float f) {
+ 	// FIXME: on some machines this may fail badly (there is explicit
+ 	// float marshalling and demarshalling code in mico/orb/util.cc)
+-
+-	long *f_as_long = (long *)&f;
+-	writeLong(*f_as_long);
++	union { float f; long l; } u = {f};
++	writeLong(u.l);
+ }
+ 
+ void Buffer::writeFloatSeq(const std::vector<float>& seq) {
+@@ -252,9 +251,10 @@
+ float Buffer::readFloat()
+ {
+ 	// FIXME: see writeFloat()
+-	long f_as_long = readLong();
++	union {float f; long l; } u;
++	u.l = readLong();
+ 
+-	if(!_readError) return *(float *)&f_as_long;
++	if(!_readError) return u.f;
+ 	return 0.0;
+ }
+